diff --git a/flake.nix b/flake.nix
index 14c724bd0..838c60c66 100644
--- a/flake.nix
+++ b/flake.nix
@@ -282,18 +282,18 @@
         };
 
       templates = {
-        python-data = {
+        env.python-data = {
           # initialize with:
-          # - `nix flake init -t '/home/colin/dev/nixos/#python-data'`
+          # - `nix flake init -t '/home/colin/dev/nixos/#env.python-data'`
           # then enter with:
           # - `nix develop`
-          path = ./templates/python-data;
+          path = ./templates/env/python-data;
           description = "python environment for data processing";
         };
-        rust = {
+        pkgs.rust-inline = {
           # initialize with:
-          # - `nix flake init -t '/home/colin/dev/nixos/#rust'`
-          path = ./templates/rust;
+          # - `nix flake init -t '/home/colin/dev/nixos/#pkgs.rust-inline'`
+          path = ./templates/pkgs/rust-inline;
           description = "rust package and development environment";
         };
       };
diff --git a/templates/python-data/flake.lock b/templates/env/python-data/flake.lock
similarity index 100%
rename from templates/python-data/flake.lock
rename to templates/env/python-data/flake.lock
diff --git a/templates/python-data/flake.nix b/templates/env/python-data/flake.nix
similarity index 100%
rename from templates/python-data/flake.nix
rename to templates/env/python-data/flake.nix
diff --git a/templates/rust/Cargo.lock b/templates/pkgs/rust-inline/Cargo.lock
similarity index 100%
rename from templates/rust/Cargo.lock
rename to templates/pkgs/rust-inline/Cargo.lock
diff --git a/templates/rust/Cargo.toml b/templates/pkgs/rust-inline/Cargo.toml
similarity index 100%
rename from templates/rust/Cargo.toml
rename to templates/pkgs/rust-inline/Cargo.toml
diff --git a/templates/rust/flake.lock b/templates/pkgs/rust-inline/flake.lock
similarity index 100%
rename from templates/rust/flake.lock
rename to templates/pkgs/rust-inline/flake.lock
diff --git a/templates/rust/flake.nix b/templates/pkgs/rust-inline/flake.nix
similarity index 100%
rename from templates/rust/flake.nix
rename to templates/pkgs/rust-inline/flake.nix
diff --git a/templates/rust/src/main.rs b/templates/pkgs/rust-inline/src/main.rs
similarity index 100%
rename from templates/rust/src/main.rs
rename to templates/pkgs/rust-inline/src/main.rs