diff --git a/modules/containers.nix b/modules/incus/containers.nix
similarity index 100%
rename from modules/containers.nix
rename to modules/incus/containers.nix
diff --git a/modules/guest.nix b/modules/incus/guest.nix
similarity index 100%
rename from modules/guest.nix
rename to modules/incus/guest.nix
diff --git a/modules/incus.nix b/modules/incus/incus.nix
similarity index 100%
rename from modules/incus.nix
rename to modules/incus/incus.nix
diff --git a/modules/autoupgrade.nix b/modules/nixos/autoupgrade.nix
similarity index 100%
rename from modules/autoupgrade.nix
rename to modules/nixos/autoupgrade.nix
diff --git a/modules/caddy.nix b/modules/nixos/caddy.nix
similarity index 100%
rename from modules/caddy.nix
rename to modules/nixos/caddy.nix
diff --git a/modules/deploy.fish b/modules/nixos/deploy.fish
similarity index 100%
rename from modules/deploy.fish
rename to modules/nixos/deploy.fish
diff --git a/modules/deploy.nix b/modules/nixos/deploy.nix
similarity index 100%
rename from modules/deploy.nix
rename to modules/nixos/deploy.nix
diff --git a/modules/documentation.nix b/modules/nixos/documentation.nix
similarity index 100%
rename from modules/documentation.nix
rename to modules/nixos/documentation.nix
diff --git a/modules/imports.nix b/modules/nixos/imports.nix
similarity index 100%
rename from modules/imports.nix
rename to modules/nixos/imports.nix
diff --git a/modules/lix.nix b/modules/nixos/lix.nix
similarity index 100%
rename from modules/lix.nix
rename to modules/nixos/lix.nix
diff --git a/modules/networking.nix b/modules/nixos/networking.nix
similarity index 100%
rename from modules/networking.nix
rename to modules/nixos/networking.nix
diff --git a/modules/nix.nix b/modules/nixos/nix.nix
similarity index 100%
rename from modules/nix.nix
rename to modules/nixos/nix.nix
diff --git a/modules/nixos.nix b/modules/nixos/nixos.nix
similarity index 100%
rename from modules/nixos.nix
rename to modules/nixos/nixos.nix
diff --git a/modules/persistence.nix b/modules/nixos/persistence.nix
similarity index 100%
rename from modules/persistence.nix
rename to modules/nixos/persistence.nix
diff --git a/modules/restic.nix b/modules/nixos/restic.nix
similarity index 100%
rename from modules/restic.nix
rename to modules/nixos/restic.nix
diff --git a/modules/vm.nix b/modules/nixos/vm.nix
similarity index 100%
rename from modules/vm.nix
rename to modules/nixos/vm.nix
diff --git a/modules/xdg.nix b/modules/nixos/xdg.nix
similarity index 100%
rename from modules/xdg.nix
rename to modules/nixos/xdg.nix
diff --git a/modules/yggdrasil/dns.nix b/modules/nixos/yggdrasil/dns.nix
similarity index 100%
rename from modules/yggdrasil/dns.nix
rename to modules/nixos/yggdrasil/dns.nix
diff --git a/modules/yggdrasil/endpoints.nix b/modules/nixos/yggdrasil/endpoints.nix
similarity index 100%
rename from modules/yggdrasil/endpoints.nix
rename to modules/nixos/yggdrasil/endpoints.nix
diff --git a/modules/yggdrasil/hosts.nix b/modules/nixos/yggdrasil/hosts.nix
similarity index 100%
rename from modules/yggdrasil/hosts.nix
rename to modules/nixos/yggdrasil/hosts.nix
diff --git a/modules/yggdrasil/network.nix b/modules/nixos/yggdrasil/network.nix
similarity index 100%
rename from modules/yggdrasil/network.nix
rename to modules/nixos/yggdrasil/network.nix
diff --git a/modules/forgejo.nix b/modules/services/forgejo.nix
similarity index 100%
rename from modules/forgejo.nix
rename to modules/services/forgejo.nix
diff --git a/modules/miniflux.nix b/modules/services/miniflux.nix
similarity index 84%
rename from modules/miniflux.nix
rename to modules/services/miniflux.nix
index 8f8be5b..534adc4 100644
--- a/modules/miniflux.nix
+++ b/modules/services/miniflux.nix
@@ -5,7 +5,7 @@
       local.endpoints.rss.public = "rss.peterrice.xyz";
 
       age.secrets."miniflux-credentials" = {
-        file = ../modules/hosts/ruan/secrets/miniflux-credentials.age;
+        file = ../hosts/ruan/secrets/miniflux-credentials.age;
       };
 
       services.miniflux = {
diff --git a/modules/podcasts.nix b/modules/services/podcasts.nix
similarity index 100%
rename from modules/podcasts.nix
rename to modules/services/podcasts.nix
diff --git a/modules/transmission.nix b/modules/services/transmission.nix
similarity index 94%
rename from modules/transmission.nix
rename to modules/services/transmission.nix
index 1f1a247..f660135 100644
--- a/modules/transmission.nix
+++ b/modules/services/transmission.nix
@@ -4,7 +4,7 @@
     { config, pkgs, ... }:
     {
       age.secrets."transmission-credentials.json" = {
-        file = ../modules/hosts/ruan/secrets/transmission-credentials.json.age;
+        file = ../hosts/ruan/secrets/transmission-credentials.json.age;
         owner = "transmission";
         group = "transmission";
       };
diff --git a/modules/hjem.nix b/modules/user/hjem.nix
similarity index 100%
rename from modules/hjem.nix
rename to modules/user/hjem.nix
diff --git a/modules/user.nix b/modules/user/peter.nix
similarity index 100%
rename from modules/user.nix
rename to modules/user/peter.nix