diff --git a/docs/rst/lua_api/lua_introduction.rst b/docs/rst/lua_api/lua_introduction.rst
index 44b749b4..59d4dc1f 100644
--- a/docs/rst/lua_api/lua_introduction.rst
+++ b/docs/rst/lua_api/lua_introduction.rst
@@ -43,7 +43,7 @@ In this environment, the following rules apply:
 
     Here is a full list of Lua functions (and API tables) that are exposed:
 
-    .. literalinclude:: ../../../lib/wplua/sandbox.lua
+    .. literalinclude:: ../../../modules/module-lua-scripting/wplua/sandbox.lua
       :language: lua
       :lines: 40-55
 
diff --git a/lib/meson.build b/lib/meson.build
index c974d91f..8f7c8329 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -1,2 +1 @@
 subdir('wp')
-subdir('wplua')
diff --git a/modules/meson.build b/modules/meson.build
index 63f8e015..ca20d8fb 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -122,20 +122,15 @@ shared_library(
   dependencies : [wp_dep, pipewire_dep],
 )
 
-m_lua_scripting_resources = gnome.compile_resources(
-    'm-lua-scripting-resources',
-    'module-lua-scripting/gresource.xml',
-    source_dir: 'module-lua-scripting',
-    c_name: '_m_lua_scripting_resources')
-
+subdir('module-lua-scripting')
 shared_library(
   'wireplumber-module-lua-scripting',
   [
-    'module-lua-scripting.c',
-    'module-lua-scripting/pod.c',
-    'module-lua-scripting/json.c',
-    'module-lua-scripting/api.c',
-    'module-lua-scripting/config.c',
+    'module-lua-scripting/module.c',
+    'module-lua-scripting/api/pod.c',
+    'module-lua-scripting/api/json.c',
+    'module-lua-scripting/api/api.c',
+    'module-lua-scripting/api/config.c',
      m_lua_scripting_resources,
   ],
   c_args : [common_c_args, '-DG_LOG_DOMAIN="m-lua-scripting"'],
diff --git a/modules/module-lua-scripting/api.c b/modules/module-lua-scripting/api/api.c
similarity index 100%
rename from modules/module-lua-scripting/api.c
rename to modules/module-lua-scripting/api/api.c
diff --git a/modules/module-lua-scripting/api.lua b/modules/module-lua-scripting/api/api.lua
similarity index 100%
rename from modules/module-lua-scripting/api.lua
rename to modules/module-lua-scripting/api/api.lua
diff --git a/modules/module-lua-scripting/config.c b/modules/module-lua-scripting/api/config.c
similarity index 100%
rename from modules/module-lua-scripting/config.c
rename to modules/module-lua-scripting/api/config.c
diff --git a/modules/module-lua-scripting/gresource.xml b/modules/module-lua-scripting/api/gresource.xml
similarity index 100%
rename from modules/module-lua-scripting/gresource.xml
rename to modules/module-lua-scripting/api/gresource.xml
diff --git a/modules/module-lua-scripting/json.c b/modules/module-lua-scripting/api/json.c
similarity index 100%
rename from modules/module-lua-scripting/json.c
rename to modules/module-lua-scripting/api/json.c
diff --git a/modules/module-lua-scripting/api/meson.build b/modules/module-lua-scripting/api/meson.build
new file mode 100644
index 00000000..a7f04079
--- /dev/null
+++ b/modules/module-lua-scripting/api/meson.build
@@ -0,0 +1,5 @@
+m_lua_scripting_resources = gnome.compile_resources(
+    'm-lua-scripting-resources',
+    'gresource.xml',
+    source_dir: meson.current_source_dir(),
+    c_name: '_m_lua_scripting_resources')
diff --git a/modules/module-lua-scripting/pod.c b/modules/module-lua-scripting/api/pod.c
similarity index 100%
rename from modules/module-lua-scripting/pod.c
rename to modules/module-lua-scripting/api/pod.c
diff --git a/modules/module-lua-scripting/require.c b/modules/module-lua-scripting/api/require.c
similarity index 100%
rename from modules/module-lua-scripting/require.c
rename to modules/module-lua-scripting/api/require.c
diff --git a/modules/module-lua-scripting/meson.build b/modules/module-lua-scripting/meson.build
new file mode 100644
index 00000000..ee1c44fe
--- /dev/null
+++ b/modules/module-lua-scripting/meson.build
@@ -0,0 +1,4 @@
+wplua_include_dir = include_directories('.')
+
+subdir('wplua')
+subdir('api')
diff --git a/modules/module-lua-scripting.c b/modules/module-lua-scripting/module.c
similarity index 100%
rename from modules/module-lua-scripting.c
rename to modules/module-lua-scripting/module.c
diff --git a/lib/wplua/boxed.c b/modules/module-lua-scripting/wplua/boxed.c
similarity index 100%
rename from lib/wplua/boxed.c
rename to modules/module-lua-scripting/wplua/boxed.c
diff --git a/lib/wplua/closure.c b/modules/module-lua-scripting/wplua/closure.c
similarity index 100%
rename from lib/wplua/closure.c
rename to modules/module-lua-scripting/wplua/closure.c
diff --git a/lib/wplua/gresource.xml b/modules/module-lua-scripting/wplua/gresource.xml
similarity index 100%
rename from lib/wplua/gresource.xml
rename to modules/module-lua-scripting/wplua/gresource.xml
diff --git a/lib/wplua/meson.build b/modules/module-lua-scripting/wplua/meson.build
similarity index 88%
rename from lib/wplua/meson.build
rename to modules/module-lua-scripting/wplua/meson.build
index 995c517d..800b75e9 100644
--- a/lib/wplua/meson.build
+++ b/modules/module-lua-scripting/wplua/meson.build
@@ -22,12 +22,12 @@ wplua_lib = static_library('wplua-' + wireplumber_api_version,
     '-DG_LOG_DOMAIN="wplua"',
   ],
   install: false,
-  include_directories: wp_lib_include_dir,
+  include_directories: wplua_include_dir,
   dependencies : [wp_dep, lua_dep],
 )
 
 wplua_dep = declare_dependency(
   link_with: wplua_lib,
-  include_directories: wp_lib_include_dir,
+  include_directories: wplua_include_dir,
   dependencies: [wp_dep, lua_dep],
 )
