diff --git a/hosts/cave/configuration.nix b/hosts/cave/configuration.nix
index 0adb197..1f5c819 100644
--- a/hosts/cave/configuration.nix
+++ b/hosts/cave/configuration.nix
@@ -127,7 +127,7 @@ in {
     "fluffychat-web-1.22.1"
     "olm-3.2.16"
   ];
-  
+
   # services.systembus-notify.enable = true;
 
   services.printing.drivers = [pkgs.cnijfilter2];
diff --git a/hosts/vulpecula-vps/configuration.nix b/hosts/vulpecula-vps/configuration.nix
index e5e221c..b069dd5 100644
--- a/hosts/vulpecula-vps/configuration.nix
+++ b/hosts/vulpecula-vps/configuration.nix
@@ -10,14 +10,15 @@ in {
     ./hardware-configuration.nix
     ../../common/base.nix
 
-    ./forgejo.nix
-    ./grafana.nix
-    ./tasiaiso.nix
-    ./wallabag.nix
-    ./nextcloud.nix
-    ./vaultwarden.nix
-    ./linkding.nix
-    ./uptime-kuma.nix
+    ./services/tasiaiso.nix
+
+    ./services/forgejo.nix
+    ./services/grafana.nix
+    ./services/wallabag.nix
+    ./services/nextcloud.nix
+    ./services/vaultwarden.nix
+    ./services/linkding.nix
+    ./services/uptime-kuma.nix
     # ./thymis.nix
   ];
 
diff --git a/hosts/vulpecula-vps/cryptpad.nix b/hosts/vulpecula-vps/services/cryptpad.nix
similarity index 100%
rename from hosts/vulpecula-vps/cryptpad.nix
rename to hosts/vulpecula-vps/services/cryptpad.nix
diff --git a/hosts/vulpecula-vps/forgejo.nix b/hosts/vulpecula-vps/services/forgejo.nix
similarity index 100%
rename from hosts/vulpecula-vps/forgejo.nix
rename to hosts/vulpecula-vps/services/forgejo.nix
diff --git a/hosts/vulpecula-vps/grafana.nix b/hosts/vulpecula-vps/services/grafana.nix
similarity index 100%
rename from hosts/vulpecula-vps/grafana.nix
rename to hosts/vulpecula-vps/services/grafana.nix
diff --git a/hosts/vulpecula-vps/linkding.nix b/hosts/vulpecula-vps/services/linkding.nix
similarity index 100%
rename from hosts/vulpecula-vps/linkding.nix
rename to hosts/vulpecula-vps/services/linkding.nix
diff --git a/hosts/vulpecula-vps/nextcloud.nix b/hosts/vulpecula-vps/services/nextcloud.nix
similarity index 100%
rename from hosts/vulpecula-vps/nextcloud.nix
rename to hosts/vulpecula-vps/services/nextcloud.nix
diff --git a/hosts/vulpecula-vps/tasiaiso.nix b/hosts/vulpecula-vps/services/tasiaiso.nix
similarity index 100%
rename from hosts/vulpecula-vps/tasiaiso.nix
rename to hosts/vulpecula-vps/services/tasiaiso.nix
diff --git a/hosts/vulpecula-vps/thymis.nix b/hosts/vulpecula-vps/services/thymis.nix
similarity index 100%
rename from hosts/vulpecula-vps/thymis.nix
rename to hosts/vulpecula-vps/services/thymis.nix
diff --git a/hosts/vulpecula-vps/uptime-kuma.nix b/hosts/vulpecula-vps/services/uptime-kuma.nix
similarity index 99%
rename from hosts/vulpecula-vps/uptime-kuma.nix
rename to hosts/vulpecula-vps/services/uptime-kuma.nix
index 0b587b2..54f3f1d 100644
--- a/hosts/vulpecula-vps/uptime-kuma.nix
+++ b/hosts/vulpecula-vps/services/uptime-kuma.nix
@@ -11,4 +11,4 @@
       PORT = "4000";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/vulpecula-vps/vaultwarden.nix b/hosts/vulpecula-vps/services/vaultwarden.nix
similarity index 94%
rename from hosts/vulpecula-vps/vaultwarden.nix
rename to hosts/vulpecula-vps/services/vaultwarden.nix
index c186b35..3eb0b01 100644
--- a/hosts/vulpecula-vps/vaultwarden.nix
+++ b/hosts/vulpecula-vps/services/vaultwarden.nix
@@ -1,4 +1,8 @@
-{inputs, config, ...}: {
+{
+  inputs,
+  config,
+  ...
+}: {
   services.nginx.virtualHosts."vault.vulpecula.zone" = {
     addSSL = true;
     enableACME = true;
diff --git a/hosts/vulpecula-vps/wallabag.nix b/hosts/vulpecula-vps/services/wallabag.nix
similarity index 100%
rename from hosts/vulpecula-vps/wallabag.nix
rename to hosts/vulpecula-vps/services/wallabag.nix