diff --git a/modules/apps/cli/tools/git/default.nix b/modules/apps/cli/tools/git/default.nix
deleted file mode 100644
index fb6985b..0000000
--- a/modules/apps/cli/tools/git/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  home-manager.users.joy.programs.git = {
-    enable = true;
-    userEmail = "mail@joygnu.org";
-    userName = "joygnu";
-  };
-}
diff --git a/modules/apps/cli/tools/gpg/default.nix b/modules/apps/cli/tools/gpg/default.nix
deleted file mode 100644
index 95e24d2..0000000
--- a/modules/apps/cli/tools/gpg/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  services.pcscd.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    pinentryPackage = pkgs.pinentry-curses;
-    enableSSHSupport = true;
-  };
-}
diff --git a/modules/apps/cli/tools/ssh/default.nix b/modules/apps/cli/tools/ssh/default.nix
deleted file mode 100644
index cca8282..0000000
--- a/modules/apps/cli/tools/ssh/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  services.openssh = {
-    enable = true;
-    settings = {
-      PasswordAuthentication = false;
-      AllowUsers = null;
-    };
-  };
-
-  users.users.joy = {
-    isNormalUser = true;
-    openssh.authorizedKeys.keys = [
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8FnfVKPbbzPmZ3L0KuSMc8GD42rkIoIMay3c/r9zGkMBwRyluwP7OBR7SaTlp/w7iPHom3YwhGYa37HOXp/icSEMvFlYsCQOXWPkf7cNqyhEnycRsMojpKP2a6qxvcnuuCLY+xMwtlsX1h4nJFpsWHb2A62qBgdaOVrBlbVGd2ZuVCgiB+eenVagW3EFAO9jK5r6rSFciND7EMxBKfi6DbRma6UCejwGjpU0AHCZDikw5XKFhLUDbhdb9e02gyQxD5cs4Q2CuZ1PVt+Jb1GwHVnfh3wdEz5v7TWF+RUv85JXlRLrIYd2SEDpA6yvQIIT4YR2Bb1Tc/aC+zTdUdP+HMiBI32GGyplMfrE1dbj3quTfGN6cJ0TfPFOx7K+0N108fM7mehPtGT/uyB9nnMyYeLO45cgA1wMZZcT4egSvnnqe+6NO7j+zR0whl8+SbIru7HUK2Oa67SzxotQ7D8F27rx02Ie4UJqwbPsZGrxL7TlvNKUXQ4mOINkyE79tIshWncO71O6vJWzaoeYiye0mxc0AP3vYozdV3MgN34+5zscb/o4pwOQtthin8Nf1Y6o6H0poUz5YXYBdEKK/O0Wz3kxT6i/oZWZG7a18xCCKYnF1Jgdr7mfxkizLMkRqYsgM9CS0e0KoVJhu78TmMz8Eip9za1ncvGg3w1ZW6VG/6w=="
-    ];
-  };
-}
diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index e836b86..c450b23 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ./cli
-    ./gui
+    ./home
+    ./norm
   ];
 }
diff --git a/modules/apps/gui/misc/default.nix b/modules/apps/gui/misc/default.nix
deleted file mode 100644
index 7b2655a..0000000
--- a/modules/apps/gui/misc/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    uget
-    keepassxc
-    vesktop
-    signal-desktop
-    upscayl
-    bottles
-    boxbuddy
-    waydroid
-    transmission_4-gtk
-    kdePackages.kdenlive
-    vscodium
-    networkmanagerapplet
-    ferdium
-    drawio
-    imv
-    cmus
-    obs-studio
-    gnome-calculator
-    gnome-disk-utility
-    gnome-clocks
-    gnome-calendar
-  ];
-}
diff --git a/modules/apps/gui/alacritty/default.nix b/modules/apps/home/alacritty/default.nix
similarity index 100%
rename from modules/apps/gui/alacritty/default.nix
rename to modules/apps/home/alacritty/default.nix
diff --git a/modules/apps/gui/code/default.nix b/modules/apps/home/code/default.nix
similarity index 100%
rename from modules/apps/gui/code/default.nix
rename to modules/apps/home/code/default.nix
diff --git a/modules/apps/gui/default.nix b/modules/apps/home/default.nix
similarity index 64%
rename from modules/apps/gui/default.nix
rename to modules/apps/home/default.nix
index 757d741..445dae5 100644
--- a/modules/apps/gui/default.nix
+++ b/modules/apps/home/default.nix
@@ -1,11 +1,13 @@
 {
   imports = [
-    ./mpv
-    ./code
-    ./nemo
-    ./rofi
-    ./firefox
     ./alacritty
-    ./misc
+    ./mpv
+    ./firefox
+    ./code
+    ./git
+    ./helix
+    ./newsboat
+    ./rofi
+    ./zsh
   ];
 }
