diff --git a/flake.nix b/flake.nix
index 21c464d..9552d18 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,7 +135,6 @@
               inputs.agenix.nixosModules.default
               ./common
               ./services
-              (builtins.toPath "${inputs.randomcat}/services/default.nix")
             ];
           };
 
diff --git a/services/default.nix b/services/default.nix
index 194eb43..112bdc9 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -1,13 +1,9 @@
 {
   imports = [
-    ./actual.nix
-    ./audiobookshelf.nix
+    ./qenya
+    ./randomcat
+
     ./distributed-builds.nix
-    ./forgejo.nix
-    ./headscale.nix
-    ./jellyfin.nix
-    ./navidrome.nix
-    ./owncast.nix
     ./remote-builder.nix
     ./web-redirect.nix
   ];
diff --git a/services/actual.nix b/services/qenya/actual.nix
similarity index 100%
rename from services/actual.nix
rename to services/qenya/actual.nix
diff --git a/services/audiobookshelf.nix b/services/qenya/audiobookshelf.nix
similarity index 100%
rename from services/audiobookshelf.nix
rename to services/qenya/audiobookshelf.nix
diff --git a/services/qenya/default.nix b/services/qenya/default.nix
new file mode 100644
index 0000000..bd1c6ea
--- /dev/null
+++ b/services/qenya/default.nix
@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./actual.nix
+    ./audiobookshelf.nix
+    ./forgejo.nix
+    ./headscale.nix
+    ./jellyfin.nix
+    ./navidrome.nix
+    ./owncast.nix
+  ];
+}
diff --git a/services/forgejo.nix b/services/qenya/forgejo.nix
similarity index 100%
rename from services/forgejo.nix
rename to services/qenya/forgejo.nix
diff --git a/services/headscale.nix b/services/qenya/headscale.nix
similarity index 100%
rename from services/headscale.nix
rename to services/qenya/headscale.nix
diff --git a/services/jellyfin.nix b/services/qenya/jellyfin.nix
similarity index 100%
rename from services/jellyfin.nix
rename to services/qenya/jellyfin.nix
diff --git a/services/navidrome.nix b/services/qenya/navidrome.nix
similarity index 100%
rename from services/navidrome.nix
rename to services/qenya/navidrome.nix
diff --git a/services/owncast.nix b/services/qenya/owncast.nix
similarity index 100%
rename from services/owncast.nix
rename to services/qenya/owncast.nix
diff --git a/services/randomcat/default.nix b/services/randomcat/default.nix
new file mode 100644
index 0000000..72758b9
--- /dev/null
+++ b/services/randomcat/default.nix
@@ -0,0 +1,7 @@
+{ inputs, ... }:
+
+{
+  imports = [
+    (builtins.toPath "${inputs.randomcat}/services/default.nix")
+  ];
+}