diff --git a/flake.nix b/flake.nix
index 64123bf..1a92288 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,12 +16,12 @@
     nixosConfigurations.nemesis = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
       modules = [
-        ./configuration.nix
+        ./hosts/nemesis
 
  	home-manager.nixosModules.home-manager {
           home-manager.useGlobalPkgs = true;
 	  home-manager.useUserPackages = true;
-          home-manager.users.rafiq = import ./home.nix;
+          home-manager.users.rafiq = import ./users/rafiq;
         }
       ];
     };
diff --git a/configuration.nix b/hosts/nemesis/default.nix
similarity index 100%
rename from configuration.nix
rename to hosts/nemesis/default.nix
diff --git a/hardware-configuration.nix b/hosts/nemesis/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/nemesis/hardware-configuration.nix
diff --git a/home.nix b/users/rafiq/default.nix
similarity index 98%
rename from home.nix
rename to users/rafiq/default.nix
index 69c1dc2..8f53bdb 100644
--- a/home.nix
+++ b/users/rafiq/default.nix
@@ -10,7 +10,7 @@
   # };
 
   home.file."bin" = {
-    source = ./scripts;
+    source = ../../scripts;
     recursive = true;
     executable = true;
   };