diff --git a/.gitignore b/.gitignore
index 09e9e2d..3d4575f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 
 result*
-.direnv/
-
-flake.lock
-!/flake.lock
+.direnv
diff --git a/LICENSE b/LICENSE
index 141fcbf..a5d8715 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Kiana Sheibani
+Copyright (c) 2023 Kiana Sheibani
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
deleted file mode 100644
index ca4a350..0000000
--- a/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Toki's Nix Flake Template Repository
-
-This is my personal collection of Nix flake templates for various programming
-languages and build systems.
-
-## Motivation
-
-There already exists a [semi-official repository of flake
-templates](https://github.com/NixOS/templates), so why make my own?
-
-I have a few different reasons:
-
-- **Comprehensiveness:** The official template repository is rather small and
-  doesn't have most of the templates I would actually want to use.
-- **Consistency:** The templates in the official repository are contributed by
-  community members, and there's very little stylistic or structural consistency
-  between them.
-- **Preference:** The structure of a flake can be very opinionated, and most of
-  the official flake templates are rather poorly constructed by my standards,
-  often not bothering to follow established best practices.
-
-## Usage
-
-Flake templates are used with the `nix flake init` command:
-
-```sh
-nix flake init -t git+https://git.tokinanpa.dev/toki/templates#<template>
-```
-
-Replace `<template>` with the template you want to use. In the simplest case,
-this is just the name of the programming language you want to use; the
-repository will pick a recommended default template for that language.
-
-If you want more control over the generated repository, you may select a
-specific template instead. Templates names are organized by underscore-separated
-*fields*; the number of fields may very depending on the language, but typically
-there are three or four:
-
-1. The programming language
-2. The build system used to compile/package the repository
-3. The Nix library/evaluation system used in the flake itself
-4. (Optional) Additional differences in project structure
-
-For example, the `python_pyproject_nixpkgs_cli` template generates a Python
-repository packaged in Pyproject format where the flake uses Nixpkgs' standard
-derivation builders (`buildPythonPackage`) and the repository exposes a CLI application.
diff --git a/bash/nixpkgs/flake.lock b/bash/nixpkgs/flake.lock
new file mode 100644
index 0000000..45fde49
--- /dev/null
+++ b/bash/nixpkgs/flake.lock
@@ -0,0 +1,43 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1722073938,
+        "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
+        "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/bash/nixpkgs/flake.nix b/bash/nixpkgs/flake.nix
index 266f871..9505679 100644
--- a/bash/nixpkgs/flake.nix
+++ b/bash/nixpkgs/flake.nix
@@ -10,8 +10,8 @@
       packages = eachSystem (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in {
-          hello = pkgs.callPackage ./package.nix {};
-          default = self.packages.${system}.hello;
+          soe = pkgs.callPackage ./package.nix {};
+          default = self.packages.${system}.soe;
         });
     };
 }
diff --git a/bash/nixpkgs/package.nix b/bash/nixpkgs/package.nix
index 458a1ce..20e14bc 100644
--- a/bash/nixpkgs/package.nix
+++ b/bash/nixpkgs/package.nix
@@ -1,10 +1,10 @@
-{ stdenvNoCC
+{ stdenv
 , bash
 }:
 
-stdenvNoCC.mkDerivation {
-  pname = "hello";
-  version = "0.1";
+stdenv.mkDerivation {
+  pname = "soe";
+  version = "1.0";
 
   src = ./.;
 
@@ -12,6 +12,6 @@ stdenvNoCC.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp hello $out/bin
+    cp soe $out/bin
   '';
 }
diff --git a/bash/nixpkgs/soe b/bash/nixpkgs/soe
new file mode 100755
index 0000000..e861d8f
--- /dev/null
+++ b/bash/nixpkgs/soe
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+echo -n "Primes up to: "
+read num
+echo
+
+nums=()
+for i in `seq 2 $num`; do
+    nums+=($i)
+done
+
+unset nums[-1]
+
+while [ -n "$nums" ]; do
+    prime=${nums[0]}
+    echo -n "$prime "
+    nums_=()
+    for elem in "${nums[@]}"; do
+        [ $(( $elem % $prime )) -eq 0 ] || nums_+=($elem)
+    done
+    nums=(${nums_[@]})
+done
+
+echo
diff --git a/fish/nixpkgs/flake.lock b/fish/nixpkgs/flake.lock
new file mode 100644
index 0000000..c44d5a5
--- /dev/null
+++ b/fish/nixpkgs/flake.lock
@@ -0,0 +1,43 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1722141560,
+        "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
+        "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/nixpkgs/flake.nix b/fish/nixpkgs/flake.nix
index 266f871..9505679 100644
--- a/fish/nixpkgs/flake.nix
+++ b/fish/nixpkgs/flake.nix
@@ -10,8 +10,8 @@
       packages = eachSystem (system:
         let pkgs = nixpkgs.legacyPackages.${system};
         in {
-          hello = pkgs.callPackage ./package.nix {};
-          default = self.packages.${system}.hello;
+          soe = pkgs.callPackage ./package.nix {};
+          default = self.packages.${system}.soe;
         });
     };
 }
