diff --git a/hosts/alpha/default.nix b/hosts/alpha/default.nix
index 51fe3e7..af736fb 100644
--- a/hosts/alpha/default.nix
+++ b/hosts/alpha/default.nix
@@ -9,7 +9,7 @@
   imports = [
     ./hardware.nix
     ../common
-    ../../modules/nixos/uptime-kuma.nix
+    ../../modules/nixos/selfhosted/uptime-kuma.nix
   ];
 
   tux.services.openssh.enable = true;
diff --git a/hosts/arcturus/default.nix b/hosts/arcturus/default.nix
index 6748c6e..7cb76a7 100644
--- a/hosts/arcturus/default.nix
+++ b/hosts/arcturus/default.nix
@@ -15,21 +15,21 @@
 
     ../common
     ../../modules/nixos/virtualisation/docker.nix
-    ../../modules/nixos/postgresql.nix
-    ../../modules/nixos/headscale.nix
-    ../../modules/nixos/vaultwarden.nix
-    ../../modules/nixos/gitea.nix
-    ../../modules/nixos/plausible.nix
-    ../../modules/nixos/monitoring/grafana.nix
-    ../../modules/nixos/monitoring/loki.nix
-    ../../modules/nixos/monitoring/promtail.nix
-    ../../modules/nixos/ntfy-sh.nix
-    ../../modules/nixos/searx.nix
-    ../../modules/nixos/wakapi.nix
-    ../../modules/nixos/nextcloud.nix
-    ../../modules/nixos/silver-bullet.nix
-    ../../modules/nixos/rustdesk-server.nix
-    ../../modules/nixos/containers/cs2.nix
+    ../../modules/nixos/selfhosted/postgresql.nix
+    ../../modules/nixos/selfhosted/headscale.nix
+    ../../modules/nixos/selfhosted/vaultwarden.nix
+    ../../modules/nixos/selfhosted/gitea.nix
+    ../../modules/nixos/selfhosted/plausible.nix
+    ../../modules/nixos/selfhosted/monitoring/grafana.nix
+    ../../modules/nixos/selfhosted/monitoring/loki.nix
+    ../../modules/nixos/selfhosted/monitoring/promtail.nix
+    ../../modules/nixos/selfhosted/ntfy-sh.nix
+    ../../modules/nixos/selfhosted/searx.nix
+    ../../modules/nixos/selfhosted/wakapi.nix
+    ../../modules/nixos/selfhosted/nextcloud.nix
+    ../../modules/nixos/selfhosted/silver-bullet.nix
+    ../../modules/nixos/selfhosted/rustdesk-server.nix
+    ../../modules/nixos/selfhosted/containers/cs2.nix
   ];
 
   tux.services.openssh.enable = true;
diff --git a/hosts/capella/default.nix b/hosts/capella/default.nix
index d582e68..5dc091a 100644
--- a/hosts/capella/default.nix
+++ b/hosts/capella/default.nix
@@ -12,7 +12,7 @@
 
     ../common
     ../../modules/nixos/virtualisation/docker.nix
-    ../../modules/nixos/containers/cs2.nix
+    ../../modules/nixos/selfhosted/containers/cs2.nix
   ];
 
   tux.services.openssh.enable = true;
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index fbf6d8a..7635d0b 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -11,9 +11,9 @@
 
     ../../modules/base
     ../../modules/nixos/fail2ban.nix
-    ../../modules/nixos/upstream-proxy.nix
-    ../../modules/nixos/tfolio.nix
-    ../../modules/nixos/cyber-tux.nix
+    ../../modules/nixos/selfhosted/upstream-proxy.nix
+    ../../modules/nixos/selfhosted/tfolio.nix
+    ../../modules/nixos/selfhosted/cyber-tux.nix
     ../../modules/nixos/networking/ssh.nix
   ];
 
diff --git a/hosts/homelab/default.nix b/hosts/homelab/default.nix
index d59ec62..fda47c2 100755
--- a/hosts/homelab/default.nix
+++ b/hosts/homelab/default.nix
@@ -15,7 +15,7 @@
     ../common
     ../../modules/nixos/desktop
     ../../modules/nixos/virtualisation/docker.nix
-    ../../modules/nixos/open-webui.nix
+    ../../modules/nixos/selfhosted/open-webui.nix
   ];
 
   tux.services.openssh.enable = true;
diff --git a/hosts/vega/default.nix b/hosts/vega/default.nix
index b3029ff..d1dcbac 100644
--- a/hosts/vega/default.nix
+++ b/hosts/vega/default.nix
@@ -7,7 +7,7 @@
     ./hardware.nix
     ../common
 
-    ../../modules/nixos/adguard.nix
+    ../../modules/nixos/selfhosted/adguard.nix
   ];
 
   tux.services.openssh.enable = true;
