diff --git a/src/modules/meson.build b/src/modules/meson.build
index 7b5a4922d..99b676cec 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -139,12 +139,12 @@ pipewire_module_adapter = shared_library('pipewire-module-adapter',
 
 pipewire_module_session_manager = shared_library('pipewire-module-session-manager',
   [ 'module-session-manager.c',
-    'module-session-manager/client-endpoint.c',
-    'module-session-manager/client-session.c',
-    'module-session-manager/endpoint-link.c',
-    'module-session-manager/endpoint-stream.c',
-    'module-session-manager/endpoint.c',
-    'module-session-manager/session.c',
+    'module-session-manager/client-endpoint/client-endpoint.c',
+    'module-session-manager/client-endpoint/endpoint-stream.c',
+    'module-session-manager/client-endpoint/endpoint.c',
+    'module-session-manager/client-session/client-session.c',
+    'module-session-manager/client-session/endpoint-link.c',
+    'module-session-manager/client-session/session.c',
     'module-session-manager/protocol-native.c',
   ],
   c_args : pipewire_module_c_args,
diff --git a/src/modules/module-session-manager/client-endpoint.c b/src/modules/module-session-manager/client-endpoint/client-endpoint.c
similarity index 100%
rename from src/modules/module-session-manager/client-endpoint.c
rename to src/modules/module-session-manager/client-endpoint/client-endpoint.c
diff --git a/src/modules/module-session-manager/client-endpoint.h b/src/modules/module-session-manager/client-endpoint/client-endpoint.h
similarity index 100%
rename from src/modules/module-session-manager/client-endpoint.h
rename to src/modules/module-session-manager/client-endpoint/client-endpoint.h
diff --git a/src/modules/module-session-manager/endpoint-stream.c b/src/modules/module-session-manager/client-endpoint/endpoint-stream.c
similarity index 100%
rename from src/modules/module-session-manager/endpoint-stream.c
rename to src/modules/module-session-manager/client-endpoint/endpoint-stream.c
diff --git a/src/modules/module-session-manager/endpoint-stream.h b/src/modules/module-session-manager/client-endpoint/endpoint-stream.h
similarity index 100%
rename from src/modules/module-session-manager/endpoint-stream.h
rename to src/modules/module-session-manager/client-endpoint/endpoint-stream.h
diff --git a/src/modules/module-session-manager/endpoint.c b/src/modules/module-session-manager/client-endpoint/endpoint.c
similarity index 100%
rename from src/modules/module-session-manager/endpoint.c
rename to src/modules/module-session-manager/client-endpoint/endpoint.c
diff --git a/src/modules/module-session-manager/endpoint.h b/src/modules/module-session-manager/client-endpoint/endpoint.h
similarity index 100%
rename from src/modules/module-session-manager/endpoint.h
rename to src/modules/module-session-manager/client-endpoint/endpoint.h
diff --git a/src/modules/module-session-manager/client-session.c b/src/modules/module-session-manager/client-session/client-session.c
similarity index 100%
rename from src/modules/module-session-manager/client-session.c
rename to src/modules/module-session-manager/client-session/client-session.c
diff --git a/src/modules/module-session-manager/client-session.h b/src/modules/module-session-manager/client-session/client-session.h
similarity index 100%
rename from src/modules/module-session-manager/client-session.h
rename to src/modules/module-session-manager/client-session/client-session.h
diff --git a/src/modules/module-session-manager/endpoint-link.c b/src/modules/module-session-manager/client-session/endpoint-link.c
similarity index 100%
rename from src/modules/module-session-manager/endpoint-link.c
rename to src/modules/module-session-manager/client-session/endpoint-link.c
diff --git a/src/modules/module-session-manager/endpoint-link.h b/src/modules/module-session-manager/client-session/endpoint-link.h
similarity index 100%
rename from src/modules/module-session-manager/endpoint-link.h
rename to src/modules/module-session-manager/client-session/endpoint-link.h
diff --git a/src/modules/module-session-manager/session.c b/src/modules/module-session-manager/client-session/session.c
similarity index 100%
rename from src/modules/module-session-manager/session.c
rename to src/modules/module-session-manager/client-session/session.c
diff --git a/src/modules/module-session-manager/session.h b/src/modules/module-session-manager/client-session/session.h
similarity index 100%
rename from src/modules/module-session-manager/session.h
rename to src/modules/module-session-manager/client-session/session.h