diff --git a/flake/default.nix b/flake/default.nix
index 57839bc..ccfd0a7 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -4,12 +4,12 @@
   self,
 }:
 let
+  # TODO: refactor the registry code
   registryAssembly = import ./registry.nix { inherit lib self; };
-  modules = import ./modules.nix { inherit lib; };
   flakeLib = import ../lib { inherit lib; };
 
-  moduleFiles = modules.mkModules (self + "/modules");
-  guestFiles = modules.mkModules (self + "/guests");
+  moduleFiles = flakeLib.collectNixFiles (self + "/modules");
+  guestFiles = flakeLib.collectNixFiles (self + "/guests");
 
   collectedRegistry = registryAssembly.collect { hosts = self.nixosConfigurations; };
 
diff --git a/lib/default.nix b/lib/default.nix
index 9c5aebb..9c535ce 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,7 +1,9 @@
 { lib }:
 let
+  files = import ./files.nix { inherit lib; };
   network = import ./network.nix { inherit lib; };
 in
 {
+  inherit (files) collectNixFiles;
   inherit (network) bridgeName deriveMac;
 }
diff --git a/flake/modules.nix b/lib/files.nix
similarity index 92%
rename from flake/modules.nix
rename to lib/files.nix
index 88bd71a..daecfdd 100644
--- a/flake/modules.nix
+++ b/lib/files.nix
@@ -18,5 +18,5 @@ let
     );
 in
 {
-  mkModules = collectNixFiles;
+  inherit collectNixFiles;
 }