diff --git a/flake.nix b/flake.nix
index 668d493..6361ea4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,15 +3,15 @@
 
   outputs = { self }: {
     templates = {
-      base-flake = {
-        path = ./base-flake;
+      flake-base = {
+        path = ./flakes/base;
         description = "An empty flake for each default system";
       };
-      rust-flake = {
-        path = ./rust-flake;
+      flake-rust = {
+        path = ./flakes/rust;
         description = "Flake to develop, build and run a rust application";
       };
     };
-    defaultTemplate = self.templates.base-flake;
+    defaultTemplate = self.templates.flake-base;
   };
 }
diff --git a/base-flake/.envrc b/flakes/base/.envrc
similarity index 100%
rename from base-flake/.envrc
rename to flakes/base/.envrc
diff --git a/base-flake/flake.nix b/flakes/base/flake.nix
similarity index 100%
rename from base-flake/flake.nix
rename to flakes/base/flake.nix
diff --git a/rust-flake/.envrc b/flakes/rust/.envrc
similarity index 100%
rename from rust-flake/.envrc
rename to flakes/rust/.envrc
diff --git a/rust-flake/flake.nix b/flakes/rust/flake.nix
similarity index 100%
rename from rust-flake/flake.nix
rename to flakes/rust/flake.nix