diff --git a/flake.nix b/flake.nix
index 2f1f9e3..b2418bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,8 +42,6 @@
         program = "${helix}/bin/hx";
       };
     });
-
-    templates = import ./templates;
   };
   inputs = {
     # Unstable nixpkgs baby!
diff --git a/packages/default.nix b/packages/default.nix
index 6b50927..4d313ce 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,8 +1,9 @@
 {pkgs}: let
   inherit (pkgs) lib;
-  helix = pkgs.callPackage ./helix {};
+  wrapped-helix = pkgs.callPackage ./helix {};
   kakoune = pkgs.callPackage ./kakoune.nix {};
-  fish = pkgs.callPackage ./fish {inherit lib;};
+  fish = pkgs.callPackage ./shell {inherit lib;};
 in {
-  inherit kakoune fish helix;
+  inherit kakoune fish;
+  helix = wrapped-helix;
 }
diff --git a/packages/fish/aliases.nix b/packages/shell/aliases.nix
similarity index 100%
rename from packages/fish/aliases.nix
rename to packages/shell/aliases.nix
diff --git a/packages/fish/config.fish b/packages/shell/config.fish
similarity index 100%
rename from packages/fish/config.fish
rename to packages/shell/config.fish
diff --git a/packages/fish/default.nix b/packages/shell/default.nix
similarity index 100%
rename from packages/fish/default.nix
rename to packages/shell/default.nix
diff --git a/packages/fish/fishinit.nix b/packages/shell/fishinit.nix
similarity index 100%
rename from packages/fish/fishinit.nix
rename to packages/shell/fishinit.nix
diff --git a/packages/fish/packages.nix b/packages/shell/packages.nix
similarity index 100%
rename from packages/fish/packages.nix
rename to packages/shell/packages.nix
diff --git a/packages/fish/starship.nix b/packages/shell/starship.nix
similarity index 100%
rename from packages/fish/starship.nix
rename to packages/shell/starship.nix
diff --git a/templates/default.nix b/templates/default.nix
deleted file mode 100644
index 0dea28b..0000000
--- a/templates/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  rust = {
-    path = ./rust;
-    description = "Rust project template";
-  };
-}
diff --git a/templates/rust/.envrc b/templates/rust/.envrc
deleted file mode 100644
index 3550a30..0000000
--- a/templates/rust/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-use flake
diff --git a/templates/rust/Cargo.toml b/templates/rust/Cargo.toml
deleted file mode 100644
index 892d1eb..0000000
--- a/templates/rust/Cargo.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[package]
-name = "sample-rust"
-version = "0.0.1"
-license     = "GPL-3.0-only"
-edition = "2024"
diff --git a/templates/rust/default.nix b/templates/rust/default.nix
deleted file mode 100644
index 69ea5e5..0000000
--- a/templates/rust/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{rustPlatform}:
-rustPlatform.buildRustPackage {
-  pname = "some-rust-package";
-  version = "0.0.1";
-
-  src = ./.;
-  cargoLock.lockFile = ./Cargo.lock;
-}
diff --git a/templates/rust/flake.nix b/templates/rust/flake.nix
deleted file mode 100644
index 738ae57..0000000
--- a/templates/rust/flake.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  description = "Rust project template";
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    systems.url = "github:nix-systems/default-linux";
-  };
-
-  outputs = inputs: let
-    inherit (inputs.nixpkgs) lib;
-    inherit (lib.attrsets) genAttrs mapAttrs;
-
-    eachSystem = genAttrs (import inputs.systems);
-    pkgsFor = inputs.nixpkgs.legacyPackages;
-  in {
-    packages = eachSystem (system: {
-      default = inputs.self.packages.${system}.ralc;
-      ralc = pkgsFor.${system}.callPackage ./nix/package.nix {};
-    });
-
-    devShells =
-      mapAttrs (system: pkgs: {
-        default = pkgs.mkShell {
-          packages = with pkgs; [
-            cargo
-            rustc
-            rustfmt
-            bacon
-            rust-analyzer
-            rustPackages.clippy
-          ];
-        };
-      })
-      pkgsFor;
-  };
-}
diff --git a/templates/rust/src/main.rs b/templates/rust/src/main.rs
deleted file mode 100644
index 47ad8c6..0000000
--- a/templates/rust/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
-    println!("Hello World!");
-}