diff --git a/modules/nixos/adguard.nix b/modules/nixos/selfhosted/adguard.nix
similarity index 100%
rename from modules/nixos/adguard.nix
rename to modules/nixos/selfhosted/adguard.nix
diff --git a/modules/nixos/containers/cs2.nix b/modules/nixos/selfhosted/containers/cs2.nix
similarity index 100%
rename from modules/nixos/containers/cs2.nix
rename to modules/nixos/selfhosted/containers/cs2.nix
diff --git a/modules/nixos/cyber-tux.nix b/modules/nixos/selfhosted/cyber-tux.nix
similarity index 100%
rename from modules/nixos/cyber-tux.nix
rename to modules/nixos/selfhosted/cyber-tux.nix
diff --git a/modules/nixos/gitea.nix b/modules/nixos/selfhosted/gitea.nix
similarity index 100%
rename from modules/nixos/gitea.nix
rename to modules/nixos/selfhosted/gitea.nix
diff --git a/modules/nixos/headscale.nix b/modules/nixos/selfhosted/headscale.nix
similarity index 100%
rename from modules/nixos/headscale.nix
rename to modules/nixos/selfhosted/headscale.nix
diff --git a/modules/nixos/monitoring/grafana.nix b/modules/nixos/selfhosted/monitoring/grafana.nix
similarity index 100%
rename from modules/nixos/monitoring/grafana.nix
rename to modules/nixos/selfhosted/monitoring/grafana.nix
diff --git a/modules/nixos/monitoring/loki.nix b/modules/nixos/selfhosted/monitoring/loki.nix
similarity index 100%
rename from modules/nixos/monitoring/loki.nix
rename to modules/nixos/selfhosted/monitoring/loki.nix
diff --git a/modules/nixos/monitoring/promtail.nix b/modules/nixos/selfhosted/monitoring/promtail.nix
similarity index 100%
rename from modules/nixos/monitoring/promtail.nix
rename to modules/nixos/selfhosted/monitoring/promtail.nix
diff --git a/modules/nixos/nextcloud.nix b/modules/nixos/selfhosted/nextcloud.nix
similarity index 100%
rename from modules/nixos/nextcloud.nix
rename to modules/nixos/selfhosted/nextcloud.nix
diff --git a/modules/nixos/ntfy-sh.nix b/modules/nixos/selfhosted/ntfy-sh.nix
similarity index 100%
rename from modules/nixos/ntfy-sh.nix
rename to modules/nixos/selfhosted/ntfy-sh.nix
diff --git a/modules/nixos/open-webui.nix b/modules/nixos/selfhosted/open-webui.nix
similarity index 100%
rename from modules/nixos/open-webui.nix
rename to modules/nixos/selfhosted/open-webui.nix
diff --git a/modules/nixos/plausible.nix b/modules/nixos/selfhosted/plausible.nix
similarity index 100%
rename from modules/nixos/plausible.nix
rename to modules/nixos/selfhosted/plausible.nix
diff --git a/modules/nixos/postgresql.nix b/modules/nixos/selfhosted/postgresql.nix
similarity index 100%
rename from modules/nixos/postgresql.nix
rename to modules/nixos/selfhosted/postgresql.nix
diff --git a/modules/nixos/rustdesk-server.nix b/modules/nixos/selfhosted/rustdesk-server.nix
similarity index 100%
rename from modules/nixos/rustdesk-server.nix
rename to modules/nixos/selfhosted/rustdesk-server.nix
diff --git a/modules/nixos/searx.nix b/modules/nixos/selfhosted/searx.nix
similarity index 100%
rename from modules/nixos/searx.nix
rename to modules/nixos/selfhosted/searx.nix
diff --git a/modules/nixos/silver-bullet.nix b/modules/nixos/selfhosted/silver-bullet.nix
similarity index 100%
rename from modules/nixos/silver-bullet.nix
rename to modules/nixos/selfhosted/silver-bullet.nix
diff --git a/modules/nixos/tfolio.nix b/modules/nixos/selfhosted/tfolio.nix
similarity index 100%
rename from modules/nixos/tfolio.nix
rename to modules/nixos/selfhosted/tfolio.nix
diff --git a/modules/nixos/upstream-proxy.nix b/modules/nixos/selfhosted/upstream-proxy.nix
similarity index 100%
rename from modules/nixos/upstream-proxy.nix
rename to modules/nixos/selfhosted/upstream-proxy.nix
diff --git a/modules/nixos/uptime-kuma.nix b/modules/nixos/selfhosted/uptime-kuma.nix
similarity index 100%
rename from modules/nixos/uptime-kuma.nix
rename to modules/nixos/selfhosted/uptime-kuma.nix
diff --git a/modules/nixos/vaultwarden.nix b/modules/nixos/selfhosted/vaultwarden.nix
similarity index 100%
rename from modules/nixos/vaultwarden.nix
rename to modules/nixos/selfhosted/vaultwarden.nix
diff --git a/modules/nixos/wakapi.nix b/modules/nixos/selfhosted/wakapi.nix
similarity index 100%
rename from modules/nixos/wakapi.nix
rename to modules/nixos/selfhosted/wakapi.nix