diff --git a/configuration.nix b/configuration.nix
index c2b99c3..38d1eaf 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -56,14 +56,9 @@
     ./services/bitwarden.nix
     ./services/firefox-syncserver.nix
 
-    ./services/matrix.nix
-    ./services/coturn.nix
-    ./services/livekit.nix
+    ./services/matrix
 
-    ./services/monero.nix
-    ./services/p2pool.nix
-    ./services/xmrig.nix
-    ./services/xmrig-auto-pause.nix
+    ./services/monero
 
     ./services/graphing-calculator.nix
 
diff --git a/services/coturn.nix b/services/matrix/coturn.nix
similarity index 100%
rename from services/coturn.nix
rename to services/matrix/coturn.nix
diff --git a/services/matrix/default.nix b/services/matrix/default.nix
new file mode 100644
index 0000000..8bce986
--- /dev/null
+++ b/services/matrix/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./matrix.nix
+    ./coturn.nix
+    ./livekit.nix
+  ];
+}
diff --git a/services/livekit.nix b/services/matrix/livekit.nix
similarity index 96%
rename from services/livekit.nix
rename to services/matrix/livekit.nix
index 4573780..99addec 100644
--- a/services/livekit.nix
+++ b/services/matrix/livekit.nix
@@ -3,7 +3,7 @@
   ...
 }:
 let
-  keyFile = ../secrets/livekit_keys;
+  keyFile = ../../secrets/livekit_keys;
 in
 {
   services.livekit = {
diff --git a/services/matrix.nix b/services/matrix/matrix.nix
similarity index 100%
rename from services/matrix.nix
rename to services/matrix/matrix.nix
diff --git a/services/monero/default.nix b/services/monero/default.nix
new file mode 100644
index 0000000..8cb3687
--- /dev/null
+++ b/services/monero/default.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./monero.nix
+    ./p2pool.nix
+    ./xmrig.nix
+    ./xmrig-auto-pause.nix
+  ];
+}
diff --git a/services/monero.nix b/services/monero/monero.nix
similarity index 100%
rename from services/monero.nix
rename to services/monero/monero.nix
diff --git a/services/p2pool.nix b/services/monero/p2pool.nix
similarity index 100%
rename from services/p2pool.nix
rename to services/monero/p2pool.nix
diff --git a/services/xmrig-auto-pause.nix b/services/monero/xmrig-auto-pause.nix
similarity index 100%
rename from services/xmrig-auto-pause.nix
rename to services/monero/xmrig-auto-pause.nix
diff --git a/services/xmrig-auto-pause.py b/services/monero/xmrig-auto-pause.py
similarity index 100%
rename from services/xmrig-auto-pause.py
rename to services/monero/xmrig-auto-pause.py
diff --git a/services/xmrig.nix b/services/monero/xmrig.nix
similarity index 100%
rename from services/xmrig.nix
rename to services/monero/xmrig.nix
diff --git a/tests/xmrig-auto-pause.nix b/tests/xmrig-auto-pause.nix
index 6f5daa6..ba8d225 100644
--- a/tests/xmrig-auto-pause.nix
+++ b/tests/xmrig-auto-pause.nix
@@ -3,7 +3,7 @@
   ...
 }:
 let
-  script = ../services/xmrig-auto-pause.py;
+  script = ../services/monero/xmrig-auto-pause.py;
   python = pkgs.python3;
 in
 pkgs.testers.runNixOSTest {