diff --git a/lib/mk-host.nix b/lib/mk-host.nix
index d957c7c..12c04f2 100644
--- a/lib/mk-host.nix
+++ b/lib/mk-host.nix
@@ -36,7 +36,7 @@ in
           system.stateVersion = stateVersion;
         }
         (hostsDir + "/${name}")
-        ../modules/core
+        ../modules
         inputs.disko.nixosModules.disko
         inputs.home-manager.nixosModules.home-manager
         inputs.preservation.nixosModules.preservation
diff --git a/modules/core/boot.nix b/modules/boot.nix
similarity index 100%
rename from modules/core/boot.nix
rename to modules/boot.nix
diff --git a/modules/core/core.nix b/modules/core.nix
similarity index 100%
rename from modules/core/core.nix
rename to modules/core.nix
diff --git a/modules/core/default.nix b/modules/core/default.nix
deleted file mode 100644
index 1591cc5..0000000
--- a/modules/core/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{lib, ...}: let
-  autoImport = import ../../lib/auto-import.nix {inherit lib;};
-in {
-  imports = autoImport ./.;
-}
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..ab04c4e
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,5 @@
+{lib, ...}: let
+  autoImport = import ../lib/auto-import.nix {inherit lib;};
+in {
+  imports = autoImport ./.;
+}
diff --git a/modules/core/hardware.nix b/modules/hardware.nix
similarity index 100%
rename from modules/core/hardware.nix
rename to modules/hardware.nix
diff --git a/modules/core/kernel.nix b/modules/kernel.nix
similarity index 100%
rename from modules/core/kernel.nix
rename to modules/kernel.nix
diff --git a/modules/core/locale.nix b/modules/locale.nix
similarity index 100%
rename from modules/core/locale.nix
rename to modules/locale.nix
diff --git a/modules/core/network.nix b/modules/network.nix
similarity index 96%
rename from modules/core/network.nix
rename to modules/network.nix
index c937d73..bc0aed6 100644
--- a/modules/core/network.nix
+++ b/modules/network.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  connectionsDir = ../../secrets/connections;
+  connectionsDir = ../secrets/connections;
 
   connectionFiles =
     if builtins.pathExists connectionsDir
diff --git a/modules/core/niri.nix b/modules/niri.nix
similarity index 100%
rename from modules/core/niri.nix
rename to modules/niri.nix
diff --git a/modules/core/nix.nix b/modules/nix.nix
similarity index 100%
rename from modules/core/nix.nix
rename to modules/nix.nix
diff --git a/modules/core/noctalia.nix b/modules/noctalia.nix
similarity index 100%
rename from modules/core/noctalia.nix
rename to modules/noctalia.nix
diff --git a/modules/core/preservation.nix b/modules/preservation.nix
similarity index 100%
rename from modules/core/preservation.nix
rename to modules/preservation.nix
diff --git a/modules/core/security.nix b/modules/security.nix
similarity index 100%
rename from modules/core/security.nix
rename to modules/security.nix
diff --git a/modules/core/services.nix b/modules/services.nix
similarity index 100%
rename from modules/core/services.nix
rename to modules/services.nix
diff --git a/modules/core/sops.nix b/modules/sops.nix
similarity index 86%
rename from modules/core/sops.nix
rename to modules/sops.nix
index bc9a628..d9c264f 100644
--- a/modules/core/sops.nix
+++ b/modules/sops.nix
@@ -9,7 +9,7 @@
   ];
   sops = {
     age.sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"];
-    defaultSopsFile = ../../secrets/system.yaml;
+    defaultSopsFile = ../secrets/system.yaml;
     defaultSopsFormat = "yaml";
   };
 }
diff --git a/modules/core/ssh.nix b/modules/ssh.nix
similarity index 100%
rename from modules/core/ssh.nix
rename to modules/ssh.nix
diff --git a/modules/core/stylix.nix b/modules/stylix.nix
similarity index 100%
rename from modules/core/stylix.nix
rename to modules/stylix.nix
diff --git a/modules/core/user.nix b/modules/user.nix
similarity index 97%
rename from modules/core/user.nix
rename to modules/user.nix
index 1cefab7..9740a87 100644
--- a/modules/core/user.nix
+++ b/modules/user.nix
@@ -18,7 +18,7 @@
       inputs.sops-nix.homeManagerModules.sops
     ];
     useGlobalPkgs = true;
-    users.${username} = import ../../home;
+    users.${username} = import ../home;
   };
   preservation.preserveAt."/persist".users.${username} = lib.mkIf config.modules.impermanence.enable {
     directories = [