diff --git a/home/shared/dev/bat.nix b/home/shared/dev/bat.nix
new file mode 100644
index 0000000..2756811
--- /dev/null
+++ b/home/shared/dev/bat.nix
@@ -0,0 +1,18 @@
+{ lib, ... }:
+{
+  home.sessionVariables = {
+    MANPAGER = "sh -c 'sed -u -e \\\"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\\\" | bat -p -lman'";
+    PAGER = "bat -p";
+  };
+  programs.bat = {
+    enable = true;
+    config = {
+      italic-text = "always";
+      style = lib.concatStringsSep "," [
+        "changes"
+        "rule"
+        "snip"
+      ];
+    };
+  };
+}
diff --git a/home/shared/dev/btop.nix b/home/shared/dev/btop.nix
new file mode 100644
index 0000000..ee12f92
--- /dev/null
+++ b/home/shared/dev/btop.nix
@@ -0,0 +1,3 @@
+{
+  programs.btop.enable = true;
+}
diff --git a/home/shared/dev/cli-tools/archives.nix b/home/shared/dev/cli-tools/archives.nix
deleted file mode 100644
index 68375dc..0000000
--- a/home/shared/dev/cli-tools/archives.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    gnutar
-    p7zip
-    unrar
-    unzip
-    zip
-  ];
-}
diff --git a/home/shared/dev/cli-tools/default.nix b/home/shared/dev/cli-tools/default.nix
deleted file mode 100644
index b804f8b..0000000
--- a/home/shared/dev/cli-tools/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./archives.nix
-    ./files.nix
-    ./find-and-navigate.nix
-    ./networking.nix
-    ./projects.nix
-    ./system.nix
-  ];
-  home.packages = with pkgs; [
-    asciinema
-    charm-freeze
-    clipboard-jh
-    glow
-    gum
-    hyperfine
-    outfieldr
-    vhs
-  ];
-}
diff --git a/home/shared/dev/cli-tools/files.nix b/home/shared/dev/cli-tools/files.nix
deleted file mode 100644
index 1e7bbae..0000000
--- a/home/shared/dev/cli-tools/files.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  home = {
-    packages = with pkgs; [
-      hexyl
-      ouch
-      pandoc
-      tesseract
-    ];
-    sessionVariables = {
-      MANPAGER = "sh -c 'sed -u -e \\\"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\\\" | bat -p -lman'";
-      PAGER = "bat -p";
-    };
-  };
-  programs.bat = {
-    enable = true;
-    config = {
-      italic-text = "always";
-      style = lib.concatStringsSep "," [
-        "changes"
-        "rule"
-        "numbers"
-        "snip"
-      ];
-    };
-  };
-}
diff --git a/home/shared/dev/cli-tools/find-and-navigate.nix b/home/shared/dev/cli-tools/find-and-navigate.nix
deleted file mode 100644
index e40a220..0000000
--- a/home/shared/dev/cli-tools/find-and-navigate.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  home = {
-    packages = with pkgs; [
-      fd
-      ripgrep
-      sd
-    ];
-    sessionVariables = {
-      # Required on macOS
-      EZA_CONFIG_DIR = "$XDG_CONFIG_HOME/eza";
-      LS_COLORS = "$(${lib.getExe pkgs.vivid} generate catppuccin-${config.catppuccin.flavor})";
-    };
-    shellAliases.cd = "z";
-  };
-  programs = {
-    eza = {
-      enable = true;
-      extraOptions = [
-        "--group-directories-first"
-      ];
-      git = true;
-      icons = "auto";
-    };
-    fzf = {
-      enable = true;
-      changeDirWidgetCommand = "fd --type d --hidden --strip-cwd-prefix --exclude .git";
-      changeDirWidgetOptions = [
-        "--preview= '${lib.getExe pkgs.eza} --tree --color=always {} | head -200'"
-      ];
-      defaultCommand = "fd --hidden --strip-cwd-prefix --exclude .git";
-      defaultOptions = [ "--layout reverse" ];
-      fileWidgetCommand = "fd --type f --hidden --strip-cwd-prefix --exclude .git";
-      fileWidgetOptions = [
-        "--preview 'bat -n --color=always --line-range :500 {}'"
-      ];
-    };
-    zoxide.enable = true;
-  };
-}
diff --git a/home/shared/dev/cli-tools/networking.nix b/home/shared/dev/cli-tools/networking.nix
deleted file mode 100644
index ad4e42b..0000000
--- a/home/shared/dev/cli-tools/networking.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    curl
-    jq
-  ];
-}
diff --git a/home/shared/dev/cli-tools/system.nix b/home/shared/dev/cli-tools/system.nix
deleted file mode 100644
index 035f0ec..0000000
--- a/home/shared/dev/cli-tools/system.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    dust
-    procs
-    usbutils
-    watch
-  ];
-  programs.btop.enable = true;
-}
diff --git a/home/shared/dev/default.nix b/home/shared/dev/default.nix
index ffd2a82..d08727d 100644
--- a/home/shared/dev/default.nix
+++ b/home/shared/dev/default.nix
@@ -1,16 +1,53 @@
+{ pkgs, ... }:
 {
   imports = [
-    ./cli-tools
+    ./ai
     ./lang
-    ./shells
+    ./shell
     ./vcs
-    ./ai
+    ./bat.nix
+    ./btop.nix
+    ./direnv.nix
     ./editorconfig.nix
+    ./eza.nix
+    ./fd.nix
+    ./fzf.nix
     ./ghostty.nix
     ./helix.nix
+    ./jq.nix
+    ./pandoc.nix
     ./podman.nix
+    ./ripgrep.nix
     ./ssh.nix
     ./tmux.nix
     ./yazi.nix
+    ./zoxide.nix
+  ];
+  home.packages = with pkgs; [
+    asciinema
+    charm-freeze
+    clipboard-jh
+    curl
+    dust
+    glow
+    gnutar
+    gum
+    hexyl
+    hyperfine
+    just
+    ouch
+    outfieldr
+    p7zip
+    procs
+    sd
+    svu
+    tesseract
+    tokei
+    unrar
+    unzip
+    usbutils
+    vhs
+    watch
+    zip
   ];
 }
