20 files changed, 38 insertions, 26 deletions
diff --git a/lang/gjs/index.ts b/lang/gjs/index.ts
index 4f52259..46e72b1 100644
--- a/lang/gjs/index.ts
+++ b/lang/gjs/index.ts
@@ -1,6 +1 @@
-export * from "./lib/process.js"
-export * from "./lib/time.js"
-export * from "./lib/file.js"
-export * from "./lib/gobject.js"
-export { bind, default as Binding } from "./lib/binding.js"
-export { Variable } from "./lib/variable.js"
+export * from "./src"
diff --git a/lang/gjs/meson.build b/lang/gjs/meson.build
index 8f3058f..388b301 100644
--- a/lang/gjs/meson.build
+++ b/lang/gjs/meson.build
@@ -1,9 +1,22 @@
 project('astal-gjs')
 
-datadir = get_option('prefix') / get_option('datadir')
-pkgdata = datadir / 'astal' / 'gjs'
+dest = get_option('prefix') / get_option('datadir') / 'astal' / 'gjs'
 
-install_data('index.ts', install_dir: pkgdata)
-install_subdir('lib', install_dir: pkgdata)
-install_subdir('gtk3', install_dir: pkgdata)
-install_subdir('gtk4', install_dir: pkgdata)
+dependency('astal-io-0.1')
+dependency('astal-3.0')
+
+install_data(
+  [
+    'src/binding.ts',
+    'src/file.ts',
+    'src/gobject.ts',
+    'src/index.ts',
+    'src/process.ts',
+    'src/time.ts',
+    'src/variable.ts',
+  ],
+  install_dir: dest,
+)
+
+install_subdir('src/gtk3', install_dir: dest)
+# install_subdir('src/gtk4', install_dir: dest)
diff --git a/lang/gjs/package.json b/lang/gjs/package.json
index 447ddcd..9f44388 100644
--- a/lang/gjs/package.json
+++ b/lang/gjs/package.json
@@ -16,14 +16,14 @@
     },
     "exports": {
         ".": "./index.ts",
-        "./gtk3": "./gtk3/index.ts",
-        "./gtk4": "./gtk3/index.ts",
-        "./lib/binding": "./lib/binding.ts",
-        "./lib/file": "./lib/file.ts",
-        "./lib/gobject": "./lib/gobject.ts",
-        "./lib/process": "./lib/process.ts",
-        "./lib/time": "./lib/time.ts",
-        "./lib/variable": "./lib/variable.ts"
+        "./gtk3": "./src/gtk3/index.ts",
+        "./gtk4": "./src/gtk3/index.ts",
+        "./binding": "./src/binding.ts",
+        "./file": "./src/file.ts",
+        "./gobject": "./src/gobject.ts",
+        "./process": "./src/process.ts",
+        "./time": "./src/time.ts",
+        "./variable": "./src/variable.ts"
     },
     "engines": {
         "gjs": ">=1.79.0"
diff --git a/lang/gjs/lib/binding.ts b/lang/gjs/src/binding.ts
index 95d905f..95d905f 100644
--- a/lang/gjs/lib/binding.ts
+++ b/lang/gjs/src/binding.ts
diff --git a/lang/gjs/lib/file.ts b/lang/gjs/src/file.ts
index 7b9de3a..7b9de3a 100644
--- a/lang/gjs/lib/file.ts
+++ b/lang/gjs/src/file.ts
diff --git a/lang/gjs/lib/gobject.ts b/lang/gjs/src/gobject.ts
index 4740764..4740764 100644
--- a/lang/gjs/lib/gobject.ts
+++ b/lang/gjs/src/gobject.ts
diff --git a/lang/gjs/gtk3/app.ts b/lang/gjs/src/gtk3/app.ts
index 1191dc4..1191dc4 100644
--- a/lang/gjs/gtk3/app.ts
+++ b/lang/gjs/src/gtk3/app.ts
diff --git a/lang/gjs/gtk3/astalify.ts b/lang/gjs/src/gtk3/astalify.ts
index d31046c..2cd6984 100644
--- a/lang/gjs/gtk3/astalify.ts
+++ b/lang/gjs/src/gtk3/astalify.ts
@@ -2,9 +2,9 @@ import Astal from "gi://Astal?version=3.0"
 import Gtk from "gi://Gtk?version=3.0"
 import Gdk from "gi://Gdk?version=3.0"
 import GObject from "gi://GObject"
-import { execAsync } from "../lib/process.js"
-import Variable from "../lib/variable.js"
-import Binding, { kebabify, snakeify, type Connectable, type Subscribable } from "../lib/binding.js"
+import { execAsync } from "../process.js"
+import Variable from "../variable.js"
+import Binding, { kebabify, snakeify, type Connectable, type Subscribable } from "../binding.js"
 
 export function mergeBindings(array: any[]) {
     function getValues(...args: any[]) {
diff --git a/lang/gjs/gtk3/index.ts b/lang/gjs/src/gtk3/index.ts
index cfafbda..cfafbda 100644
--- a/lang/gjs/gtk3/index.ts
+++ b/lang/gjs/src/gtk3/index.ts
diff --git a/lang/gjs/gtk3/jsx-runtime.ts b/lang/gjs/src/gtk3/jsx-runtime.ts
index 22dc424..22dc424 100644
--- a/lang/gjs/gtk3/jsx-runtime.ts
+++ b/lang/gjs/src/gtk3/jsx-runtime.ts
diff --git a/lang/gjs/gtk3/widget.ts b/lang/gjs/src/gtk3/widget.ts
index fd70ed6..fd70ed6 100644
--- a/lang/gjs/gtk3/widget.ts
+++ b/lang/gjs/src/gtk3/widget.ts
diff --git a/lang/gjs/gtk4/app.ts b/lang/gjs/src/gtk4/app.ts
index d931f73..d931f73 100644
--- a/lang/gjs/gtk4/app.ts
+++ b/lang/gjs/src/gtk4/app.ts
diff --git a/lang/gjs/gtk4/astalify.ts b/lang/gjs/src/gtk4/astalify.ts
index d931f73..d931f73 100644
--- a/lang/gjs/gtk4/astalify.ts
+++ b/lang/gjs/src/gtk4/astalify.ts
diff --git a/lang/gjs/gtk4/index.ts b/lang/gjs/src/gtk4/index.ts
index d931f73..d931f73 100644
--- a/lang/gjs/gtk4/index.ts
+++ b/lang/gjs/src/gtk4/index.ts
diff --git a/lang/gjs/gtk4/jsx-runtime.ts b/lang/gjs/src/gtk4/jsx-runtime.ts
index d931f73..d931f73 100644
--- a/lang/gjs/gtk4/jsx-runtime.ts
+++ b/lang/gjs/src/gtk4/jsx-runtime.ts
diff --git a/lang/gjs/src/index.ts b/lang/gjs/src/index.ts
new file mode 100644
index 0000000..161c369
--- /dev/null
+++ b/lang/gjs/src/index.ts
@@ -0,0 +1,6 @@
+export * from "./process.js"
+export * from "./time.js"
+export * from "./file.js"
+export * from "./gobject.js"
+export { bind, default as Binding } from "./binding.js"
+export { Variable } from "./variable.js"
diff --git a/lang/gjs/lib/process.ts b/lang/gjs/src/process.ts
index 2f7816b..2f7816b 100644
--- a/lang/gjs/lib/process.ts
+++ b/lang/gjs/src/process.ts
diff --git a/lang/gjs/lib/time.ts b/lang/gjs/src/time.ts
index a7e1e61..a7e1e61 100644
--- a/lang/gjs/lib/time.ts
+++ b/lang/gjs/src/time.ts
diff --git a/lang/gjs/lib/variable.ts b/lang/gjs/src/variable.ts
index 9b3d3d2..9b3d3d2 100644
--- a/lang/gjs/lib/variable.ts
+++ b/lang/gjs/src/variable.ts
diff --git a/lang/gjs/tsconfig.json b/lang/gjs/tsconfig.json
index 71fd218..171e75b 100644
--- a/lang/gjs/tsconfig.json
+++ b/lang/gjs/tsconfig.json
@@ -10,9 +10,7 @@
     },
     "include": [
         "@girs",
-        "lib/*",
-        // "gtk3/*",
-        // "gtk4/*",
+        "src/*.ts",
         "index.ts",
     ]
 }