diff --git a/packages/default.nix b/packages/default.nix
index 4d313ce..6b50927 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,9 +1,8 @@
 {pkgs}: let
   inherit (pkgs) lib;
-  wrapped-helix = pkgs.callPackage ./helix {};
+  helix = pkgs.callPackage ./helix {};
   kakoune = pkgs.callPackage ./kakoune.nix {};
-  fish = pkgs.callPackage ./shell {inherit lib;};
+  fish = pkgs.callPackage ./fish {inherit lib;};
 in {
-  inherit kakoune fish;
-  helix = wrapped-helix;
+  inherit kakoune fish helix;
 }
diff --git a/packages/shell/aliases.nix b/packages/fish/aliases.nix
similarity index 100%
rename from packages/shell/aliases.nix
rename to packages/fish/aliases.nix
diff --git a/packages/shell/config.fish b/packages/fish/config.fish
similarity index 100%
rename from packages/shell/config.fish
rename to packages/fish/config.fish
diff --git a/packages/shell/default.nix b/packages/fish/default.nix
similarity index 100%
rename from packages/shell/default.nix
rename to packages/fish/default.nix
diff --git a/packages/shell/fishinit.nix b/packages/fish/fishinit.nix
similarity index 100%
rename from packages/shell/fishinit.nix
rename to packages/fish/fishinit.nix
diff --git a/packages/shell/packages.nix b/packages/fish/packages.nix
similarity index 100%
rename from packages/shell/packages.nix
rename to packages/fish/packages.nix
diff --git a/packages/shell/starship.nix b/packages/fish/starship.nix
similarity index 100%
rename from packages/shell/starship.nix
rename to packages/fish/starship.nix