diff --git a/nixos/hosts/cnix/imports.nix b/nixos/hosts/cnix/imports.nix
index 78b48ea6..cbd0c83c 100644
--- a/nixos/hosts/cnix/imports.nix
+++ b/nixos/hosts/cnix/imports.nix
@@ -13,19 +13,19 @@
     ../../locale
 
     # services
-    ../../services/blueman.nix
-    ../../services/dbus.nix
-    ../../services/gnome-keyring.nix
-    ../../services/greetd.nix
-    ../../services/gvfs.nix
-    ../../services/locate.nix
-    ../../services/mullvad.nix
-    ../../services/openssh.nix
-    ../../services/pipewire.nix
-    ../../services/power.nix
-    ../../services/samba.nix
-    ../../services/udisks.nix
-    ../../services/xserver-cnix.nix
+    ../../services/blueman
+    ../../services/dbus
+    ../../services/gnome-keyring
+    ../../services/greetd
+    ../../services/gvfs
+    ../../services/locate
+    ../../services/mullvad
+    ../../services/openssh
+    ../../services/audio
+    ../../services/power
+    ../../services/samba
+    ../../services/udisks
+    ../../services/xserver/cnix.nix
 
     # extra
     ../../extra/gaming.nix
diff --git a/nixos/services/pipewire.nix b/nixos/services/audio/default.nix
similarity index 100%
rename from nixos/services/pipewire.nix
rename to nixos/services/audio/default.nix
diff --git a/nixos/services/blueman.nix b/nixos/services/blueman/default.nix
similarity index 100%
rename from nixos/services/blueman.nix
rename to nixos/services/blueman/default.nix
diff --git a/nixos/services/dbus.nix b/nixos/services/dbus/default.nix
similarity index 100%
rename from nixos/services/dbus.nix
rename to nixos/services/dbus/default.nix
diff --git a/nixos/services/fwupd.nix b/nixos/services/fwupd/default.nix
similarity index 100%
rename from nixos/services/fwupd.nix
rename to nixos/services/fwupd/default.nix
diff --git a/nixos/services/gnome-keyring.nix b/nixos/services/gnome-keyring/default.nix
similarity index 100%
rename from nixos/services/gnome-keyring.nix
rename to nixos/services/gnome-keyring/default.nix
diff --git a/nixos/services/greetd.nix b/nixos/services/greetd/default.nix
similarity index 100%
rename from nixos/services/greetd.nix
rename to nixos/services/greetd/default.nix
diff --git a/nixos/services/gvfs.nix b/nixos/services/gvfs/default.nix
similarity index 100%
rename from nixos/services/gvfs.nix
rename to nixos/services/gvfs/default.nix
diff --git a/nixos/services/locate.nix b/nixos/services/locate/default.nix
similarity index 100%
rename from nixos/services/locate.nix
rename to nixos/services/locate/default.nix
diff --git a/nixos/services/mullvad.nix b/nixos/services/mullvad/default.nix
similarity index 100%
rename from nixos/services/mullvad.nix
rename to nixos/services/mullvad/default.nix
diff --git a/nixos/services/openssh.nix b/nixos/services/openssh/default.nix
similarity index 100%
rename from nixos/services/openssh.nix
rename to nixos/services/openssh/default.nix
diff --git a/nixos/services/power.nix b/nixos/services/power/default.nix
similarity index 100%
rename from nixos/services/power.nix
rename to nixos/services/power/default.nix
diff --git a/nixos/services/samba.nix b/nixos/services/samba/default.nix
similarity index 100%
rename from nixos/services/samba.nix
rename to nixos/services/samba/default.nix
diff --git a/nixos/services/udisks.nix b/nixos/services/udisks/default.nix
similarity index 100%
rename from nixos/services/udisks.nix
rename to nixos/services/udisks/default.nix
diff --git a/nixos/services/xserver-adampad.nix b/nixos/services/xserver/adampad.nix
similarity index 100%
rename from nixos/services/xserver-adampad.nix
rename to nixos/services/xserver/adampad.nix
diff --git a/nixos/services/xserver-cnix.nix b/nixos/services/xserver/cnix.nix
similarity index 100%
rename from nixos/services/xserver-cnix.nix
rename to nixos/services/xserver/cnix.nix
diff --git a/nixos/services/xserver-toothpc.nix b/nixos/services/xserver/toothpc.nix
similarity index 100%
rename from nixos/services/xserver-toothpc.nix
rename to nixos/services/xserver/toothpc.nix