diff --git a/templates/flake-parts/flake.nix b/templates/clan/flake-parts/flake.nix
similarity index 100%
rename from templates/flake-parts/flake.nix
rename to templates/clan/flake-parts/flake.nix
diff --git a/templates/flake-parts/machines/jon/configuration.nix b/templates/clan/flake-parts/machines/jon/configuration.nix
similarity index 100%
rename from templates/flake-parts/machines/jon/configuration.nix
rename to templates/clan/flake-parts/machines/jon/configuration.nix
diff --git a/templates/flake-parts/machines/jon/hardware-configuration.nix b/templates/clan/flake-parts/machines/jon/hardware-configuration.nix
similarity index 100%
rename from templates/flake-parts/machines/jon/hardware-configuration.nix
rename to templates/clan/flake-parts/machines/jon/hardware-configuration.nix
diff --git a/templates/flake-parts/machines/sara/configuration.nix b/templates/clan/flake-parts/machines/sara/configuration.nix
similarity index 100%
rename from templates/flake-parts/machines/sara/configuration.nix
rename to templates/clan/flake-parts/machines/sara/configuration.nix
diff --git a/templates/flake-parts/machines/sara/hardware-configuration.nix b/templates/clan/flake-parts/machines/sara/hardware-configuration.nix
similarity index 100%
rename from templates/flake-parts/machines/sara/hardware-configuration.nix
rename to templates/clan/flake-parts/machines/sara/hardware-configuration.nix
diff --git a/templates/flake-parts/modules/disko.nix b/templates/clan/flake-parts/modules/disko.nix
similarity index 100%
rename from templates/flake-parts/modules/disko.nix
rename to templates/clan/flake-parts/modules/disko.nix
diff --git a/templates/flake-parts/modules/shared.nix b/templates/clan/flake-parts/modules/shared.nix
similarity index 100%
rename from templates/flake-parts/modules/shared.nix
rename to templates/clan/flake-parts/modules/shared.nix
diff --git a/templates/machineTemplates/machines/flash-installer/configuration.nix b/templates/clan/machineTemplates/machines/flash-installer/configuration.nix
similarity index 100%
rename from templates/machineTemplates/machines/flash-installer/configuration.nix
rename to templates/clan/machineTemplates/machines/flash-installer/configuration.nix
diff --git a/templates/machineTemplates/machines/flash-installer/disko.nix b/templates/clan/machineTemplates/machines/flash-installer/disko.nix
similarity index 100%
rename from templates/machineTemplates/machines/flash-installer/disko.nix
rename to templates/clan/machineTemplates/machines/flash-installer/disko.nix
diff --git a/templates/machineTemplates/machines/new-machine/configuration.nix b/templates/clan/machineTemplates/machines/new-machine/configuration.nix
similarity index 100%
rename from templates/machineTemplates/machines/new-machine/configuration.nix
rename to templates/clan/machineTemplates/machines/new-machine/configuration.nix
diff --git a/templates/minimal-flake-parts/.gitignore b/templates/clan/minimal-flake-parts/.gitignore
similarity index 100%
rename from templates/minimal-flake-parts/.gitignore
rename to templates/clan/minimal-flake-parts/.gitignore
diff --git a/templates/minimal-flake-parts/checks.nix b/templates/clan/minimal-flake-parts/checks.nix
similarity index 100%
rename from templates/minimal-flake-parts/checks.nix
rename to templates/clan/minimal-flake-parts/checks.nix
diff --git a/templates/minimal-flake-parts/clan.nix b/templates/clan/minimal-flake-parts/clan.nix
similarity index 100%
rename from templates/minimal-flake-parts/clan.nix
rename to templates/clan/minimal-flake-parts/clan.nix
diff --git a/templates/minimal-flake-parts/devshells.nix b/templates/clan/minimal-flake-parts/devshells.nix
similarity index 100%
rename from templates/minimal-flake-parts/devshells.nix
rename to templates/clan/minimal-flake-parts/devshells.nix
diff --git a/templates/minimal-flake-parts/flake.nix b/templates/clan/minimal-flake-parts/flake.nix
similarity index 100%
rename from templates/minimal-flake-parts/flake.nix
rename to templates/clan/minimal-flake-parts/flake.nix
diff --git a/templates/minimal-flake-parts/formatter.nix b/templates/clan/minimal-flake-parts/formatter.nix
similarity index 100%
rename from templates/minimal-flake-parts/formatter.nix
rename to templates/clan/minimal-flake-parts/formatter.nix
diff --git a/templates/minimal/flake.nix b/templates/clan/minimal/flake.nix
similarity index 100%
rename from templates/minimal/flake.nix
rename to templates/clan/minimal/flake.nix
diff --git a/templates/minimal/inventory.json b/templates/clan/minimal/inventory.json
similarity index 100%
rename from templates/minimal/inventory.json
rename to templates/clan/minimal/inventory.json
diff --git a/templates/new-clan/.clan-flake b/templates/clan/new-clan/.clan-flake
similarity index 100%
rename from templates/new-clan/.clan-flake
rename to templates/clan/new-clan/.clan-flake
diff --git a/templates/new-clan/.envrc b/templates/clan/new-clan/.envrc
similarity index 100%
rename from templates/new-clan/.envrc
rename to templates/clan/new-clan/.envrc
diff --git a/templates/new-clan/flake.nix b/templates/clan/new-clan/flake.nix
similarity index 100%
rename from templates/new-clan/flake.nix
rename to templates/clan/new-clan/flake.nix
diff --git a/templates/new-clan/machines/jon/configuration.nix b/templates/clan/new-clan/machines/jon/configuration.nix
similarity index 100%
rename from templates/new-clan/machines/jon/configuration.nix
rename to templates/clan/new-clan/machines/jon/configuration.nix
diff --git a/templates/new-clan/machines/jon/hardware-configuration.nix b/templates/clan/new-clan/machines/jon/hardware-configuration.nix
similarity index 100%
rename from templates/new-clan/machines/jon/hardware-configuration.nix
rename to templates/clan/new-clan/machines/jon/hardware-configuration.nix
diff --git a/templates/new-clan/machines/sara/configuration.nix b/templates/clan/new-clan/machines/sara/configuration.nix
similarity index 100%
rename from templates/new-clan/machines/sara/configuration.nix
rename to templates/clan/new-clan/machines/sara/configuration.nix
diff --git a/templates/new-clan/machines/sara/hardware-configuration.nix b/templates/clan/new-clan/machines/sara/hardware-configuration.nix
similarity index 100%
rename from templates/new-clan/machines/sara/hardware-configuration.nix
rename to templates/clan/new-clan/machines/sara/hardware-configuration.nix
diff --git a/templates/new-clan/modules/disko.nix b/templates/clan/new-clan/modules/disko.nix
similarity index 100%
rename from templates/new-clan/modules/disko.nix
rename to templates/clan/new-clan/modules/disko.nix
diff --git a/templates/new-clan/modules/gnome.nix b/templates/clan/new-clan/modules/gnome.nix
similarity index 100%
rename from templates/new-clan/modules/gnome.nix
rename to templates/clan/new-clan/modules/gnome.nix
diff --git a/templates/new-clan/modules/shared.nix b/templates/clan/new-clan/modules/shared.nix
similarity index 100%
rename from templates/new-clan/modules/shared.nix
rename to templates/clan/new-clan/modules/shared.nix
diff --git a/templates/flake.nix b/templates/flake.nix
index aa89d5e9d..8be797338 100644
--- a/templates/flake.nix
+++ b/templates/flake.nix
@@ -5,23 +5,23 @@
       templates = {
         default = {
           description = "Initialize a new clan flake";
-          path = ./new-clan;
+          path = ./clan/new-clan;
         };
         minimal = {
           description = "for clans managed via (G)UI";
-          path = ./minimal;
+          path = ./clan/minimal;
         };
         flake-parts = {
           description = "Flake-parts";
-          path = ./flake-parts;
+          path = ./clan/flake-parts;
         };
         minimal-flake-parts = {
           description = "Minimal flake-parts clan template";
-          path = ./minimal-flake-parts;
+          path = ./clan/minimal-flake-parts;
         };
         machineTemplates = {
           description = "Machine templates";
-          path = ./machineTemplates;
+          path = ./clan/machineTemplates;
         };
       };
     };