diff --git a/flake.nix b/flake.nix
index 25c5a26..78e6567 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,32 +65,32 @@
       # Available through 'home-manager --flake .#your-username@your-hostname'
       homeConfigurations = {
         "john@penguin-duet" = lib.homeManagerConfiguration {
-          modules = [ ./home/penguin-duet.nix ];
+          modules = [ ./home/hosts/penguin-duet.nix ];
           pkgs = pkgsFor.aarch64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
         "john@penguin-fw" = lib.homeManagerConfiguration {
-          modules = [ ./home/penguin-fw.nix ];
+          modules = [ ./home/hosts/penguin-fw.nix ];
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
         "john@pixnix" = lib.homeManagerConfiguration {
-          modules = [ ./home/pixnix.nix ];
+          modules = [ ./home/hosts/pixnix.nix ];
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
         "john@volly" = lib.homeManagerConfiguration {
-          modules = [ ./home/generic.nix ];
+          modules = [ ./home/hosts/generic.nix ];
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
         "john@immich" = lib.homeManagerConfiguration {
-          modules = [ ./home/generic.nix ];
+          modules = [ ./home/hosts/generic.nix ];
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
         "john@doc" = lib.homeManagerConfiguration {
-          modules = [ ./home/generic.nix ];
+          modules = [ ./home/hosts/generic.nix ];
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
diff --git a/home/generic.nix b/home/hosts/generic.nix
similarity index 89%
rename from home/generic.nix
rename to home/hosts/generic.nix
index f2dd98d..5e113d3 100644
--- a/home/generic.nix
+++ b/home/hosts/generic.nix
@@ -1,6 +1,6 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
-    ./global
+    ../global
   ];
 
   # packages
diff --git a/home/penguin-duet.nix b/home/hosts/penguin-duet.nix
similarity index 50%
rename from home/penguin-duet.nix
rename to home/hosts/penguin-duet.nix
index fa2bacd..df6061e 100644
--- a/home/penguin-duet.nix
+++ b/home/hosts/penguin-duet.nix
@@ -1,9 +1,9 @@
 { pkgs, lib, config, ... }: {
   imports = [
-    ./global
-    ./features/cli/extras
-    ./features/desktop/vscode.nix
-    ./lib/chromeos.nix
+    ../global
+    ../features/cli/extras
+    ../features/desktop/vscode.nix
+    ../lib/chromeos.nix
   ];
 
   # packages
diff --git a/home/penguin-fw.nix b/home/hosts/penguin-fw.nix
similarity index 63%
rename from home/penguin-fw.nix
rename to home/hosts/penguin-fw.nix
index 55adfa9..893283b 100644
--- a/home/penguin-fw.nix
+++ b/home/hosts/penguin-fw.nix
@@ -1,9 +1,9 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
-    ./global
-    ./features/cli/extras
-    ./features/desktop
-    ./lib/chromeos.nix
+    ../global
+    ../features/cli/extras
+    ../features/desktop
+    ../lib/chromeos.nix
   ];
 
   # extra packages
diff --git a/home/pixnix.nix b/home/hosts/pixnix.nix
similarity index 56%
rename from home/pixnix.nix
rename to home/hosts/pixnix.nix
index d1d9601..9c2f737 100644
--- a/home/pixnix.nix
+++ b/home/hosts/pixnix.nix
@@ -1,9 +1,9 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
-    ./global
-    ./features/cli/extras
-    ./features/desktop
-    ./features/desktop/chrome.nix
+    ../global
+    ../features/cli/extras
+    ../features/desktop
+    ../features/desktop/chrome.nix
   ];
 
   # packages