diff --git a/flake.nix b/flake.nix
index ce7a191..f8e5eed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,10 +13,9 @@
         system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
         nix.registry.nixpkgs.flake = nixpkgs;
       };
-      hm-module = {
+      hm-base = {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
-        home-manager.users.rin = import ./cfg/winter/rin/home.nix; # TODO: decoupling
       };
       overlays = {
         linux = import ./overlays/linux.nix;
@@ -40,8 +39,9 @@
         system = "x86_64-linux";
         modules = [
           base
-          ./cfg/winter
-          home-manager.nixosModules.home-manager hm-module
+          home-manager.nixosModules.home-manager
+          hm-base
+          ./hosts/winter
           secrets.nixosModules.winter
         ];
         specialArgs = { inherit inputs overlays; };
diff --git a/cfg/winter/audio.nix b/hosts/winter/audio.nix
similarity index 100%
rename from cfg/winter/audio.nix
rename to hosts/winter/audio.nix
diff --git a/cfg/winter/default.nix b/hosts/winter/default.nix
similarity index 98%
rename from cfg/winter/default.nix
rename to hosts/winter/default.nix
index 650aff0..ef742a2 100644
--- a/cfg/winter/default.nix
+++ b/hosts/winter/default.nix
@@ -21,7 +21,7 @@
     ./packages.nix
     ./security.nix
 
-    ./rin
+    ../../users/rin
   ];
   nix = {
     package = pkgs.nixUnstable;
diff --git a/cfg/winter/gui.nix b/hosts/winter/gui.nix
similarity index 100%
rename from cfg/winter/gui.nix
rename to hosts/winter/gui.nix
diff --git a/cfg/winter/hardware-configuration.nix b/hosts/winter/hardware-configuration.nix
similarity index 100%
rename from cfg/winter/hardware-configuration.nix
rename to hosts/winter/hardware-configuration.nix
diff --git a/cfg/winter/kernel.nix b/hosts/winter/kernel.nix
similarity index 100%
rename from cfg/winter/kernel.nix
rename to hosts/winter/kernel.nix
diff --git a/cfg/winter/networking.nix b/hosts/winter/networking.nix
similarity index 100%
rename from cfg/winter/networking.nix
rename to hosts/winter/networking.nix
diff --git a/cfg/winter/packages.nix b/hosts/winter/packages.nix
similarity index 100%
rename from cfg/winter/packages.nix
rename to hosts/winter/packages.nix
diff --git a/cfg/winter/security.nix b/hosts/winter/security.nix
similarity index 100%
rename from cfg/winter/security.nix
rename to hosts/winter/security.nix
diff --git a/overlays/linux.nix b/overlays/linux.nix
index c9925c0..202a587 100644
--- a/overlays/linux.nix
+++ b/overlays/linux.nix
@@ -23,9 +23,9 @@ self: super: {
     };
   in {
     inherit (super) lib stdenv;
-    version = "${major}.${minor}.${patch}-tkg-Lava";
+    version = "${mmp}-tkg-Lava";
     allowImportFromDerivation = true;
-    configfile = ./kernel.config;
+    configfile = ./misc/kernel.config;
     isZen = true;
 
     src = kernelUrl "linux-${mm}.tar" "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04";
diff --git a/overlays/kernel.config b/overlays/misc/kernel.config
similarity index 100%
rename from overlays/kernel.config
rename to overlays/misc/kernel.config
diff --git a/overlays/winetricks.patch b/overlays/misc/winetricks.patch
similarity index 100%
rename from overlays/winetricks.patch
rename to overlays/misc/winetricks.patch
diff --git a/overlays/winetricks.nix b/overlays/winetricks.nix
index 346c80d..4965e8c 100644
--- a/overlays/winetricks.nix
+++ b/overlays/winetricks.nix
@@ -7,6 +7,6 @@ self: super: {
       rev = "b90e0c4e7cea9acc2c9e89bc4afe873086bbd8a1";
       sha256 = "11adhgd8zavz4c9yzj0m5570fq7wv6am2wq4j9xkz2655fw2412l";
     };
-    patches = [ ./winetricks.patch ];
+    patches = [ ./misc/winetricks.patch ];
   });
 }
diff --git a/cfg/winter/rin/alacritty.nix b/users/rin/alacritty.nix
similarity index 100%
rename from cfg/winter/rin/alacritty.nix
rename to users/rin/alacritty.nix
diff --git a/cfg/winter/rin/default.nix b/users/rin/default.nix
similarity index 78%
rename from cfg/winter/rin/default.nix
rename to users/rin/default.nix
index 409decc..dd9a585 100644
--- a/cfg/winter/rin/default.nix
+++ b/users/rin/default.nix
@@ -5,4 +5,5 @@
     shell = pkgs.zsh;
     uid = 1001;
   };
+  home-manager.users.rin = import ./home.nix;
 }
diff --git a/cfg/winter/rin/dunst.nix b/users/rin/dunst.nix
similarity index 100%
rename from cfg/winter/rin/dunst.nix
rename to users/rin/dunst.nix
diff --git a/cfg/winter/rin/gtk.nix b/users/rin/gtk.nix
similarity index 100%
rename from cfg/winter/rin/gtk.nix
rename to users/rin/gtk.nix
diff --git a/cfg/winter/rin/home.nix b/users/rin/home.nix
similarity index 100%
rename from cfg/winter/rin/home.nix
rename to users/rin/home.nix
diff --git a/cfg/winter/rin/i3.nix b/users/rin/i3.nix
similarity index 100%
rename from cfg/winter/rin/i3.nix
rename to users/rin/i3.nix
diff --git a/cfg/winter/rin/neovim.nix b/users/rin/neovim.nix
similarity index 100%
rename from cfg/winter/rin/neovim.nix
rename to users/rin/neovim.nix
diff --git a/cfg/winter/rin/picom.nix b/users/rin/picom.nix
similarity index 100%
rename from cfg/winter/rin/picom.nix
rename to users/rin/picom.nix
diff --git a/cfg/winter/rin/polybar.nix b/users/rin/polybar.nix
similarity index 100%
rename from cfg/winter/rin/polybar.nix
rename to users/rin/polybar.nix
diff --git a/cfg/winter/rin/rofi.nix b/users/rin/rofi.nix
similarity index 100%
rename from cfg/winter/rin/rofi.nix
rename to users/rin/rofi.nix
diff --git a/cfg/winter/rin/scripts/polybar.sh b/users/rin/scripts/polybar.sh
similarity index 100%
rename from cfg/winter/rin/scripts/polybar.sh
rename to users/rin/scripts/polybar.sh
diff --git a/cfg/winter/rin/scripts/xinitrc b/users/rin/scripts/xinitrc
similarity index 100%
rename from cfg/winter/rin/scripts/xinitrc
rename to users/rin/scripts/xinitrc
diff --git a/cfg/winter/rin/zsh.nix b/users/rin/zsh.nix
similarity index 100%
rename from cfg/winter/rin/zsh.nix
rename to users/rin/zsh.nix