diff --git a/flakeModules/clan.nix b/flakeModules/clan.nix
index 95892d721..04cb8cfcc 100644
--- a/flakeModules/clan.nix
+++ b/flakeModules/clan.nix
@@ -11,7 +11,7 @@ let
 
   buildClanModule = clan-core.clanLib.buildClanModule;
 
-  publicAttrs = import ../lib/build-clan/public.nix;
+  publicAttrs = import ../lib/modules/public.nix;
   # Create output options only for listed attributes
   # TODO: Refactor this into an explicit module, so we can have description and other attributes to be listed in flake-parts
   outputModule = {
diff --git a/lib/default.nix b/lib/default.nix
index 34e5012d3..b5cdd5eaa 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -39,7 +39,7 @@ lib.fix (clanLib: {
   # ------------------------------------
   # ClanLib functions
   evalClan = clanLib.callLib ./inventory/eval-clan-modules { };
-  buildClanModule = clanLib.callLib ./build-clan { };
+  buildClanModule = clanLib.callLib ./modules { };
   inventory = clanLib.callLib ./inventory { };
   modules = clanLib.callLib ./inventory/frontmatter { };
   test = clanLib.callLib ./test { };
diff --git a/lib/flake-module.nix b/lib/flake-module.nix
index b34c8fc12..ed5a2f21f 100644
--- a/lib/flake-module.nix
+++ b/lib/flake-module.nix
@@ -7,7 +7,7 @@
 rec {
   # TODO: automatically generate this from the directory conventions
   imports = [
-    ./build-clan/flake-module.nix
+    ./modules/flake-module.nix
     ./clanTest/flake-module.nix
     ./introspection/flake-module.nix
     ./inventory/flake-module.nix
diff --git a/lib/build-clan/computed-tags.nix b/lib/modules/computed-tags.nix
similarity index 100%
rename from lib/build-clan/computed-tags.nix
rename to lib/modules/computed-tags.nix
diff --git a/lib/build-clan/default.nix b/lib/modules/default.nix
similarity index 100%
rename from lib/build-clan/default.nix
rename to lib/modules/default.nix
diff --git a/lib/build-clan/eval-docs.nix b/lib/modules/eval-docs.nix
similarity index 100%
rename from lib/build-clan/eval-docs.nix
rename to lib/modules/eval-docs.nix
diff --git a/lib/build-clan/flake-module.nix b/lib/modules/flake-module.nix
similarity index 100%
rename from lib/build-clan/flake-module.nix
rename to lib/modules/flake-module.nix
diff --git a/lib/build-clan/function-adapter.nix b/lib/modules/function-adapter.nix
similarity index 100%
rename from lib/build-clan/function-adapter.nix
rename to lib/modules/function-adapter.nix
diff --git a/lib/build-clan/interface.nix b/lib/modules/interface.nix
similarity index 100%
rename from lib/build-clan/interface.nix
rename to lib/modules/interface.nix
diff --git a/lib/build-clan/machineModules/forName.nix b/lib/modules/machineModules/forName.nix
similarity index 100%
rename from lib/build-clan/machineModules/forName.nix
rename to lib/modules/machineModules/forName.nix
diff --git a/lib/build-clan/machineModules/overridePkgs.nix b/lib/modules/machineModules/overridePkgs.nix
similarity index 100%
rename from lib/build-clan/machineModules/overridePkgs.nix
rename to lib/modules/machineModules/overridePkgs.nix
diff --git a/lib/build-clan/module.nix b/lib/modules/module.nix
similarity index 100%
rename from lib/build-clan/module.nix
rename to lib/modules/module.nix
diff --git a/lib/build-clan/public.nix b/lib/modules/public.nix
similarity index 100%
rename from lib/build-clan/public.nix
rename to lib/modules/public.nix
diff --git a/lib/build-clan/secrets/interface.nix b/lib/modules/secrets/interface.nix
similarity index 100%
rename from lib/build-clan/secrets/interface.nix
rename to lib/modules/secrets/interface.nix
diff --git a/lib/build-clan/templates/interface.nix b/lib/modules/templates/interface.nix
similarity index 100%
rename from lib/build-clan/templates/interface.nix
rename to lib/modules/templates/interface.nix
diff --git a/lib/build-clan/tests.nix b/lib/modules/tests.nix
similarity index 100%
rename from lib/build-clan/tests.nix
rename to lib/modules/tests.nix
diff --git a/pkgs/clan-app/clan-app.code-workspace b/pkgs/clan-app/clan-app.code-workspace
index d2696c0e6..96aacafba 100644
--- a/pkgs/clan-app/clan-app.code-workspace
+++ b/pkgs/clan-app/clan-app.code-workspace
@@ -13,7 +13,7 @@
 			"path": "../../nixosModules"
 		},
 		{
-			"path": "../../lib/build-clan"
+			"path": "../../lib/modules"
 		},
 		{
 			"path": "./ui"
@@ -50,4 +50,4 @@
 		},
 		"files.autoSave": "off"
 	}
-}
+}
\ No newline at end of file
diff --git a/pkgs/clan-vm-manager/clan-vm-manager.code-workspace b/pkgs/clan-vm-manager/clan-vm-manager.code-workspace
index 2bd645fa0..8187d3df8 100644
--- a/pkgs/clan-vm-manager/clan-vm-manager.code-workspace
+++ b/pkgs/clan-vm-manager/clan-vm-manager.code-workspace
@@ -13,7 +13,7 @@
 			"path": "../../nixosModules"
 		},
 		{
-			"path": "../../lib/build-clan"
+			"path": "../../lib/modules"
 		},
 		{
 			"path": "../../../democlan"
@@ -43,4 +43,4 @@
 		},
 		"files.autoSave": "off"
 	}
-}
+}
\ No newline at end of file