diff --git a/.gitignore b/.gitignore
index 564c965..09e9e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 
 result*
 .direnv/
+
+flake.lock
+!/flake.lock
diff --git a/bash/script/nixpkgs/flake.nix b/bash/nixpkgs/flake.nix
similarity index 100%
rename from bash/script/nixpkgs/flake.nix
rename to bash/nixpkgs/flake.nix
diff --git a/bash/script/nixpkgs/hello b/bash/nixpkgs/hello
similarity index 100%
rename from bash/script/nixpkgs/hello
rename to bash/nixpkgs/hello
diff --git a/bash/script/nixpkgs/package.nix b/bash/nixpkgs/package.nix
similarity index 100%
rename from bash/script/nixpkgs/package.nix
rename to bash/nixpkgs/package.nix
diff --git a/bash/script/nixpkgs/flake.lock b/bash/script/nixpkgs/flake.lock
deleted file mode 100644
index 31c547b..0000000
--- a/bash/script/nixpkgs/flake.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1763806073,
-        "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "878e468e02bfabeda08c79250f7ad583037f2227",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/fish/script/nixpkgs/flake.nix b/fish/nixpkgs/flake.nix
similarity index 100%
rename from fish/script/nixpkgs/flake.nix
rename to fish/nixpkgs/flake.nix
diff --git a/fish/script/nixpkgs/hello b/fish/nixpkgs/hello
similarity index 100%
rename from fish/script/nixpkgs/hello
rename to fish/nixpkgs/hello
diff --git a/fish/script/nixpkgs/package.nix b/fish/nixpkgs/package.nix
similarity index 100%
rename from fish/script/nixpkgs/package.nix
rename to fish/nixpkgs/package.nix
diff --git a/fish/script/nixpkgs/flake.lock b/fish/script/nixpkgs/flake.lock
deleted file mode 100644
index 31c547b..0000000
--- a/fish/script/nixpkgs/flake.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1763806073,
-        "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "878e468e02bfabeda08c79250f7ad583037f2227",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/flake.nix b/flake.nix
index 51cee52..9d558a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,8 +4,8 @@
   outputs = { self, ... }:
     let
       aliases = {
-        bash = "bash_script_nixpkgs";
-        fish = "fish_script_nixpkgs";
+        bash = "bash_nixpkgs";
+        fish = "fish_nixpkgs";
         python = "python_pyproject_nixpkgs_basic";
       };
 
@@ -16,6 +16,8 @@
           (d: sub.${d} == "directory")
           (builtins.attrNames sub);
 
+      vowelStart = str: builtins.elem (builtins.substring 0 1 str) [ "a" "e" "i" "o" "u" ];
+
       concatMapAttrs = func: attr:
         builtins.foldl' (x: y: x // y) {}
           (builtins.map func attr);
@@ -28,7 +30,7 @@
     in {
       templates = concatMapAttrs (path: {
         ${builtins.concatStringsSep "_" path} = {
-          description = "${builtins.head path} template - ${builtins.concatStringsSep
+          description = "${builtins.head path} template with ${builtins.concatStringsSep
             ", " (builtins.tail path)}";
           path = builtins.filterSource
             (path: type: builtins.baseNameOf path != "flake.lock")
diff --git a/python/pyproject/nixpkgs/basic/.envrc b/python/pyproject/nixpkgs/basic/.envrc
deleted file mode 100644
index af0cc93..0000000
--- a/python/pyproject/nixpkgs/basic/.envrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-use flake
diff --git a/python/pyproject/nixpkgs/basic/flake.lock b/python/pyproject/nixpkgs/basic/flake.lock
deleted file mode 100644
index fdd658c..0000000
--- a/python/pyproject/nixpkgs/basic/flake.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1763618868,
-        "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/python/pyproject/nixpkgs/basic/flake.nix b/python/pyproject/nixpkgs/basic/flake.nix
deleted file mode 100644
index 0c2dc0d..0000000
--- a/python/pyproject/nixpkgs/basic/flake.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    systems.url = "github:nix-systems/default";
-  };
-
-  outputs = { self, nixpkgs, systems, ... }:
-    let eachSystem = nixpkgs.lib.genAttrs (import systems);
-    in {
-      packages = eachSystem (system:
-        let pkgs = nixpkgs.legacyPackages.${system};
-        in {
-          hello = pkgs.callPackage ./package.nix {};
-          default = self.packages.${system}.hello;
-        });
-
-      devShells = eachSystem (system:
-        let pkgs = nixpkgs.legacyPackages.${system};
-        in {
-          default = pkgs.callPackage ./shell.nix {};
-        });
-    };
-}
diff --git a/python/pyproject/nixpkgs/basic/package.nix b/python/pyproject/nixpkgs/basic/package.nix
deleted file mode 100644
index 9919aa3..0000000
--- a/python/pyproject/nixpkgs/basic/package.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ python3
-}:
-
-python3.pkgs.buildPythonPackage {
-  pname = "hello";
-  version = "0.1";
-  src = ./.;
-
-  pyproject = true;
-  build-system = with python3.pkgs; [
-    # build-system.{requires,setup_requires}
-    setuptools
-  ];
-
-  dependencies = [
-    # Python package dependencies
-  ];
-
-  doCheck = false;
-}
diff --git a/python/pyproject/nixpkgs/basic/pyproject.toml b/python/pyproject/nixpkgs/basic/pyproject.toml
deleted file mode 100644
index 013c54f..0000000
--- a/python/pyproject/nixpkgs/basic/pyproject.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[project]
-name = "hello"
-version = "0.1.0"
-
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
diff --git a/python/pyproject/nixpkgs/basic/shell.nix b/python/pyproject/nixpkgs/basic/shell.nix
deleted file mode 100644
index 4a7e9e5..0000000
--- a/python/pyproject/nixpkgs/basic/shell.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ mkShell
-, python3
-}:
-
-mkShell {
-  inputsFrom = [ python3.buildEnv.env ];
-  packages = [ python3.pkgs.python-lsp-server ];
-}
diff --git a/python/pyproject/nixpkgs/basic/src/hello/__init__.py b/python/pyproject/nixpkgs/basic/src/hello/__init__.py
deleted file mode 100644
index 15b6a64..0000000
--- a/python/pyproject/nixpkgs/basic/src/hello/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .main import *
diff --git a/python/pyproject/nixpkgs/basic/src/hello/main.py b/python/pyproject/nixpkgs/basic/src/hello/main.py
deleted file mode 100644
index c7691d4..0000000
--- a/python/pyproject/nixpkgs/basic/src/hello/main.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-def hello():
-    return "Hello, World!"
diff --git a/python/pyproject/nixpkgs/cli/flake.lock b/python/pyproject/nixpkgs/cli/flake.lock
deleted file mode 100644
index fdd658c..0000000
--- a/python/pyproject/nixpkgs/cli/flake.lock
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1763618868,
-        "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}