diff --git a/src/modules/bash/default.nix b/src/modules/bash/default.nix
index 940d68b..b5852a1 100644
--- a/src/modules/bash/default.nix
+++ b/src/modules/bash/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.bash;
+  cfg = config.modules.user.bash;
 
 in
-{ options.modules.bash = { enable = mkEnableOption "bash"; };
+{ options.modules.user.bash = { enable = mkEnableOption "user.bash"; };
   config = mkIf cfg.enable {
     programs.bash = {
       enable = true;
diff --git a/src/modules/git/default.nix b/src/modules/git/default.nix
index 62fb177..54e4328 100644
--- a/src/modules/git/default.nix
+++ b/src/modules/git/default.nix
@@ -1,10 +1,10 @@
 { lib, pkgs, config, ... }:
 
 with lib;
-  let cfg = config.modules.git;
+  let cfg = config.modules.user.git;
 
 in
-{ options.modules.git = { enable = mkEnableOption "git"; };
+{ options.modules.user.git = { enable = mkEnableOption "user.git"; };
   config = mkIf cfg.enable {
     programs = {
       git = {
diff --git a/src/modules/gpg/default.nix b/src/modules/gpg/default.nix
index bdd637d..b793b4a 100644
--- a/src/modules/gpg/default.nix
+++ b/src/modules/gpg/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.gpg;
+  cfg = config.modules.user.gpg;
 
 in
-{ options.modules.gpg = { enable = mkEnableOption "gpg"; };
+{ options.modules.user.gpg = { enable = mkEnableOption "user.gpg"; };
   config = mkIf cfg.enable {
     programs.gpg = {
       enable = true;
diff --git a/src/modules/gui/default.nix b/src/modules/gui/default.nix
index 9df24d5..936f908 100644
--- a/src/modules/gui/default.nix
+++ b/src/modules/gui/default.nix
@@ -1,15 +1,3 @@
-{ lib, config, ... }:
-
-with lib;
-let
-  cfg = config.modules.gui;
-
-in
-{ options.modules.gui = { enable = mkEnableOption "gui"; };
+{
   imports = [ ./desktopEnvironments ];
-  config = mkIf cfg.enable {
-    modules = {
-      sway.enable = true;
-    };
-  };
 }
diff --git a/src/modules/gui/desktopEnvironments/sway/default.nix b/src/modules/gui/desktopEnvironments/sway/default.nix
index 7c30df8..100d7e3 100644
--- a/src/modules/gui/desktopEnvironments/sway/default.nix
+++ b/src/modules/gui/desktopEnvironments/sway/default.nix
@@ -2,11 +2,11 @@
 
 with lib;
 let
-  cfg = config.modules.sway;
+  cfg = config.modules.user.gui.sway;
 
 in
-{ options.modules.sway = { enable = mkEnableOption "sway"; };
-  imports = [ ../modules ];
+{ options.modules.user.gui.sway = { enable = mkEnableOption "user.gui.sway"; };
+  imports = [ ../../modules ];
   config = mkIf cfg.enable {
     wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; };
     programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; };
diff --git a/src/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix b/src/modules/gui/modules/alacritty/config/alacritty.nix
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix
rename to src/modules/gui/modules/alacritty/config/alacritty.nix
diff --git a/src/modules/gui/desktopEnvironments/modules/alacritty/default.nix b/src/modules/gui/modules/alacritty/default.nix
similarity index 57%
rename from src/modules/gui/desktopEnvironments/modules/alacritty/default.nix
rename to src/modules/gui/modules/alacritty/default.nix
index f8d1c2b..1f96567 100644
--- a/src/modules/gui/desktopEnvironments/modules/alacritty/default.nix
+++ b/src/modules/gui/modules/alacritty/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.gui.alacritty;
+  cfg = config.modules.user.gui.alacritty;
 
 in
-{ options.modules.gui.alacritty = { enable = mkEnableOption "gui.alacritty"; };
+{ options.modules.user.gui.alacritty = { enable = mkEnableOption "user.gui.alacritty"; };
   config = mkIf cfg.enable {
     programs.alacritty = {
       enable = true;
diff --git a/src/modules/gui/desktopEnvironments/modules/browsers/default.nix b/src/modules/gui/modules/browsers/default.nix
similarity index 57%
rename from src/modules/gui/desktopEnvironments/modules/browsers/default.nix
rename to src/modules/gui/modules/browsers/default.nix
index d358e1a..2a79193 100644
--- a/src/modules/gui/desktopEnvironments/modules/browsers/default.nix
+++ b/src/modules/gui/modules/browsers/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.gui.browsers;
+  cfg = config.modules.user.gui.browsers;
 
 in
-{ options.modules.gui.browsers = { enable = mkEnableOption "gui.browsers"; };
+{ options.modules.user.gui.browsers = { enable = mkEnableOption "user.gui.browsers"; };
   config = mkIf cfg.enable {
     programs.firefox.enable = true;
 
diff --git a/src/modules/gui/desktopEnvironments/modules/corn/default.nix b/src/modules/gui/modules/corn/default.nix
similarity index 85%
rename from src/modules/gui/desktopEnvironments/modules/corn/default.nix
rename to src/modules/gui/modules/corn/default.nix
index 95eb251..381df11 100644
--- a/src/modules/gui/desktopEnvironments/modules/corn/default.nix
+++ b/src/modules/gui/modules/corn/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.gui.corn;
+  cfg = config.modules.user.gui.corn;
 
 in
-{ options.modules.gui.corn = { enable = mkEnableOption "gui.corn"; };
+{ options.modules.user.gui.corn = { enable = mkEnableOption "user.gui.corn"; };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       trezor-suite
diff --git a/src/modules/gui/desktopEnvironments/modules/default.nix b/src/modules/gui/modules/default.nix
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/default.nix
rename to src/modules/gui/modules/default.nix
diff --git a/src/modules/gui/desktopEnvironments/modules/fun/default.nix b/src/modules/gui/modules/fun/default.nix
similarity index 75%
rename from src/modules/gui/desktopEnvironments/modules/fun/default.nix
rename to src/modules/gui/modules/fun/default.nix
index eec5776..e40c2f0 100644
--- a/src/modules/gui/desktopEnvironments/modules/fun/default.nix
+++ b/src/modules/gui/modules/fun/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.gui.fun;
+  cfg = config.modules.user.gui.fun;
 
 in
-{ options.modules.gui.fun = { enable = mkEnableOption "gui.fun"; };
+{ options.modules.user.gui.fun = { enable = mkEnableOption "user.gui.fun"; };
   config = mkIf cfg.enable {
     programs.obs-studio = {
       enable = true;
diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua b/src/modules/gui/modules/neovim/config/lazyvim/init.lua
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua
rename to src/modules/gui/modules/neovim/config/lazyvim/init.lua
diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/src/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua
rename to src/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua
diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua b/src/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua
rename to src/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua
diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua b/src/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua
rename to src/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua
diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua b/src/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua
rename to src/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua
diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua b/src/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua
rename to src/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua
diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix b/src/modules/gui/modules/neovim/config/servers.nix
similarity index 100%
rename from src/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix
rename to src/modules/gui/modules/neovim/config/servers.nix
diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/default.nix b/src/modules/gui/modules/neovim/default.nix
similarity index 76%
rename from src/modules/gui/desktopEnvironments/modules/neovim/default.nix
rename to src/modules/gui/modules/neovim/default.nix
index 81e1c58..d470f71 100644
--- a/src/modules/gui/desktopEnvironments/modules/neovim/default.nix
+++ b/src/modules/gui/modules/neovim/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.gui.neovim;
+  cfg = config.modules.user.gui.neovim;
 
 in
-{ options.modules.gui.neovim = { enable = mkEnableOption "gui.neovim"; };
+{ options.modules.user.gui.neovim = { enable = mkEnableOption "user.gui.neovim"; };
   config = mkIf cfg.enable {
     programs.neovim = {
       enable = true;
diff --git a/src/modules/gui/desktopEnvironments/modules/utils/default.nix b/src/modules/gui/modules/utils/default.nix
similarity index 66%
rename from src/modules/gui/desktopEnvironments/modules/utils/default.nix
rename to src/modules/gui/modules/utils/default.nix
index cfabea7..9c45ddc 100644
--- a/src/modules/gui/desktopEnvironments/modules/utils/default.nix
+++ b/src/modules/gui/modules/utils/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.gui.utils;
+  cfg = config.modules.user.gui.utils;
 
 in
-{ options.modules.gui.utils = { enable = mkEnableOption "gui.utils"; };
+{ options.modules.user.gui.utils = { enable = mkEnableOption "user.gui.utils"; };
   config = mkIf cfg.enable {
     programs.btop.enable = true;
     home.packages = with pkgs; [
diff --git a/src/modules/gui/desktopEnvironments/modules/writing/default.nix b/src/modules/gui/modules/writing/default.nix
similarity index 61%
rename from src/modules/gui/desktopEnvironments/modules/writing/default.nix
rename to src/modules/gui/modules/writing/default.nix
index 8d2e20c..4bca46a 100644
--- a/src/modules/gui/desktopEnvironments/modules/writing/default.nix
+++ b/src/modules/gui/modules/writing/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.gui.writing;
+  cfg = config.modules.user.gui.writing;
 
 in
-{ options.modules.gui.writing = { enable = mkEnableOption "gui.writing"; };
+{ options.modules.user.gui.writing = { enable = mkEnableOption "user.gui.writing"; };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       mdbook
diff --git a/src/modules/security/default.nix b/src/modules/security/default.nix
index b388ba1..b8ed5dd 100644
--- a/src/modules/security/default.nix
+++ b/src/modules/security/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.security;
+  cfg = config.modules.user.security;
 
 in
-{ options.modules.security = { enable = mkEnableOption "security"; };
+{ options.modules.user.security = { enable = mkEnableOption "user.security"; };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       pass
diff --git a/src/modules/utils/default.nix b/src/modules/utils/default.nix
index aa60b02..6540989 100644
--- a/src/modules/utils/default.nix
+++ b/src/modules/utils/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.utils;
+  cfg = config.modules.user.utils;
 
 in
-{ options.modules.utils = { enable = mkEnableOption "utils"; };
+{ options.modules.user.utils = { enable = mkEnableOption "user.utils"; };
   imports = [ ./modules ];
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
diff --git a/src/modules/utils/modules/dev/default.nix b/src/modules/utils/modules/dev/default.nix
index a36421f..11f807f 100644
--- a/src/modules/utils/modules/dev/default.nix
+++ b/src/modules/utils/modules/dev/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.utils.dev;
+  cfg = config.modules.user.utils.dev;
 
 in
-{ options.modules.utils.dev = { enable = mkEnableOption "utils.dev"; };
+{ options.modules.user.utils.dev = { enable = mkEnableOption "user.utils.dev"; };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       nix-init
diff --git a/src/modules/utils/modules/email/default.nix b/src/modules/utils/modules/email/default.nix
index 93b7c5e..aa4babd 100644
--- a/src/modules/utils/modules/email/default.nix
+++ b/src/modules/utils/modules/email/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.utils.email;
+  cfg = config.modules.user.utils.email;
 
 in
-{ options.modules.utils.email = { enable = mkEnableOption "utils.email"; };
+{ options.modules.user.utils.email = { enable = mkEnableOption "user.utils.email"; };
   config = mkIf cfg.enable {
     programs.aerc = {
       enable = true;
diff --git a/src/modules/utils/modules/irc/default.nix b/src/modules/utils/modules/irc/default.nix
index 848e130..119e926 100644
--- a/src/modules/utils/modules/irc/default.nix
+++ b/src/modules/utils/modules/irc/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.utils.irc;
+  cfg = config.modules.user.utils.irc;
 
 in
-{ options.modules.utils.irc = { enable = mkEnableOption "utils.irc"; };
+{ options.modules.user.utils.irc = { enable = mkEnableOption "user.utils.irc"; };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       weechat
diff --git a/src/modules/utils/modules/vim/default.nix b/src/modules/utils/modules/vim/default.nix
index 8d2064f..5a2133e 100644
--- a/src/modules/utils/modules/vim/default.nix
+++ b/src/modules/utils/modules/vim/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.utils.vim;
+  cfg = config.modules.user.utils.vim;
 
 in
-{ options.modules.utils.vim = { enable = mkEnableOption "utils.vim"; };
+{ options.modules.user.utils.vim = { enable = mkEnableOption "user.utils.vim"; };
   config = mkIf cfg.enable {
     home = {
       packages = with pkgs; [ 
diff --git a/src/systems/desktop/home.nix b/src/systems/desktop/home.nix
index 1a01c9d..3a28a7b 100644
--- a/src/systems/desktop/home.nix
+++ b/src/systems/desktop/home.nix
@@ -20,27 +20,29 @@
     home.homeDirectory = "/home/${config.user.name}";
 
     modules = {
-      bash.enable = true;
-      git.enable = true;
-      gpg.enable = true;
-      security.enable = true;
+      user = {
+        bash.enable = true;
+        git.enable = true;
+        gpg.enable = true;
+        security.enable = true;
 
-      utils = {
-        enable = true;
-        dev.enable = true;
-        irc.enable = true;
-        vim.enable = false;
-      };
+        utils = {
+          enable = true;
+          dev.enable = true;
+          irc.enable = true;
+          vim.enable = false;
+        };
 
-      gui = {
-        enable = true;
-        alacritty.enable = true;
-        browsers.enable = true;
-        corn.enable = true;
-        fun.enable = true;
-        neovim.enable = true;
-        utils.enable = true;
-        writing.enable = true;
+        gui = {
+          sway.enable = true;
+          alacritty.enable = true;
+          browsers.enable = true;
+          corn.enable = true;
+          fun.enable = true;
+          neovim.enable = true;
+          utils.enable = true;
+          writing.enable = true;
+        };
       };
     };
   };
diff --git a/src/systems/wsl/home.nix b/src/systems/wsl/home.nix
index 2bb8d39..65b3881 100644
--- a/src/systems/wsl/home.nix
+++ b/src/systems/wsl/home.nix
@@ -20,17 +20,19 @@
     home.homeDirectory = "/home/${config.user.name}";
 
     modules = {
-      bash.enable = true;
-      git.enable = true;
-      gpg.enable = true;
-      gui.enable = false;
-      security.enable = true;
-      utils = {
-        enable = true;
-        dev.enable = true;
-        email.enable = true;
-        irc.enable = true;
-        vim.enable = true;
+      user = {
+        bash.enable = true;
+        git.enable = true;
+        gpg.enable = true;
+        gui.enable = false;
+        security.enable = true;
+        utils = {
+          enable = true;
+          dev.enable = true;
+          email.enable = true;
+          irc.enable = true;
+          vim.enable = true;
+        };
       };
     };
   };