diff --git a/modules/core/default.nix b/hosts/common/core/default.nix
similarity index 100%
rename from modules/core/default.nix
rename to hosts/common/core/default.nix
diff --git a/modules/core/inputrc.nix b/hosts/common/core/inputrc.nix
similarity index 100%
rename from modules/core/inputrc.nix
rename to hosts/common/core/inputrc.nix
diff --git a/modules/core/issue.nix b/hosts/common/core/issue.nix
similarity index 100%
rename from modules/core/issue.nix
rename to hosts/common/core/issue.nix
diff --git a/modules/core/nix.nix b/hosts/common/core/nix.nix
similarity index 100%
rename from modules/core/nix.nix
rename to hosts/common/core/nix.nix
diff --git a/modules/core/resolved.nix b/hosts/common/core/resolved.nix
similarity index 100%
rename from modules/core/resolved.nix
rename to hosts/common/core/resolved.nix
diff --git a/modules/core/ssh.nix b/hosts/common/core/ssh.nix
similarity index 100%
rename from modules/core/ssh.nix
rename to hosts/common/core/ssh.nix
diff --git a/modules/core/tmux.nix b/hosts/common/core/tmux.nix
similarity index 100%
rename from modules/core/tmux.nix
rename to hosts/common/core/tmux.nix
diff --git a/modules/core/xdg.nix b/hosts/common/core/xdg.nix
similarity index 100%
rename from modules/core/xdg.nix
rename to hosts/common/core/xdg.nix
diff --git a/modules/dev/default.nix b/hosts/common/dev/default.nix
similarity index 100%
rename from modules/dev/default.nix
rename to hosts/common/dev/default.nix
diff --git a/modules/dev/documentation.nix b/hosts/common/dev/documentation.nix
similarity index 100%
rename from modules/dev/documentation.nix
rename to hosts/common/dev/documentation.nix
diff --git a/modules/dev/virt-manager.nix b/hosts/common/dev/virt-manager.nix
similarity index 100%
rename from modules/dev/virt-manager.nix
rename to hosts/common/dev/virt-manager.nix
diff --git a/modules/efi.nix b/hosts/common/efi.nix
similarity index 100%
rename from modules/efi.nix
rename to hosts/common/efi.nix
diff --git a/modules/graphical/default.nix b/hosts/common/graphical/default.nix
similarity index 100%
rename from modules/graphical/default.nix
rename to hosts/common/graphical/default.nix
diff --git a/modules/graphical/fonts.nix b/hosts/common/graphical/fonts.nix
similarity index 100%
rename from modules/graphical/fonts.nix
rename to hosts/common/graphical/fonts.nix
diff --git a/modules/graphical/wayland.nix b/hosts/common/graphical/wayland.nix
similarity index 100%
rename from modules/graphical/wayland.nix
rename to hosts/common/graphical/wayland.nix
diff --git a/modules/hardware/bluetooth.nix b/hosts/common/hardware/bluetooth.nix
similarity index 100%
rename from modules/hardware/bluetooth.nix
rename to hosts/common/hardware/bluetooth.nix
diff --git a/modules/hardware/intel.nix b/hosts/common/hardware/intel.nix
similarity index 100%
rename from modules/hardware/intel.nix
rename to hosts/common/hardware/intel.nix
diff --git a/modules/hardware/nvidia.nix b/hosts/common/hardware/nvidia.nix
similarity index 100%
rename from modules/hardware/nvidia.nix
rename to hosts/common/hardware/nvidia.nix
diff --git a/modules/initrd-ssh.nix b/hosts/common/initrd-ssh.nix
similarity index 100%
rename from modules/initrd-ssh.nix
rename to hosts/common/initrd-ssh.nix
diff --git a/modules/laptop.nix b/hosts/common/laptop.nix
similarity index 100%
rename from modules/laptop.nix
rename to hosts/common/laptop.nix
diff --git a/modules/sound-pipewire.nix b/hosts/common/sound-pipewire.nix
similarity index 100%
rename from modules/sound-pipewire.nix
rename to hosts/common/sound-pipewire.nix
diff --git a/modules/yubikey.nix b/hosts/common/yubikey.nix
similarity index 100%
rename from modules/yubikey.nix
rename to hosts/common/yubikey.nix
diff --git a/modules/zfs.nix b/hosts/common/zfs.nix
similarity index 100%
rename from modules/zfs.nix
rename to hosts/common/zfs.nix
diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix
index 635a09d..5dd48fc 100644
--- a/hosts/nom/default.nix
+++ b/hosts/nom/default.nix
@@ -9,16 +9,16 @@
     nixos-hardware.common-pc-laptop
     nixos-hardware.common-pc-laptop-ssd
 
-    ../../modules/core
-    ../../modules/dev
-    ../../modules/graphical
+    ../common/core
+    ../common/dev
+    ../common/graphical
 
-    ../../modules/hardware/intel.nix
-    ../../modules/efi.nix
-    ../../modules/laptop.nix
-    ../../modules/sound-pipewire.nix
-    ../../modules/yubikey.nix
-    ../../modules/zfs.nix
+    ../common/hardware/intel.nix
+    ../common/efi.nix
+    ../common/laptop.nix
+    ../common/sound-pipewire.nix
+    ../common/yubikey.nix
+    ../common/zfs.nix
 
     ../../users/root
     ../../users/myuser
diff --git a/hosts/ward/default.nix b/hosts/ward/default.nix
index 858d57b..169aa82 100644
--- a/hosts/ward/default.nix
+++ b/hosts/ward/default.nix
@@ -8,11 +8,11 @@
     nixos-hardware.common-cpu-intel
     nixos-hardware.common-pc-ssd
 
-    ../../modules/core
-    ../../modules/hardware/intel.nix
-    ../../modules/initrd-ssh.nix
-    ../../modules/efi.nix
-    ../../modules/zfs.nix
+    ../common/core
+    ../common/hardware/intel.nix
+    ../common/initrd-ssh.nix
+    ../common/efi.nix
+    ../common/zfs.nix
 
     ../../users/root
 
diff --git a/hosts/zackbiene/default.nix b/hosts/zackbiene/default.nix
index 603ed84..96943ec 100644
--- a/hosts/zackbiene/default.nix
+++ b/hosts/zackbiene/default.nix
@@ -8,8 +8,8 @@
   imports = [
     nixos-hardware.common-pc-ssd
 
-    ../../modules/core
-    ../../modules/zfs.nix
+    ../common/core
+    ../common/zfs.nix
 
     ../../users/root