diff --git a/home/shared/dev/cli-tools/projects.nix b/home/shared/dev/direnv.nix
similarity index 50%
rename from home/shared/dev/cli-tools/projects.nix
rename to home/shared/dev/direnv.nix
index 8b3ff16..2b51c9d 100644
--- a/home/shared/dev/cli-tools/projects.nix
+++ b/home/shared/dev/direnv.nix
@@ -1,10 +1,4 @@
-{ pkgs, ... }:
 {
-  home.packages = with pkgs; [
-    just
-    svu
-    tokei
-  ];
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
diff --git a/home/shared/dev/eza.nix b/home/shared/dev/eza.nix
new file mode 100644
index 0000000..3074000
--- /dev/null
+++ b/home/shared/dev/eza.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  home.sessionVariables = {
+    # Required on macOS
+    EZA_CONFIG_DIR = "$XDG_CONFIG_HOME/eza";
+    LS_COLORS = "$(${lib.getExe pkgs.vivid} generate catppuccin-${config.catppuccin.flavor})";
+  };
+  programs.eza = {
+    enable = true;
+    extraOptions = [
+      "--group-directories-first"
+    ];
+    icons = "auto";
+  };
+}
diff --git a/home/shared/dev/fd.nix b/home/shared/dev/fd.nix
new file mode 100644
index 0000000..b46e74c
--- /dev/null
+++ b/home/shared/dev/fd.nix
@@ -0,0 +1,6 @@
+{
+  programs.fd = {
+    enable = true;
+    hidden = true;
+  };
+}
diff --git a/home/shared/dev/fzf.nix b/home/shared/dev/fzf.nix
new file mode 100644
index 0000000..5e620ed
--- /dev/null
+++ b/home/shared/dev/fzf.nix
@@ -0,0 +1,20 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+{
+  programs.fzf = {
+    enable = true;
+    changeDirWidgetCommand = "fd --type d --hidden --strip-cwd-prefix --exclude .git";
+    changeDirWidgetOptions = [
+      "--preview= '${lib.getExe pkgs.eza} --tree --color=always {} | head -200'"
+    ];
+    defaultCommand = "fd --hidden --strip-cwd-prefix --exclude .git";
+    defaultOptions = [ "--layout reverse" ];
+    fileWidgetCommand = "fd --type f --hidden --strip-cwd-prefix --exclude .git";
+    fileWidgetOptions = [
+      "--preview 'bat -n --color=always --line-range :500 {}'"
+    ];
+  };
+}
diff --git a/home/shared/dev/jq.nix b/home/shared/dev/jq.nix
new file mode 100644
index 0000000..825fbf2
--- /dev/null
+++ b/home/shared/dev/jq.nix
@@ -0,0 +1,3 @@
+{
+  programs.jq.enable = true;
+}
diff --git a/home/shared/dev/pandoc.nix b/home/shared/dev/pandoc.nix
new file mode 100644
index 0000000..91a7b2d
--- /dev/null
+++ b/home/shared/dev/pandoc.nix
@@ -0,0 +1,10 @@
+{
+  programs.pandoc = {
+    enable = true;
+    defaults = {
+      citeproc = true;
+      metadata.author = "Thierry Delafontaine";
+      standalone = true;
+    };
+  };
+}
diff --git a/home/shared/dev/ripgrep.nix b/home/shared/dev/ripgrep.nix
new file mode 100644
index 0000000..f0e3497
--- /dev/null
+++ b/home/shared/dev/ripgrep.nix
@@ -0,0 +1,8 @@
+{
+  programs.ripgrep = {
+    enable = true;
+    arguments = [
+      "--hidden"
+    ];
+  };
+}
diff --git a/home/shared/dev/shells/atuin.nix b/home/shared/dev/shell/atuin.nix
similarity index 100%
rename from home/shared/dev/shells/atuin.nix
rename to home/shared/dev/shell/atuin.nix
diff --git a/home/shared/dev/shells/bash.nix b/home/shared/dev/shell/bash.nix
similarity index 100%
rename from home/shared/dev/shells/bash.nix
rename to home/shared/dev/shell/bash.nix
diff --git a/home/shared/dev/shells/default.nix b/home/shared/dev/shell/default.nix
similarity index 100%
rename from home/shared/dev/shells/default.nix
rename to home/shared/dev/shell/default.nix
diff --git a/home/shared/dev/shells/environment/aliases.nix b/home/shared/dev/shell/environment/aliases.nix
similarity index 100%
rename from home/shared/dev/shells/environment/aliases.nix
rename to home/shared/dev/shell/environment/aliases.nix
diff --git a/home/shared/dev/shells/environment/default.nix b/home/shared/dev/shell/environment/default.nix
similarity index 100%
rename from home/shared/dev/shells/environment/default.nix
rename to home/shared/dev/shell/environment/default.nix
diff --git a/home/shared/dev/shells/environment/session-path.nix b/home/shared/dev/shell/environment/session-path.nix
similarity index 100%
rename from home/shared/dev/shells/environment/session-path.nix
rename to home/shared/dev/shell/environment/session-path.nix
diff --git a/home/shared/dev/shells/fish.nix b/home/shared/dev/shell/fish.nix
similarity index 100%
rename from home/shared/dev/shells/fish.nix
rename to home/shared/dev/shell/fish.nix
diff --git a/home/shared/dev/shells/ui/default.nix b/home/shared/dev/shell/ui/default.nix
similarity index 100%
rename from home/shared/dev/shells/ui/default.nix
rename to home/shared/dev/shell/ui/default.nix
diff --git a/home/shared/dev/shells/ui/dircolors.nix b/home/shared/dev/shell/ui/dircolors.nix
similarity index 100%
rename from home/shared/dev/shells/ui/dircolors.nix
rename to home/shared/dev/shell/ui/dircolors.nix
diff --git a/home/shared/dev/shells/ui/starship.nix b/home/shared/dev/shell/ui/starship.nix
similarity index 100%
rename from home/shared/dev/shells/ui/starship.nix
rename to home/shared/dev/shell/ui/starship.nix
diff --git a/home/shared/dev/zoxide.nix b/home/shared/dev/zoxide.nix
new file mode 100644
index 0000000..01f8cfd
--- /dev/null
+++ b/home/shared/dev/zoxide.nix
@@ -0,0 +1,8 @@
+{
+  programs.zoxide = {
+    enable = true;
+    options = [
+      "--cmd c"
+    ];
+  };
+}