diff --git a/flake.nix b/flake.nix
index 415695a..6ff070b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,7 @@
         ${hostName} = nixpkgs.lib.nixosSystem {
           inherit system;
           modules = [
-            ./configuration.nix
+            ./hosts/${hostName}/configuration.nix
             {
               networking.hostName = hostName;
             }
@@ -30,7 +30,7 @@
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.${username} = import ./home.nix;
+              home-manager.users.${username} = import ./hosts/${hostName}/home.nix;
             }
             microvm.nixosModules.host
             {
diff --git a/configuration.nix b/hosts/nixos/configuration.nix
similarity index 100%
rename from configuration.nix
rename to hosts/nixos/configuration.nix
diff --git a/hardware-configuration.nix b/hosts/nixos/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/nixos/hardware-configuration.nix
diff --git a/home.nix b/hosts/nixos/home.nix
similarity index 100%
rename from home.nix
rename to hosts/nixos/home.nix