diff --git a/flake.nix b/flake.nix
index 63cd3ed..64b6681 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,9 +83,10 @@
         ({ config, pkgs, ... }: { nixpkgs.overlays = my-overlays; })
         # nur.nixosModules.nur
         inputs.nh.nixosModules.default
-        ./configuration.nix
+        ./hosts/laptop/configuration.nix
+        ./hosts/laptop/hardware-configuration.nix
+        ./hosts/laptop/mounts.nix
         # nix-index-database.nixosModules.nix-index
-        ./mounts.nix
 
         # make home-manager as a module of nixos
         # so that home-manager configuration will be deployed automatically when executing `nixos-rebuild switch`
diff --git a/configuration.nix b/hosts/laptop/configuration.nix
similarity index 98%
rename from configuration.nix
rename to hosts/laptop/configuration.nix
index 84af77a..3e4b061 100644
--- a/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -4,12 +4,7 @@
 
 { config, pkgs, pkgs-stable, secrets, ... }:
 
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configurations/laptop.nix
-    ];
-  
+{  
   # boot.kernelPackages = pkgs.linuxPackages_zen;
 
   # Use the systemd-boot EFI boot loader.
diff --git a/hardware-configurations/laptop.nix b/hosts/laptop/hardware-configuration.nix
similarity index 100%
rename from hardware-configurations/laptop.nix
rename to hosts/laptop/hardware-configuration.nix
diff --git a/mounts.nix b/hosts/laptop/mounts.nix
similarity index 100%
rename from mounts.nix
rename to hosts/laptop/mounts.nix