11 files changed, 27 insertions, 16 deletions
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