diff --git a/boxes/netbox.nix b/boxes/netbox.nix
index b404c36..afe1aff 100644
--- a/boxes/netbox.nix
+++ b/boxes/netbox.nix
@@ -4,7 +4,7 @@
   imports =
     [
       ../modules/mail.nix
-      ../main.nix
+      ../common/main.nix
     ];
 
   boot.loader.grub.enable = true;
diff --git a/desktop.nix b/common/desktop.nix
similarity index 100%
rename from desktop.nix
rename to common/desktop.nix
diff --git a/main.nix b/common/main.nix
similarity index 85%
rename from main.nix
rename to common/main.nix
index fc18c5a..4f62e31 100644
--- a/main.nix
+++ b/common/main.nix
@@ -3,7 +3,7 @@
 {
   imports =
     [
-      ./hardware-configuration.nix # include the results of the hardware scan
+      ../hardware-configuration.nix # include the results of the hardware scan
     ];
 
   networking.networkmanager.enable = true;