diff --git a/templates/flake-module.nix b/templates/flake-module.nix
index 0456becb5..2cf940d6a 100644
--- a/templates/flake-module.nix
+++ b/templates/flake-module.nix
@@ -11,12 +11,12 @@
     machine = {
       flash-installer = {
         description = "Initialize a new flash-installer machine";
-        path = ./clan/machineTemplates/machines/flash-installer;
+        path = ./machine/flash-installer;
       };
 
       new-machine = {
         description = "Initialize a new machine";
-        path = ./clan/machineTemplates/machines/new-machine;
+        path = ./machine/new-machine;
       };
     };
 
diff --git a/templates/flake.nix b/templates/flake.nix
index 8be797338..c11539f49 100644
--- a/templates/flake.nix
+++ b/templates/flake.nix
@@ -21,7 +21,7 @@
         };
         machineTemplates = {
           description = "Machine templates";
-          path = ./clan/machineTemplates;
+          path = ./machine;
         };
       };
     };
diff --git a/templates/clan/machineTemplates/machines/flash-installer/configuration.nix b/templates/machine/flash-installer/configuration.nix
similarity index 100%
rename from templates/clan/machineTemplates/machines/flash-installer/configuration.nix
rename to templates/machine/flash-installer/configuration.nix
diff --git a/templates/clan/machineTemplates/machines/flash-installer/disko.nix b/templates/machine/flash-installer/disko.nix
similarity index 100%
rename from templates/clan/machineTemplates/machines/flash-installer/disko.nix
rename to templates/machine/flash-installer/disko.nix
diff --git a/templates/clan/machineTemplates/machines/new-machine/configuration.nix b/templates/machine/new-machine/configuration.nix
similarity index 100%
rename from templates/clan/machineTemplates/machines/new-machine/configuration.nix
rename to templates/machine/new-machine/configuration.nix