diff --git a/fish/nixpkgs/hello b/fish/nixpkgs/hello
deleted file mode 100755
index 98ecd49..0000000
--- a/fish/nixpkgs/hello
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env fish
-
-echo "Hello, World!"
diff --git a/fish/nixpkgs/package.nix b/fish/nixpkgs/package.nix
index 6e6dcde..aaeb6d2 100644
--- a/fish/nixpkgs/package.nix
+++ b/fish/nixpkgs/package.nix
@@ -1,10 +1,10 @@
-{ stdenvNoCC
+{ stdenv
 , fish
 }:
 
-stdenvNoCC.mkDerivation {
-  pname = "hello";
-  version = "0.1";
+stdenv.mkDerivation {
+  pname = "soe";
+  version = "1.0";
 
   src = ./.;
 
@@ -12,6 +12,6 @@ stdenvNoCC.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp hello $out/bin
+    cp soe $out/bin
   '';
 }
diff --git a/fish/nixpkgs/soe b/fish/nixpkgs/soe
new file mode 100755
index 0000000..5cc2b5a
--- /dev/null
+++ b/fish/nixpkgs/soe
@@ -0,0 +1,19 @@
+#!/usr/bin/env fish
+
+read -P "Primes up to: " num
+echo
+
+set nums (seq 2 $num)[..-2]
+
+while test -n "$nums"
+    set prime $nums[1]
+    echo -n "$prime "
+
+    set -e nums_
+    for elem in $nums
+        test (math $elem % $prime) -eq 0 || set -a nums_ $elem
+    end
+    set nums $nums_
+end
+
+echo
diff --git a/flake.nix b/flake.nix
index 9d558a2..6164411 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,11 @@
 {
-  description = "Hello World flake templates for various languages and build systems";
+  description = "Templates of the Sieve of Eratosthenes implemented in various languages";
 
   outputs = { self, ... }:
     let
-      aliases = {
-        bash = "bash_nixpkgs";
-        fish = "fish_nixpkgs";
-        python = "python_pyproject_nixpkgs_basic";
-      };
-
       # Get all project directories
       subdirs = dir:
-        let sub = __readDir dir;
+        let sub = builtins.readDir dir;
         in builtins.filter
           (d: sub.${d} == "directory")
           (builtins.attrNames sub);
@@ -22,23 +16,28 @@
         builtins.foldl' (x: y: x // y) {}
           (builtins.map func attr);
 
-      flakeSubdirs = dir:
-        builtins.concatMap (sub:
-          if builtins.pathExists /${dir}/${sub}/flake.nix then [ [ sub ] ] else
-            builtins.map (l: [ sub ] ++ l) (flakeSubdirs /${dir}/${sub}))
-          (subdirs dir);
+      templateDirs =
+        builtins.concatMap (lang:
+          builtins.map
+            (pkg: { inherit lang pkg; })
+            (subdirs ./${lang}))
+          (subdirs ./.);
     in {
-      templates = concatMapAttrs (path: {
-        ${builtins.concatStringsSep "_" path} = {
-          description = "${builtins.head path} template with ${builtins.concatStringsSep
-            ", " (builtins.tail path)}";
+      templates = concatMapAttrs ({ lang, pkg }: {
+        "${lang}-${pkg}" = {
+          description = "Packaging a${if vowelStart lang
+                                      then "n"
+                                      else ""} ${lang} executable using ${pkg}";
           path = builtins.filterSource
             (path: type: builtins.baseNameOf path != "flake.lock")
-            (builtins.foldl' (dir: sub: /${dir}/${sub}) ./. path);
+            ./${lang}/${pkg};
         };
-      }) (flakeSubdirs ./.) // builtins.mapAttrs (lang: def:
-        self.templates.${def} // {
-          description = "${lang} template";
-      }) aliases;
+      }) templateDirs // concatMapAttrs (lang: {
+        "${lang}" = self.templates."${lang}-nixpkgs" // {
+          description = "Packaging a${if vowelStart lang
+                                      then "n"
+                                      else ""} ${lang} executable";
+        };
+      }) (subdirs ./.);
     };
 }
