diff --git a/src/modules/meson.build b/src/modules/meson.build
index 31f6c2206..51db77334 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -1,5 +1,4 @@
 subdir('module-rt')
-subdir('spa')
 
 # The list of "main" source files for modules, the ones that have the
 # doxygen documentation
@@ -39,6 +38,10 @@ module_sources = [
   'module-rtp-session.c',
   'module-rtp-source.c',
   'module-rtp-sink.c',
+  'module-spa-node.c',
+  'module-spa-node-factory.c',
+  'module-spa-device.c',
+  'module-spa-device-factory.c',
   'module-snapcast-discover.c',
   'module-vban-recv.c',
   'module-vban-send.c',
@@ -47,10 +50,6 @@ module_sources = [
   'module-roc-source.c',
   'module-roc-sink.c',
   'module-x11-bell.c',
-  'spa/module-node.c',
-  'spa/module-device.c',
-  'spa/module-node-factory.c',
-  'spa/module-device-factory.c',
 ]
 
 pipewire_module_access_deps = [spa_dep, mathlib, dl_lib, pipewire_dep]
@@ -209,6 +208,39 @@ if build_module_rtkit
 endif
 summary({'rt': '@0@ RTKit'.format(build_module_rtkit ? 'with' : 'without')}, section: 'Optional Modules')
 
+pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
+  [ 'module-spa-node.c', 'spa/spa-node.c' ],
+  include_directories : [configinc],
+  install : true,
+  install_dir : modules_install_dir,
+  install_rpath: modules_install_dir,
+  dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
+)
+pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-factory',
+  [ 'module-spa-node-factory.c', 'spa/spa-node.c' ],
+  include_directories : [configinc],
+  install : true,
+  install_dir : modules_install_dir,
+  install_rpath: modules_install_dir,
+  dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
+)
+pipewire_module_spa_device = shared_library('pipewire-module-spa-device',
+  [ 'module-spa-device.c', 'spa/spa-device.c' ],
+  include_directories : [configinc],
+  install : true,
+  install_dir : modules_install_dir,
+  install_rpath: modules_install_dir,
+  dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
+)
+pipewire_module_spa_device_factory = shared_library('pipewire-module-spa-device-factory',
+  [ 'module-spa-device-factory.c', 'spa/spa-device.c' ],
+  include_directories : [configinc],
+  install : true,
+  install_dir : modules_install_dir,
+  install_rpath: modules_install_dir,
+  dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
+)
+
 build_module_portal = dbus_dep.found()
 if build_module_portal
   pipewire_module_portal = shared_library('pipewire-module-portal', [ 'module-portal.c' ],
diff --git a/src/modules/spa/module-device-factory.c b/src/modules/module-spa-device-factory.c
similarity index 99%
rename from src/modules/spa/module-device-factory.c
rename to src/modules/module-spa-device-factory.c
index 0211b7ecc..eb8d2436a 100644
--- a/src/modules/spa/module-device-factory.c
+++ b/src/modules/module-spa-device-factory.c
@@ -13,7 +13,7 @@
 
 #include "pipewire/impl.h"
 
-#include "spa-device.h"
+#include "spa/spa-device.h"
 
 /** \page page_module_spa_device_factory SPA Device factory
  *
diff --git a/src/modules/spa/module-device.c b/src/modules/module-spa-device.c
similarity index 98%
rename from src/modules/spa/module-device.c
rename to src/modules/module-spa-device.c
index f7940014b..2d62ffb50 100644
--- a/src/modules/spa/module-device.c
+++ b/src/modules/module-spa-device.c
@@ -10,7 +10,7 @@
 
 #include <pipewire/impl.h>
 
-#include "spa-device.h"
+#include "spa/spa-device.h"
 
 /** \page page_module_spa_device SPA Device
  *
diff --git a/src/modules/spa/module-node-factory.c b/src/modules/module-spa-node-factory.c
similarity index 99%
rename from src/modules/spa/module-node-factory.c
rename to src/modules/module-spa-node-factory.c
index 64141532f..0f9a97020 100644
--- a/src/modules/spa/module-node-factory.c
+++ b/src/modules/module-spa-node-factory.c
@@ -13,7 +13,7 @@
 
 #include "pipewire/impl.h"
 
-#include "spa-node.h"
+#include "spa/spa-node.h"
 
 /** \page page_module_spa_node_factory SPA Node factory
  *
diff --git a/src/modules/spa/module-node.c b/src/modules/module-spa-node.c
similarity index 98%
rename from src/modules/spa/module-node.c
rename to src/modules/module-spa-node.c
index 88a67fd38..75009bc11 100644
--- a/src/modules/spa/module-node.c
+++ b/src/modules/module-spa-node.c
@@ -12,7 +12,7 @@
 
 #include <pipewire/impl.h>
 
-#include "spa-node.h"
+#include "spa/spa-node.h"
 
 /** \page page_module_spa_node SPA Node
  *
diff --git a/src/modules/spa/meson.build b/src/modules/spa/meson.build
deleted file mode 100644
index 8332910b5..000000000
--- a/src/modules/spa/meson.build
+++ /dev/null
@@ -1,31 +0,0 @@
-pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
-  [ 'module-node.c', 'spa-node.c' ],
-  include_directories : [configinc],
-  install : true,
-  install_dir : modules_install_dir,
-  dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
-)
-
-pipewire_module_spa_device = shared_library('pipewire-module-spa-device',
-  [ 'module-device.c', 'spa-device.c' ],
-  include_directories : [configinc],
-  install : true,
-  install_dir : modules_install_dir,
-  dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
-)
-
-pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-factory',
-  [ 'module-node-factory.c', 'spa-node.c' ],
-  include_directories : [configinc],
-  install : true,
-  install_dir : modules_install_dir,
-  dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
-)
-
-pipewire_module_spa_device_factory = shared_library('pipewire-module-spa-device-factory',
-  [ 'module-device-factory.c', 'spa-device.c' ],
-  include_directories : [configinc],
-  install : true,
-  install_dir : modules_install_dir,
-  dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
-)