diff --git a/lib/wplua/object.c b/modules/module-lua-scripting/wplua/object.c
similarity index 100%
rename from lib/wplua/object.c
rename to modules/module-lua-scripting/wplua/object.c
diff --git a/lib/wplua/private.h b/modules/module-lua-scripting/wplua/private.h
similarity index 100%
rename from lib/wplua/private.h
rename to modules/module-lua-scripting/wplua/private.h
diff --git a/lib/wplua/sandbox.lua b/modules/module-lua-scripting/wplua/sandbox.lua
similarity index 100%
rename from lib/wplua/sandbox.lua
rename to modules/module-lua-scripting/wplua/sandbox.lua
diff --git a/lib/wplua/userdata.c b/modules/module-lua-scripting/wplua/userdata.c
similarity index 100%
rename from lib/wplua/userdata.c
rename to modules/module-lua-scripting/wplua/userdata.c
diff --git a/lib/wplua/value.c b/modules/module-lua-scripting/wplua/value.c
similarity index 100%
rename from lib/wplua/value.c
rename to modules/module-lua-scripting/wplua/value.c
diff --git a/lib/wplua/wplua.c b/modules/module-lua-scripting/wplua/wplua.c
similarity index 100%
rename from lib/wplua/wplua.c
rename to modules/module-lua-scripting/wplua/wplua.c
diff --git a/lib/wplua/wplua.h b/modules/module-lua-scripting/wplua/wplua.h
similarity index 100%
rename from lib/wplua/wplua.h
rename to modules/module-lua-scripting/wplua/wplua.h