diff --git a/bash/nixpkgs/hello b/python/nixpkgs/.envrc
old mode 100755
new mode 100644
similarity index 50%
rename from bash/nixpkgs/hello
rename to python/nixpkgs/.envrc
index 86f1c62..e4c941b
--- a/bash/nixpkgs/hello
+++ b/python/nixpkgs/.envrc
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-echo "Hello, World!"
+use flake ..#python
diff --git a/python/nixpkgs/bin/soe b/python/nixpkgs/bin/soe
new file mode 100755
index 0000000..9ef8dcc
--- /dev/null
+++ b/python/nixpkgs/bin/soe
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+import soe
+soe.main()
diff --git a/python/nixpkgs/flake.lock b/python/nixpkgs/flake.lock
new file mode 100644
index 0000000..c44d5a5
--- /dev/null
+++ b/python/nixpkgs/flake.lock
@@ -0,0 +1,43 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1722141560,
+        "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
+        "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/cli/flake.nix b/python/nixpkgs/flake.nix
similarity index 57%
rename from python/pyproject/nixpkgs/cli/flake.nix
rename to python/nixpkgs/flake.nix
index 0c2dc0d..9505679 100644
--- a/python/pyproject/nixpkgs/cli/flake.nix
+++ b/python/nixpkgs/flake.nix
@@ -10,14 +10,8 @@
       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 {};
+          soe = pkgs.callPackage ./package.nix {};
+          default = self.packages.${system}.soe;
         });
     };
 }
diff --git a/python/nixpkgs/package.nix b/python/nixpkgs/package.nix
new file mode 100644
index 0000000..961c388
--- /dev/null
+++ b/python/nixpkgs/package.nix
@@ -0,0 +1,9 @@
+{ python3 }:
+
+python3.pkgs.buildPythonApplication {
+  pname = "soe";
+  version = "1.0";
+  src = ./.;
+
+  doCheck = false;
+}
diff --git a/python/nixpkgs/setup.py b/python/nixpkgs/setup.py
new file mode 100644
index 0000000..158092b
--- /dev/null
+++ b/python/nixpkgs/setup.py
@@ -0,0 +1,7 @@
+from setuptools import setup
+
+setup(
+    name="soe",
+    version="1.0.0",
+    scripts=["bin/soe"]
+)
diff --git a/python/nixpkgs/shell.nix b/python/nixpkgs/shell.nix
new file mode 100644
index 0000000..332eaff
--- /dev/null
+++ b/python/nixpkgs/shell.nix
@@ -0,0 +1,3 @@
+{ python3 }:
+
+python3.buildEnv.env
diff --git a/python/pyproject/nixpkgs/cli/src/hello/__init__.py b/python/nixpkgs/soe/__init__.py
similarity index 100%
rename from python/pyproject/nixpkgs/cli/src/hello/__init__.py
rename to python/nixpkgs/soe/__init__.py
diff --git a/python/nixpkgs/soe/main.py b/python/nixpkgs/soe/main.py
new file mode 100644
index 0000000..f6a1425
--- /dev/null
+++ b/python/nixpkgs/soe/main.py
@@ -0,0 +1,18 @@
+
+def sieve_of_eratosthenes(n):
+    nums = list(range(2, n))
+    while nums:
+        prime = nums[0]
+        nums = [i for i in nums if i % prime]
+        yield prime
+
+def main():
+    num = int(input("Primes up to: "))
+    print()
+    for i in sieve_of_eratosthenes(num):
+        print(i, end=" ")
+    print()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/python/pyproject/nixpkgs/cli/.envrc b/python/pyproject/nixpkgs/cli/.envrc
deleted file mode 100644
index af0cc93..0000000
--- a/python/pyproject/nixpkgs/cli/.envrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-use flake
diff --git a/python/pyproject/nixpkgs/cli/package.nix b/python/pyproject/nixpkgs/cli/package.nix
deleted file mode 100644
index ce28631..0000000
--- a/python/pyproject/nixpkgs/cli/package.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ python3
-}:
-
-python3.pkgs.buildPythonApplication {
-  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/cli/pyproject.toml b/python/pyproject/nixpkgs/cli/pyproject.toml
deleted file mode 100644
index 07e8dfb..0000000
--- a/python/pyproject/nixpkgs/cli/pyproject.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[project]
-name = "hello"
-version = "0.1.0"
-
-[project.scripts]
-hello = "hello:main"
-
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
diff --git a/python/pyproject/nixpkgs/cli/shell.nix b/python/pyproject/nixpkgs/cli/shell.nix
deleted file mode 100644
index 4a7e9e5..0000000
--- a/python/pyproject/nixpkgs/cli/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/cli/src/hello/main.py b/python/pyproject/nixpkgs/cli/src/hello/main.py
deleted file mode 100644
index b1a4c27..0000000
--- a/python/pyproject/nixpkgs/cli/src/hello/main.py
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def main():
-    print("Hello, World!")
-
-if __name__ == "__main__":
-    main()