31 files changed, 65 insertions, 42 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",
     ]
 }
diff --git a/lang/lua/astal-dev-1.rockspec b/lang/lua/astal-dev-1.rockspec
index d392a79..3970672 100644
--- a/lang/lua/astal-dev-1.rockspec
+++ b/lang/lua/astal-dev-1.rockspec
@@ -19,13 +19,19 @@ dependencies = {
 build = {
     type = "builtin",
     modules = {
-        ["astal.application"] = "lib/application.lua",
-        ["astal.binding"] = "lib/binding.lua",
-        ["astal.init"] = "lib/init.lua",
-        ["astal.process"] = "lib/process.lua",
-        ["astal.time"] = "lib/time.lua",
-        ["astal.variable"] = "lib/variable.lua",
-        ["astal.widget"] = "lib/widget.lua",
-        ["astal.file"] = "lib/file.lua",
+        ["astal.binding"] = "astal/binding.lua",
+        ["astal.file"] = "astal/file.lua",
+        ["astal.init"] = "astal/init.lua",
+        ["astal.process"] = "astal/process.lua",
+        ["astal.time"] = "astal/time.lua",
+        ["astal.variable"] = "astal/variable.lua",
+        ["astal.gtk3.app"] = "astal/gtk3/app.lua",
+        ["astal.gtk3.init"] = "astal/gtk3/init.lua",
+        ["astal.gtk3.astalify"] = "astal/gtk3/astalify.lua",
+        ["astal.gtk3.widget"] = "astal/gtk3/widget.lua",
+        -- ["astal.gtk4.app"] = "astal/gtk4/app.lua",
+        -- ["astal.gtk4.init"] = "astal/gtk4/init.lua",
+        -- ["astal.gtk4.astalify"] = "astal/gtk4/astalify.lua",
+        -- ["astal.gtk4.widget"] = "astal/gtk4/widget.lua",
     },
 }
diff --git a/lang/lua/lib/binding.lua b/lang/lua/astal/binding.lua
index ba1e6e4..ba1e6e4 100644
--- a/lang/lua/lib/binding.lua
+++ b/lang/lua/astal/binding.lua
diff --git a/lang/lua/lib/file.lua b/lang/lua/astal/file.lua
index e3be783..e3be783 100644
--- a/lang/lua/lib/file.lua
+++ b/lang/lua/astal/file.lua
diff --git a/lang/lua/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua
index 7895f69..7895f69 100644
--- a/lang/lua/gtk3/app.lua
+++ b/lang/lua/astal/gtk3/app.lua
diff --git a/lang/lua/gtk3/astalify.lua b/lang/lua/astal/gtk3/astalify.lua
index 065de40..065de40 100644
--- a/lang/lua/gtk3/astalify.lua
+++ b/lang/lua/astal/gtk3/astalify.lua
diff --git a/lang/lua/astal/gtk3/init.lua b/lang/lua/astal/gtk3/init.lua
new file mode 100644
index 0000000..6fb5455
--- /dev/null
+++ b/lang/lua/astal/gtk3/init.lua
@@ -0,0 +1,5 @@
+return {
+    App = require("astal.gtk3.app"),
+    astalify = require("astal.gtk3.astalify"),
+    Widget = require("astal.gtk3.widget"),
+}
diff --git a/lang/lua/gtk3/widget.lua b/lang/lua/astal/gtk3/widget.lua
index beaad6c..beaad6c 100644
--- a/lang/lua/gtk3/widget.lua
+++ b/lang/lua/astal/gtk3/widget.lua
diff --git a/lang/lua/init.lua b/lang/lua/astal/init.lua
index b6ab30c..f442db0 100644
--- a/lang/lua/init.lua
+++ b/lang/lua/astal/init.lua
@@ -1,9 +1,9 @@
 local lgi = require("lgi")
-local Binding = require("astal.lib.binding")
-local File = require("astal.lib.file")
-local Process = require("astal.lib.process")
-local Time = require("astal.lib.time")
-local Variable = require("astal.lib.variable")
+local Binding = require("astal.binding")
+local File = require("astal.file")
+local Process = require("astal.proc")
+local Time = require("astal.time")
+local Variable = require("astal.variable")
 
 return {
     Variable = Variable,
diff --git a/lang/lua/lib/process.lua b/lang/lua/astal/process.lua
index b8b7436..b8b7436 100644
--- a/lang/lua/lib/process.lua
+++ b/lang/lua/astal/process.lua
diff --git a/lang/lua/lib/time.lua b/lang/lua/astal/time.lua
index 7719da9..7719da9 100644
--- a/lang/lua/lib/time.lua
+++ b/lang/lua/astal/time.lua
diff --git a/lang/lua/lib/variable.lua b/lang/lua/astal/variable.lua
index c93d04d..5a5e169 100644
--- a/lang/lua/lib/variable.lua
+++ b/lang/lua/astal/variable.lua
@@ -1,9 +1,9 @@
 local lgi = require("lgi")
 local Astal = lgi.require("AstalIO", "0.1")
 local GObject = lgi.require("GObject", "2.0")
-local Binding = require("astal.lib.binding")
-local Time = require("astal.lib.time")
-local Process = require("astal.lib.process")
+local Binding = require("astal.binding")
+local Time = require("astal.time")
+local Process = require("astal.process")
 
 ---@class Variable
 ---@field private variable table