diff --git a/flake.nix b/flake.nix
index 5ca8177..76c916e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,10 @@
           inherit pkgs;
 
           modules = [
+            ./shell
+            ./git
+            ./gpg
+            ./neovim
             ./private.nix
             ./xps.nix
           ];
@@ -37,6 +41,10 @@
           inherit pkgs;
 
           modules = [
+            ./shell
+            ./git
+            ./gpg
+            ./neovim
             ./horsch.nix
           ];
 
diff --git a/git.nix b/git/default.nix
similarity index 100%
rename from git.nix
rename to git/default.nix
diff --git a/horsch.nix b/horsch.nix
index 4ae54de..68a3050 100644
--- a/horsch.nix
+++ b/horsch.nix
@@ -6,10 +6,6 @@
 
   home.stateVersion = "24.05"; # Please read the comment before changing.
 
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
-
   programs.home-manager.enable = true;
 
   home.packages = with pkgs; [
@@ -18,23 +14,8 @@
   ];
 
   imports = [
-    ./bat.nix
-    ./carapace.nix
-    ./direnv.nix
-    ./eza.nix
-    ./fzf.nix
-    ./git.nix
-    ./gpg
-    ./neovim
     ./picocom.nix
     ./podman.nix
-    ./ripgrep.nix
-    ./rsync.nix
-    ./shell_aliases.nix
-    ./starship.nix
-    ./tree.nix
-    ./zoxide.nix
-    ./zsh.nix
 
     ./horsch/ssh.nix
     ./horsch/zsh.nix
diff --git a/neovim/default.nix b/neovim/default.nix
index 77082d5..69a51eb 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -1,6 +1,5 @@
 { pkgs, theme, ... }:
 {
-
   # symlink for a stable path 
   home.file.".vscode-extensions/vscode-lldb".source = pkgs.vscode-extensions.vadimcn.vscode-lldb;
 
diff --git a/private.nix b/private.nix
index 20c5ecd..0194cc4 100644
--- a/private.nix
+++ b/private.nix
@@ -7,17 +7,13 @@
   home.stateVersion = "24.05"; # Please read the comment before changing.
 
   home.packages = with pkgs; [
-    jq
-    htop
     pavucontrol
     gnumake
-    unzip
     gcc
     thunderbird
     keepassxc
     light
     element-desktop
-    difftastic
     darktable
     kubectl
     kubectx
@@ -27,50 +23,16 @@
     gthumb
     gimp
     evince
-    screen
     inkscape
     chromium
-    xclip
   ];
 
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/mandlm/etc/profile.d/hm-session-vars.sh
-  #
-  home.sessionVariables = { };
-
   programs.home-manager.enable = true;
 
   imports = [
-    ./bat.nix
-    ./carapace.nix
-    ./direnv.nix
-    ./eza.nix
     ./firefox.nix
-    ./fzf.nix
-    ./git.nix
-    ./gpg
     ./kitty.nix
-    ./neovim
     ./nextcloud.nix
-    ./ripgrep.nix
-    ./shell_aliases.nix
-    ./starship.nix
     ./sway
-    ./tree.nix
-    ./zoxide.nix
-    ./zsh.nix
   ];
 }
diff --git a/bat.nix b/shell/bat.nix
similarity index 100%
rename from bat.nix
rename to shell/bat.nix
diff --git a/carapace.nix b/shell/carapace.nix
similarity index 100%
rename from carapace.nix
rename to shell/carapace.nix
diff --git a/shell/default.nix b/shell/default.nix
new file mode 100644
index 0000000..575337c
--- /dev/null
+++ b/shell/default.nix
@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    difftastic
+    htop
+    jq
+    unzip
+    xclip
+  ];
+
+  imports = [
+    ./bat.nix
+    ./carapace.nix
+    ./direnv.nix
+    ./eza.nix
+    ./fzf.nix
+    ./ripgrep.nix
+    ./rsync.nix
+    ./shell_aliases.nix
+    ./starship.nix
+    ./tree.nix
+    ./zoxide.nix
+    ./zsh.nix
+  ];
+}
diff --git a/direnv.nix b/shell/direnv.nix
similarity index 100%
rename from direnv.nix
rename to shell/direnv.nix
diff --git a/eza.nix b/shell/eza.nix
similarity index 100%
rename from eza.nix
rename to shell/eza.nix
diff --git a/fzf.nix b/shell/fzf.nix
similarity index 100%
rename from fzf.nix
rename to shell/fzf.nix
diff --git a/ripgrep.nix b/shell/ripgrep.nix
similarity index 100%
rename from ripgrep.nix
rename to shell/ripgrep.nix
diff --git a/rsync.nix b/shell/rsync.nix
similarity index 100%
rename from rsync.nix
rename to shell/rsync.nix
diff --git a/shell_aliases.nix b/shell/shell_aliases.nix
similarity index 100%
rename from shell_aliases.nix
rename to shell/shell_aliases.nix
diff --git a/starship.nix b/shell/starship.nix
similarity index 100%
rename from starship.nix
rename to shell/starship.nix
diff --git a/tree.nix b/shell/tree.nix
similarity index 100%
rename from tree.nix
rename to shell/tree.nix
diff --git a/zoxide.nix b/shell/zoxide.nix
similarity index 100%
rename from zoxide.nix
rename to shell/zoxide.nix
diff --git a/zsh.nix b/shell/zsh.nix
similarity index 100%
rename from zsh.nix
rename to shell/zsh.nix