diff --git a/modules/aarch64-emu.nix b/nixos-modules/aarch64-emu.nix
similarity index 100%
rename from modules/aarch64-emu.nix
rename to nixos-modules/aarch64-emu.nix
diff --git a/modules/common.nix b/nixos-modules/common.nix
similarity index 100%
rename from modules/common.nix
rename to nixos-modules/common.nix
diff --git a/modules/common/common.nix b/nixos-modules/common/common.nix
similarity index 100%
rename from modules/common/common.nix
rename to nixos-modules/common/common.nix
diff --git a/modules/common/msmtp.nix b/nixos-modules/common/msmtp.nix
similarity index 100%
rename from modules/common/msmtp.nix
rename to nixos-modules/common/msmtp.nix
diff --git a/modules/common/nix.nix b/nixos-modules/common/nix.nix
similarity index 100%
rename from modules/common/nix.nix
rename to nixos-modules/common/nix.nix
diff --git a/modules/common/sops.nix b/nixos-modules/common/sops.nix
similarity index 100%
rename from modules/common/sops.nix
rename to nixos-modules/common/sops.nix
diff --git a/modules/common/sshd.nix b/nixos-modules/common/sshd.nix
similarity index 100%
rename from modules/common/sshd.nix
rename to nixos-modules/common/sshd.nix
diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix
new file mode 100644
index 0000000..70b4a6b
--- /dev/null
+++ b/nixos-modules/default.nix
@@ -0,0 +1 @@
+{ imports = [ ./common.nix ]; }
diff --git a/modules/networkd-base.nix b/nixos-modules/networkd-base.nix
similarity index 100%
rename from modules/networkd-base.nix
rename to nixos-modules/networkd-base.nix
diff --git a/modules/plymouth.nix b/nixos-modules/plymouth.nix
similarity index 100%
rename from modules/plymouth.nix
rename to nixos-modules/plymouth.nix
diff --git a/modules/smartd.nix b/nixos-modules/smartd.nix
similarity index 100%
rename from modules/smartd.nix
rename to nixos-modules/smartd.nix
diff --git a/modules/zwave-js-ui.nix b/nixos-modules/zwave-js-ui.nix
similarity index 100%
rename from modules/zwave-js-ui.nix
rename to nixos-modules/zwave-js-ui.nix
diff --git a/systems/orangepihole/configuration.nix b/systems/orangepihole/configuration.nix
index 5ad4fe5..96b30f4 100644
--- a/systems/orangepihole/configuration.nix
+++ b/systems/orangepihole/configuration.nix
@@ -4,8 +4,8 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../modules/common.nix
-    ../../modules/networkd-base.nix
+    ../../nixos-modules
+    ../../nixos-modules/networkd-base.nix
   ];
 
   boot.loader.grub.enable = false;
diff --git a/systems/smolboi/configuration.nix b/systems/smolboi/configuration.nix
index 6f7cabe..7e876e7 100644
--- a/systems/smolboi/configuration.nix
+++ b/systems/smolboi/configuration.nix
@@ -4,10 +4,10 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../modules/common.nix
-    ../../modules/aarch64-emu.nix
-    ../../modules/smartd.nix
-    ../../modules/plymouth.nix
+    ../../nixos-modules
+    ../../nixos-modules/aarch64-emu.nix
+    ../../nixos-modules/smartd.nix
+    ../../nixos-modules/plymouth.nix
   ];
 
   boot = {
diff --git a/systems/zeus/configuration.nix b/systems/zeus/configuration.nix
index 497c595..0a3d416 100644
--- a/systems/zeus/configuration.nix
+++ b/systems/zeus/configuration.nix
@@ -10,11 +10,11 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../modules/common.nix
-    ../../modules/aarch64-emu.nix
-    ../../modules/networkd-base.nix
-    ../../modules/smartd.nix
-    ../../modules/plymouth.nix
+    ../../nixos-modules
+    ../../nixos-modules/aarch64-emu.nix
+    ../../nixos-modules/networkd-base.nix
+    ../../nixos-modules/smartd.nix
+    ../../nixos-modules/plymouth.nix
   ];
 
   boot = {