diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 2ef2ce7..1770f51 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -10,30 +10,30 @@
     ./databases/mysql.nix
     ./databases/redis.nix
 
-    ./programs/nginx.nix
-    ./programs/bash.nix
     ./programs/acme.nix
-    ./programs/mastodon.nix
-    ./programs/nextcloud.nix
-    ./programs/jellyfin.nix
-    ./programs/photoprism.nix
-    ./programs/synapse.nix
-    ./programs/fail2ban.nix
-    ./programs/maddy.nix
+    ./programs/bash.nix
     ./programs/docker.nix
-    ./programs/microboard.nix
-    ./programs/freshrss.nix
-    ./programs/comfycamp.nix
-    ./programs/phoenix.nix
-    ./programs/deluge.nix
-    ./programs/prosody.nix
-    ./programs/yggdrasil.nix
-    ./programs/forgejo.nix
+    ./programs/fail2ban.nix
+    ./programs/nginx.nix
 
     ./monitoring/grafana.nix
     ./monitoring/prometheus.nix
-
-    ./websites/ss.nix
+    
+    ./services/comfycamp.nix
+    ./services/deluge.nix
+    ./services/forgejo.nix
+    ./services/freshrss.nix
+    ./services/jellyfin.nix
+    ./services/maddy.nix
+    ./services/mastodon.nix
+    ./services/microboard.nix
+    ./services/nextcloud.nix
+    ./services/phoenix.nix
+    ./services/photoprism.nix
+    ./services/prosody.nix
+    ./services/ss.nix
+    ./services/synapse.nix
+    ./services/yggdrasil.nix
   ];
 
   nix = {
diff --git a/nixos/programs/comfycamp.nix b/nixos/services/comfycamp.nix
similarity index 100%
rename from nixos/programs/comfycamp.nix
rename to nixos/services/comfycamp.nix
diff --git a/nixos/programs/deluge.nix b/nixos/services/deluge.nix
similarity index 100%
rename from nixos/programs/deluge.nix
rename to nixos/services/deluge.nix
diff --git a/nixos/programs/forgejo.nix b/nixos/services/forgejo.nix
similarity index 100%
rename from nixos/programs/forgejo.nix
rename to nixos/services/forgejo.nix
diff --git a/nixos/programs/freshrss.nix b/nixos/services/freshrss.nix
similarity index 100%
rename from nixos/programs/freshrss.nix
rename to nixos/services/freshrss.nix
diff --git a/nixos/programs/jellyfin.nix b/nixos/services/jellyfin.nix
similarity index 100%
rename from nixos/programs/jellyfin.nix
rename to nixos/services/jellyfin.nix
diff --git a/nixos/programs/maddy.nix b/nixos/services/maddy.nix
similarity index 100%
rename from nixos/programs/maddy.nix
rename to nixos/services/maddy.nix
diff --git a/nixos/programs/mastodon.nix b/nixos/services/mastodon.nix
similarity index 100%
rename from nixos/programs/mastodon.nix
rename to nixos/services/mastodon.nix
diff --git a/nixos/programs/microboard.nix b/nixos/services/microboard.nix
similarity index 100%
rename from nixos/programs/microboard.nix
rename to nixos/services/microboard.nix
diff --git a/nixos/programs/nextcloud.nix b/nixos/services/nextcloud.nix
similarity index 100%
rename from nixos/programs/nextcloud.nix
rename to nixos/services/nextcloud.nix
diff --git a/nixos/programs/phoenix.nix b/nixos/services/phoenix.nix
similarity index 100%
rename from nixos/programs/phoenix.nix
rename to nixos/services/phoenix.nix
diff --git a/nixos/programs/photoprism.nix b/nixos/services/photoprism.nix
similarity index 100%
rename from nixos/programs/photoprism.nix
rename to nixos/services/photoprism.nix
diff --git a/nixos/programs/prosody.nix b/nixos/services/prosody.nix
similarity index 100%
rename from nixos/programs/prosody.nix
rename to nixos/services/prosody.nix
diff --git a/nixos/websites/ss.nix b/nixos/services/ss.nix
similarity index 100%
rename from nixos/websites/ss.nix
rename to nixos/services/ss.nix
diff --git a/nixos/programs/synapse.nix b/nixos/services/synapse.nix
similarity index 100%
rename from nixos/programs/synapse.nix
rename to nixos/services/synapse.nix
diff --git a/nixos/programs/yggdrasil.nix b/nixos/services/yggdrasil.nix
similarity index 100%
rename from nixos/programs/yggdrasil.nix
rename to nixos/services/yggdrasil.nix