diff --git a/src/system/machines/desktop/home.nix b/src/system/machines/desktop/home.nix
index f8d4f5a..382268a 100644
--- a/src/system/machines/desktop/home.nix
+++ b/src/system/machines/desktop/home.nix
@@ -22,8 +22,11 @@
       user = {
         bash.enable = true;
         git.enable = true;
-        gpg.enable = true;
-        security.enable = true;
+
+        security = {
+          enable = true;
+          gpg.enable = true;
+        };
 
         utils = {
           enable = true;
diff --git a/src/user/modules/default.nix b/src/user/modules/default.nix
index 6513817..01abb97 100644
--- a/src/user/modules/default.nix
+++ b/src/user/modules/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./bash
     ./git
-    ./gpg
     ./gui
     ./security
     ./utils
diff --git a/src/user/modules/security/default.nix b/src/user/modules/security/default.nix
index b8ed5dd..02b6060 100644
--- a/src/user/modules/security/default.nix
+++ b/src/user/modules/security/default.nix
@@ -7,6 +7,7 @@ let
 in
 { options.modules.user.security = { enable = mkEnableOption "user.security"; };
   config = mkIf cfg.enable {
+    imports = [ ./modules ];
     home.packages = with pkgs; [
       pass
       wireguard-tools
diff --git a/src/user/modules/security/modules/default.nix b/src/user/modules/security/modules/default.nix
new file mode 100644
index 0000000..b67a622
--- /dev/null
+++ b/src/user/modules/security/modules/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./gpg
+  ];
+}
diff --git a/src/user/modules/gpg/default.nix b/src/user/modules/security/modules/gpg/default.nix
similarity index 71%
rename from src/user/modules/gpg/default.nix
rename to src/user/modules/security/modules/gpg/default.nix
index b793b4a..78f38b1 100644
--- a/src/user/modules/gpg/default.nix
+++ b/src/user/modules/security/modules/gpg/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.user.gpg;
+  cfg = config.modules.user.security.gpg;
 
 in
-{ options.modules.user.gpg = { enable = mkEnableOption "user.gpg"; };
+{ options.modules.user.security.gpg = { enable = mkEnableOption "user.security.gpg"; };
   config = mkIf cfg.enable {
     programs.gpg = {
       enable = true;