diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index d16c24bc..efb7f3ec 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -13,6 +13,12 @@
     ../../modules/mixins/docker.nix
 
     ./modules/acme.nix
+    ./modules/audiobookshelf.nix
+    ./modules/containers/pi-hole.nix
+    ./modules/forgejo.nix
+    ./modules/immich.nix
+    ./modules/jellyfin.nix
+    ./modules/paperless.nix
 
     ../common
     ../../users/opdavies
diff --git a/modules/nixos/homelab/audiobookshelf.nix b/hosts/nixedo/modules/audiobookshelf.nix
similarity index 100%
rename from modules/nixos/homelab/audiobookshelf.nix
rename to hosts/nixedo/modules/audiobookshelf.nix
diff --git a/modules/nixos/homelab/containers/pi-hole.nix b/hosts/nixedo/modules/containers/pi-hole.nix
similarity index 100%
rename from modules/nixos/homelab/containers/pi-hole.nix
rename to hosts/nixedo/modules/containers/pi-hole.nix
diff --git a/modules/nixos/homelab/forgejo.nix b/hosts/nixedo/modules/forgejo.nix
similarity index 100%
rename from modules/nixos/homelab/forgejo.nix
rename to hosts/nixedo/modules/forgejo.nix
diff --git a/modules/nixos/homelab/immich.nix b/hosts/nixedo/modules/immich.nix
similarity index 100%
rename from modules/nixos/homelab/immich.nix
rename to hosts/nixedo/modules/immich.nix
diff --git a/modules/nixos/homelab/jellyfin.nix b/hosts/nixedo/modules/jellyfin.nix
similarity index 100%
rename from modules/nixos/homelab/jellyfin.nix
rename to hosts/nixedo/modules/jellyfin.nix
diff --git a/modules/nixos/homelab/paperless.nix b/hosts/nixedo/modules/paperless.nix
similarity index 100%
rename from modules/nixos/homelab/paperless.nix
rename to hosts/nixedo/modules/paperless.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index 46985cc0..00000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./homelab
-  ];
-}
diff --git a/modules/nixos/homelab/containers/default.nix b/modules/nixos/homelab/containers/default.nix
deleted file mode 100644
index 5132a01b..00000000
--- a/modules/nixos/homelab/containers/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./pi-hole.nix
-  ];
-}
diff --git a/modules/nixos/homelab/default.nix b/modules/nixos/homelab/default.nix
deleted file mode 100644
index d0cdbca4..00000000
--- a/modules/nixos/homelab/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  imports = [
-    ./audiobookshelf.nix
-    ./containers
-    ./forgejo.nix
-    ./immich.nix
-    ./jellyfin.nix
-    ./paperless.nix
-  ];
-}