diff --git a/modules/boot.nix b/modules/aspects/boot.nix
similarity index 100%
rename from modules/boot.nix
rename to modules/aspects/boot.nix
diff --git a/modules/deploy.nix b/modules/aspects/deploy.nix
similarity index 100%
rename from modules/deploy.nix
rename to modules/aspects/deploy.nix
diff --git a/modules/gpg-pinentry-wayland.nix b/modules/aspects/gpg-pinentry-wayland.nix
similarity index 100%
rename from modules/gpg-pinentry-wayland.nix
rename to modules/aspects/gpg-pinentry-wayland.nix
diff --git a/modules/hm.nix b/modules/aspects/hm.nix
similarity index 100%
rename from modules/hm.nix
rename to modules/aspects/hm.nix
diff --git a/modules/keys.nix b/modules/aspects/keys.nix
similarity index 72%
rename from modules/keys.nix
rename to modules/aspects/keys.nix
index 6015159..a678a36 100644
--- a/modules/keys.nix
+++ b/modules/aspects/keys.nix
@@ -4,7 +4,7 @@
     { lib, ... }:
     {
       options.keys = lib.mkOption {
-        default = import ../lib/keys.nix;
+        default = import ../../lib/keys.nix;
       };
     };
 }
diff --git a/modules/nix.nix b/modules/aspects/nix.nix
similarity index 100%
rename from modules/nix.nix
rename to modules/aspects/nix.nix
diff --git a/modules/secrets.nix b/modules/aspects/secrets.nix
similarity index 53%
rename from modules/secrets.nix
rename to modules/aspects/secrets.nix
index a5f4eb4..6e3bf01 100644
--- a/modules/secrets.nix
+++ b/modules/aspects/secrets.nix
@@ -3,6 +3,6 @@
   flake.nixosModules.secrets =
     { ... }:
     {
-      imports = [ ../secrets/secrets-configuration.nix ];
+      imports = [ ../../secrets/secrets-configuration.nix ];
     };
 }
diff --git a/modules/tailscale.nix b/modules/aspects/tailscale.nix
similarity index 100%
rename from modules/tailscale.nix
rename to modules/aspects/tailscale.nix