diff --git a/modules/monitor-brightness.nix b/features/monitor-brightness.nix
similarity index 100%
rename from modules/monitor-brightness.nix
rename to features/monitor-brightness.nix
diff --git a/modules/passwordstore.nix b/features/passwordstore.nix
similarity index 100%
rename from modules/passwordstore.nix
rename to features/passwordstore.nix
diff --git a/modules/protonmail-bridge.nix b/features/protonmail-bridge.nix
similarity index 100%
rename from modules/protonmail-bridge.nix
rename to features/protonmail-bridge.nix
diff --git a/modules/syncthing.nix b/features/syncthing.nix
similarity index 100%
rename from modules/syncthing.nix
rename to features/syncthing.nix
diff --git a/flake.nix b/flake.nix
index 3f458dd..fbff823 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,10 +16,10 @@
         modules = [
           # System configuration
           configurationNix
-          ./modules/passwordstore.nix
-          ./modules/syncthing.nix
-          ./modules/protonmail-bridge.nix
-          ./modules/monitor-brightness.nix
+          ./features/passwordstore.nix
+          ./features/syncthing.nix
+          ./features/protonmail-bridge.nix
+          ./features/monitor-brightness.nix
 
           # Packages from flake inputs
           ({ pkgs, lib, ... }: {
@@ -48,7 +48,7 @@
         ];
       };
     in {
-      nixosConfigurations.p71 = mkHomeMachine ./p71/configuration.nix;
-      nixosConfigurations.x1c7 = mkHomeMachine ./x1c7/configuration.nix;
+      nixosConfigurations.p71 = mkHomeMachine ./hosts/p71.nix;
+      nixosConfigurations.x1c7 = mkHomeMachine ./hosts/x1c7.nix;
     };
 }
diff --git a/p71/configuration.nix b/hosts/p71.nix
similarity index 100%
rename from p71/configuration.nix
rename to hosts/p71.nix
diff --git a/x1c7/configuration.nix b/hosts/x1c7.nix
similarity index 100%
rename from x1c7/configuration.nix
rename to hosts/x1c7.nix