diff --git a/common/darwin.nix b/modules/common/darwin.nix
similarity index 100%
rename from common/darwin.nix
rename to modules/common/darwin.nix
diff --git a/common/fonts.nix b/modules/common/fonts.nix
similarity index 100%
rename from common/fonts.nix
rename to modules/common/fonts.nix
diff --git a/common/linux-desktop.nix b/modules/common/linux-desktop.nix
similarity index 100%
rename from common/linux-desktop.nix
rename to modules/common/linux-desktop.nix
diff --git a/common/linux.nix b/modules/common/linux.nix
similarity index 100%
rename from common/linux.nix
rename to modules/common/linux.nix
diff --git a/common/networking.nix b/modules/common/networking.nix
similarity index 100%
rename from common/networking.nix
rename to modules/common/networking.nix
diff --git a/common/printing.nix b/modules/common/printing.nix
similarity index 100%
rename from common/printing.nix
rename to modules/common/printing.nix
diff --git a/packages/common.nix b/modules/packages/common.nix
similarity index 100%
rename from packages/common.nix
rename to modules/packages/common.nix
diff --git a/packages/linux-desktop.nix b/modules/packages/linux-desktop.nix
similarity index 100%
rename from packages/linux-desktop.nix
rename to modules/packages/linux-desktop.nix
diff --git a/packages/linux.nix b/modules/packages/linux.nix
similarity index 100%
rename from packages/linux.nix
rename to modules/packages/linux.nix
diff --git a/outputs.nix b/outputs.nix
index e660581..b90544f 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -11,8 +11,8 @@
     modulesDir = ./modules;
     defaultModules = [
       home-manager.nixosModules.home-manager
-      ./common/fonts.nix
-      ./packages/common.nix
+      ./modules/common/fonts.nix
+      ./modules/packages/common.nix
       ./modules/upgrade-diff.nix
 
       ({
@@ -58,12 +58,12 @@
       })
     ];
     desktopLinuxModules = [
-      ./common/linux-desktop.nix
-      ./common/linux.nix
-      ./common/networking.nix
-      ./common/printing.nix
-      ./packages/linux-desktop.nix
-      ./packages/linux.nix
+      ./modules/common/linux-desktop.nix
+      ./modules/common/linux.nix
+      ./modules/common/networking.nix
+      ./modules/common/printing.nix
+      ./modules/packages/linux-desktop.nix
+      ./modules/packages/linux.nix
       ./services/netdata/default.nix
     ];
   in {
@@ -93,8 +93,8 @@
 
         modules = [
           home-manager.darwinModules.home-manager
-          ./common/darwin.nix
-          ./packages/common.nix
+          ./modules/common/darwin.nix
+          ./modules/packages/common.nix
 
           ./machines/zelus/configuration.nix