diff --git a/systems/modules/common.nix b/systems/common.nix
similarity index 93%
rename from systems/modules/common.nix
rename to systems/common.nix
index 88c22be..c62ed74 100644
--- a/systems/modules/common.nix
+++ b/systems/common.nix
@@ -5,8 +5,9 @@
 }:
 {
   imports = [
-    ./programs/tailscale.nix
-    ./programs/zsh.nix
+    ./modules/programs/tailscale.nix
+    ./modules/bootloaders/systemd-boot.nix
+    ./modules/programs/zsh.nix
     inputs.nix-index-database.nixosModules.nix-index
     inputs.sops-nix.nixosModules.sops
   ];
@@ -87,7 +88,7 @@
   services.openssh.enable = true;
 
   sops = {
-    defaultSopsFile = ../../secrets/secrets.yaml;
+    defaultSopsFile = ../secrets/secrets.yaml;
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
     secrets.password.neededForUsers = true;
   };
diff --git a/systems/modules/desktop.nix b/systems/desktop.nix
similarity index 69%
rename from systems/modules/desktop.nix
rename to systems/desktop.nix
index 72affed..e5c2b4e 100644
--- a/systems/modules/desktop.nix
+++ b/systems/desktop.nix
@@ -1,13 +1,14 @@
 { inputs, ... }:
 {
   imports = [
-    ../../themes/cursors/banana-cursor.nix
-    ../../themes/darkviolet.nix
-    ../../themes/fonts/sauce-code-pro.nix
-    ./programs/getty.nix
-    ./programs/hyprland.nix
-    ./programs/hyprlock.nix
+    ../themes/cursors/banana-cursor.nix
+    ../themes/darkviolet.nix
+    ../themes/fonts/sauce-code-pro.nix
+    ./modules/programs/getty.nix
+    ./modules/programs/hyprland.nix
+    ./modules/programs/hyprlock.nix
     inputs.stylix.nixosModules.stylix
+    ./modules/hardware/bluetooth.nix
   ];
 
   # Enable basic fonts for reasonable Unicode coverage
diff --git a/systems/nemesis.nix b/systems/nemesis.nix
index cc055be..76fe0b4 100644
--- a/systems/nemesis.nix
+++ b/systems/nemesis.nix
@@ -2,11 +2,9 @@
 {
   imports = [
     ./hw-nemesis.nix
-    ./modules/common.nix
-    ./modules/desktop.nix
-    ./modules/bootloaders/systemd-boot.nix
+    ./common.nix
+    ./desktop.nix
     ./modules/hardware/nvidia.nix
-    ./modules/hardware/bluetooth.nix
   ];
 
   networking.hostName = "nemesis";