diff --git a/flake.nix b/flake.nix
index 646ba49..feefb26 100755
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,6 @@
       canopus = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
         modules = [
-          ./modules/nixos
           ./hosts/canopus
 
           home-manager.nixosModules.home-manager
@@ -55,7 +54,6 @@
             home-manager.extraSpecialArgs = {inherit inputs outputs username;};
             home-manager.users.${username} = {
               imports = [
-                ./modules/home-manager
                 ./hosts/canopus/home.nix
               ];
             };
@@ -66,7 +64,6 @@
       controller = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
         modules = [
-          ./modules/nixos
           ./hosts/controller
 
           home-manager.nixosModules.home-manager
@@ -76,7 +73,7 @@
             home-manager.extraSpecialArgs = {inherit inputs outputs username;};
             home-manager.users.${username} = {
               imports = [
-                ./modules/home-manager
+                ./hosts/controller/home.nix
               ];
             };
           }
@@ -86,7 +83,6 @@
       wsl = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
         modules = [
-          ./modules/nixos
           ./hosts/wsl
 
           home-manager.nixosModules.home-manager
@@ -96,7 +92,7 @@
             home-manager.extraSpecialArgs = {inherit inputs outputs username;};
             home-manager.users.${username} = {
               imports = [
-                ./modules/home-manager
+                ./hosts/wsl/home.nix
               ];
             };
           }
@@ -106,7 +102,6 @@
       isoImage = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs username;};
         modules = [
-          ./modules/nixos
           ./hosts/isoImage
 
           home-manager.nixosModules.home-manager
@@ -116,7 +111,7 @@
             home-manager.extraSpecialArgs = {inherit inputs outputs username;};
             home-manager.users.${username} = {
               imports = [
-                ./modules/home-manager
+                ./hosts/isoImage/home.nix
               ];
             };
           }
diff --git a/hosts/canopus/default.nix b/hosts/canopus/default.nix
index 11edf51..390a63c 100755
--- a/hosts/canopus/default.nix
+++ b/hosts/canopus/default.nix
@@ -6,7 +6,7 @@
   imports = [
     inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503
     ./hardware-configuration.nix
-    ../../modules/nixos/default.nix
+    ../common
     ../../modules/nixos/desktop
     ../../modules/nixos/desktop/awesome
     ../../modules/nixos/desktop/hyprland
diff --git a/hosts/canopus/home.nix b/hosts/canopus/home.nix
index 991e868..08cc1ce 100644
--- a/hosts/canopus/home.nix
+++ b/hosts/canopus/home.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   imports = [
+    ../common/home.nix
     ../../modules/home-manager/awesome
     ../../modules/home-manager/hyprland
     ../../modules/home-manager/waybar
diff --git a/modules/nixos/default.nix b/hosts/common/default.nix
similarity index 100%
rename from modules/nixos/default.nix
rename to hosts/common/default.nix
diff --git a/modules/home-manager/default.nix b/hosts/common/home.nix
old mode 100755
new mode 100644
similarity index 73%
rename from modules/home-manager/default.nix
rename to hosts/common/home.nix
index df98319..c49b7b1
--- a/modules/home-manager/default.nix
+++ b/hosts/common/home.nix
@@ -4,12 +4,12 @@
   ...
 }: {
   imports = [
-    ./shell
-    ./git
-    ./starship
-    ./nvim
-    ./tmux
-    ./helix
+    ../../modules/home-manager/shell
+    ../../modules/home-manager/git
+    ../../modules/home-manager/starship
+    ../../modules/home-manager/nvim
+    ../../modules/home-manager/tmux
+    ../../modules/home-manager/helix
   ];
 
   nixpkgs = {
diff --git a/hosts/controller/default.nix b/hosts/controller/default.nix
index de148b1..46fff32 100644
--- a/hosts/controller/default.nix
+++ b/hosts/controller/default.nix
@@ -8,7 +8,7 @@
   imports = [
     inputs.sops-nix.nixosModules.sops
     ./hardware-configuration.nix
-    ../../modules/nixos/default.nix
+    ../common
     ../../modules/nixos/headscale.nix
     ../../modules/nixos/vaultwarden.nix
     ../../modules/nixos/uptime-kuma.nix
diff --git a/hosts/controller/home.nix b/hosts/controller/home.nix
index e69de29..cec38ed 100644
--- a/hosts/controller/home.nix
+++ b/hosts/controller/home.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ../common/home.nix
+  ];
+}
diff --git a/hosts/isoImage/home.nix b/hosts/isoImage/home.nix
new file mode 100644
index 0000000..cec38ed
--- /dev/null
+++ b/hosts/isoImage/home.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ../common/home.nix
+  ];
+}
diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix
index 10e7a7c..c43f2e5 100644
--- a/hosts/wsl/default.nix
+++ b/hosts/wsl/default.nix
@@ -7,7 +7,7 @@
 }: {
   imports = [
     inputs.nixos-wsl.nixosModules.wsl
-    ../../modules/nixos/default.nix
+    ../common
     ../../modules/nixos/virtualisation/docker.nix
   ];
 
diff --git a/hosts/wsl/home.nix b/hosts/wsl/home.nix
new file mode 100644
index 0000000..cec38ed
--- /dev/null
+++ b/hosts/wsl/home.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ../common/home.nix
+  ];
+}