diff --git a/modules/apps/gui/firefox/default.nix b/modules/apps/home/firefox/default.nix
similarity index 100%
rename from modules/apps/gui/firefox/default.nix
rename to modules/apps/home/firefox/default.nix
diff --git a/modules/apps/gui/firefox/userChrome b/modules/apps/home/firefox/userChrome
similarity index 100%
rename from modules/apps/gui/firefox/userChrome
rename to modules/apps/home/firefox/userChrome
diff --git a/modules/apps/cli/git/default.nix b/modules/apps/home/git/default.nix
similarity index 100%
rename from modules/apps/cli/git/default.nix
rename to modules/apps/home/git/default.nix
diff --git a/modules/apps/cli/helix/default.nix b/modules/apps/home/helix/default.nix
similarity index 100%
rename from modules/apps/cli/helix/default.nix
rename to modules/apps/home/helix/default.nix
diff --git a/modules/apps/gui/mpv/default.nix b/modules/apps/home/mpv/default.nix
similarity index 100%
rename from modules/apps/gui/mpv/default.nix
rename to modules/apps/home/mpv/default.nix
diff --git a/modules/apps/cli/newsboat/default.nix b/modules/apps/home/newsboat/default.nix
similarity index 100%
rename from modules/apps/cli/newsboat/default.nix
rename to modules/apps/home/newsboat/default.nix
diff --git a/modules/apps/gui/rofi/default.nix b/modules/apps/home/rofi/default.nix
similarity index 100%
rename from modules/apps/gui/rofi/default.nix
rename to modules/apps/home/rofi/default.nix
diff --git a/modules/apps/gui/rofi/gruvbox-material.rasi b/modules/apps/home/rofi/gruvbox-material.rasi
similarity index 100%
rename from modules/apps/gui/rofi/gruvbox-material.rasi
rename to modules/apps/home/rofi/gruvbox-material.rasi
diff --git a/modules/apps/cli/zsh/default.nix b/modules/apps/home/zsh/default.nix
similarity index 81%
rename from modules/apps/cli/zsh/default.nix
rename to modules/apps/home/zsh/default.nix
index 1dfb401..2d2a035 100644
--- a/modules/apps/cli/zsh/default.nix
+++ b/modules/apps/home/zsh/default.nix
@@ -13,11 +13,11 @@
       cat = "bat";
       cn = "cd ~/nix";
       ls = "${pkgs.eza}/bin/eza --icons -a --group-directories-first";
-      pu = "sh ~/nix/modules/apps/cli/zsh/scripts/push.sh";
-      ip = "sh ~/nix/modules/apps/cli/zsh/scripts/ip.sh";
+      pu = "sh ~/nix/modules/apps/home/zsh/scripts/push.sh";
+      ip = "sh ~/nix/modules/apps/home/zsh/scripts/ip.sh";
+      rb = "sh ~/nix/modules/apps/home/zsh/scripts/rebuild.sh";
       fr = "sudo systemctl reboot --firmware";
       ser = "ssh root@joygnu.org";
-      rb = "sh ~/nix/modules/apps/cli/zsh/scripts/rebuild.sh";
       up = "sudo nix flake update ~/nix";
       del = "sudo nix-collect-garbage -d";
       dn = "dotnet new console";
diff --git a/modules/apps/cli/zsh/scripts/ip.sh b/modules/apps/home/zsh/scripts/ip.sh
similarity index 100%
rename from modules/apps/cli/zsh/scripts/ip.sh
rename to modules/apps/home/zsh/scripts/ip.sh
diff --git a/modules/apps/cli/zsh/scripts/push.sh b/modules/apps/home/zsh/scripts/push.sh
similarity index 100%
rename from modules/apps/cli/zsh/scripts/push.sh
rename to modules/apps/home/zsh/scripts/push.sh
diff --git a/modules/apps/cli/zsh/scripts/rebuild.sh b/modules/apps/home/zsh/scripts/rebuild.sh
similarity index 100%
rename from modules/apps/cli/zsh/scripts/rebuild.sh
rename to modules/apps/home/zsh/scripts/rebuild.sh
diff --git a/modules/apps/cli/default.nix b/modules/apps/norm/default.nix
similarity index 58%
rename from modules/apps/cli/default.nix
rename to modules/apps/norm/default.nix
index 100b31a..f24a38e 100644
--- a/modules/apps/cli/default.nix
+++ b/modules/apps/norm/default.nix
@@ -1,12 +1,9 @@
 {
   imports = [
-    ./zsh
-    ./helix
-    ./newsboat
-    ./mutt
-    ./git
     ./ssh
     ./gpg
+    ./nemo
     ./misc
+    ./mutt
   ];
 }
diff --git a/modules/apps/cli/gpg/default.nix b/modules/apps/norm/gpg/default.nix
similarity index 100%
rename from modules/apps/cli/gpg/default.nix
rename to modules/apps/norm/gpg/default.nix
diff --git a/modules/apps/cli/misc/default.nix b/modules/apps/norm/misc/default.nix
similarity index 58%
rename from modules/apps/cli/misc/default.nix
rename to modules/apps/norm/misc/default.nix
index 463c92b..2e29d5d 100644
--- a/modules/apps/cli/misc/default.nix
+++ b/modules/apps/norm/misc/default.nix
@@ -1,5 +1,26 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
+    uget
+    keepassxc
+    vesktop
+    signal-desktop
+    upscayl
+    bottles
+    boxbuddy
+    waydroid
+    transmission_4-gtk
+    kdePackages.kdenlive
+    vscodium
+    networkmanagerapplet
+    ferdium
+    drawio
+    imv
+    cmus
+    obs-studio
+    gnome-calculator
+    gnome-disk-utility
+    gnome-clocks
+    gnome-calendar
     htop
     sent
     texliveFull
diff --git a/modules/apps/cli/mutt/default.nix b/modules/apps/norm/mutt/default.nix
similarity index 100%
rename from modules/apps/cli/mutt/default.nix
rename to modules/apps/norm/mutt/default.nix
diff --git a/modules/apps/gui/nemo/default.nix b/modules/apps/norm/nemo/default.nix
similarity index 100%
rename from modules/apps/gui/nemo/default.nix
rename to modules/apps/norm/nemo/default.nix
diff --git a/modules/apps/cli/ssh/default.nix b/modules/apps/norm/ssh/default.nix
similarity index 100%
rename from modules/apps/cli/ssh/default.nix
rename to modules/apps/norm/ssh/default.nix