diff --git a/flake.nix b/flake.nix
index c042084..cde66cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -91,7 +91,7 @@
           modules = [
             home-manager.nixosModules.home-manager
             secrets.nixosModules.winter
-            (./hosts + "/${name}.nix")
+            (./hosts + "/${name}")
           ];
           specialArgs = { inherit inputs modules overlays enableGUI; };
         };
diff --git a/hosts/winter.nix b/hosts/winter/default.nix
similarity index 74%
rename from hosts/winter.nix
rename to hosts/winter/default.nix
index 36b3480..c7dd297 100644
--- a/hosts/winter.nix
+++ b/hosts/winter/default.nix
@@ -5,18 +5,19 @@
   imports = with modules.system; [
     audio
     base
-    filesystem-winter
     gui
     input
     kernel
-    kernel-winter
-    networking
     nix
     packages
     security
     snapper
 
-    ../users/rin.nix
+    ./filesystem.nix
+    ./kernel.nix
+    ./networking.nix
+
+    ../../users/rin.nix
   ];
 }
 
diff --git a/modules/system/filesystem-winter.nix b/hosts/winter/filesystem.nix
similarity index 100%
rename from modules/system/filesystem-winter.nix
rename to hosts/winter/filesystem.nix
diff --git a/modules/system/kernel-winter.nix b/hosts/winter/kernel.nix
similarity index 100%
rename from modules/system/kernel-winter.nix
rename to hosts/winter/kernel.nix
diff --git a/modules/system/networking-winter.nix b/hosts/winter/networking.nix
similarity index 100%
rename from modules/system/networking-winter.nix
rename to hosts/winter/networking.nix