diff --git a/lib/modules/computed-tags.nix b/lib/modules/clan/computed-tags.nix
similarity index 100%
rename from lib/modules/computed-tags.nix
rename to lib/modules/clan/computed-tags.nix
diff --git a/lib/modules/interface.nix b/lib/modules/clan/interface.nix
similarity index 95%
rename from lib/modules/interface.nix
rename to lib/modules/clan/interface.nix
index f71e97d90..d2bc92f5a 100644
--- a/lib/modules/interface.nix
+++ b/lib/modules/clan/interface.nix
@@ -90,7 +90,7 @@ in
     };
 
     templates = lib.mkOption {
-      type = types.submodule { imports = [ ./templates/interface.nix ]; };
+      type = types.submodule { imports = [ ./templates.nix ]; };
       default = { };
       description = ''
         Define Clan templates.
@@ -100,7 +100,7 @@ in
     inventory = lib.mkOption {
       type = types.submodule {
         imports = [
-          (lib.modules.importApply ../inventory/build-inventory/interface.nix { inherit clanLib; })
+          (lib.modules.importApply ../../inventory/build-inventory/interface.nix { inherit clanLib; })
         ];
       };
       description = ''
@@ -116,13 +116,13 @@ in
         Global information about the clan.
       '';
       type = types.deferredModuleWith {
-        staticModules = [ ../inventory/build-inventory/meta-interface.nix ];
+        staticModules = [ ../../inventory/build-inventory/meta-interface.nix ];
       };
       default = { };
     };
 
     secrets = lib.mkOption {
-      type = types.submodule { imports = [ ./secrets/interface.nix ]; };
+      type = types.submodule { imports = [ ./secrets.nix ]; };
       description = ''
         Secrets related options such as AGE plugins required to encrypt/decrypt secrets using the CLI.
       '';
diff --git a/lib/modules/module.nix b/lib/modules/clan/module.nix
similarity index 98%
rename from lib/modules/module.nix
rename to lib/modules/clan/module.nix
index a137f8202..b5d63f904 100644
--- a/lib/modules/module.nix
+++ b/lib/modules/clan/module.nix
@@ -120,7 +120,7 @@ let
           moduleSystemConstructor.${machineClasses.${name}} {
             modules = [
               (config.outputs.moduleForMachine.${name} or { })
-              (lib.modules.importApply ./machineModules/overridePkgs.nix {
+              (lib.modules.importApply ../machineModules/overridePkgs.nix {
                 pkgs = pkgsFor.${system};
               })
             ];
@@ -201,7 +201,7 @@ in
           in
           {
             imports = [
-              (lib.modules.importApply ./machineModules/forName.nix {
+              (lib.modules.importApply ../machineModules/forName.nix {
                 inherit (config.inventory) meta;
                 inherit
                   name
diff --git a/lib/modules/secrets/interface.nix b/lib/modules/clan/secrets.nix
similarity index 100%
rename from lib/modules/secrets/interface.nix
rename to lib/modules/clan/secrets.nix
diff --git a/lib/modules/templates/interface.nix b/lib/modules/clan/templates.nix
similarity index 100%
rename from lib/modules/templates/interface.nix
rename to lib/modules/clan/templates.nix
diff --git a/lib/modules/default.nix b/lib/modules/default.nix
index 7327814a0..2fb01f1c3 100644
--- a/lib/modules/default.nix
+++ b/lib/modules/default.nix
@@ -9,8 +9,8 @@
 {
   flakePartsModule = {
     imports = [
-      (lib.modules.importApply ./interface.nix { inherit clanLib; })
-      ./module.nix
+      (lib.modules.importApply ./clan/interface.nix { inherit clanLib; })
+      ./clan/module.nix
     ];
   };
 
@@ -68,7 +68,7 @@
         imports = [
           rest
           # implementation
-          ./module.nix
+          ./clan/module.nix
         ];
       };
     in
diff --git a/lib/modules/eval-docs.nix b/lib/modules/eval-docs.nix
index 584aa3e06..b72e130bb 100644
--- a/lib/modules/eval-docs.nix
+++ b/lib/modules/eval-docs.nix
@@ -7,7 +7,7 @@ let
   eval = lib.evalModules {
     class = "nixos";
     modules = [
-      (lib.modules.importApply ./interface.nix { inherit clanLib; })
+      (lib.modules.importApply ./clan/interface.nix { inherit clanLib; })
     ];
   };
   evalDocs = pkgs.nixosOptionsDoc {
diff --git a/lib/modules/function-adapter.nix b/lib/modules/function-adapter.nix
index cb5add50e..9828e5d9c 100644
--- a/lib/modules/function-adapter.nix
+++ b/lib/modules/function-adapter.nix
@@ -18,7 +18,7 @@ module:
       ;
   };
   modules = [
-    (lib.modules.importApply ./interface.nix { inherit (clan-core) clanLib; })
+    (lib.modules.importApply ./clan/interface.nix { inherit (clan-core) clanLib; })
     module
     {
       inherit specialArgs;
diff --git a/lib/modules/tests.nix b/lib/modules/tests.nix
index 211837263..77d17aeea 100644
--- a/lib/modules/tests.nix
+++ b/lib/modules/tests.nix
@@ -23,7 +23,7 @@ in
     let
       config = buildClan {
         meta.name = "test";
-        imports = [ ./module.nix ];
+        imports = [ ./clan/module.nix ];
       };
     in
     {
@@ -42,7 +42,7 @@ in
           outPath = ./.;
         };
         meta.name = "test";
-        imports = [ ./module.nix ];
+        imports = [ ./clan/module.nix ];
       };
     in
     {
@@ -82,7 +82,7 @@ in
             inventory.meta.name = "test";
           }
 
-          ./module.nix
+          ./clan/module.nix
           # Explicit output, usually defined by flake-parts
           { options.nixosConfigurations = lib.mkOption { type = lib.types.raw; }; }
         ];