diff --git a/flake/default.nix b/flake/default.nix
index 87a1ed8..359dab8 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -6,14 +6,15 @@
 let
   # TODO: refactor the registry code
   registryAssembly = import ./registry.nix { inherit lib self; };
-  # TODO: remove this after the refactor of this file is done and clean
+
   util = import ../lib { inherit lib; };
-  mkModules = import ./modules.nix { inherit util; };
+  mkModules = import ./module.nix { inherit util; };
 
   modules = mkModules {
     root = self + "/modules";
   };
-  repositoryModules = modules;
+
+  #----------------------------------------------------------
   guestFiles = util.collectNixFiles (self + "/guests");
 
   collectedRegistry = registryAssembly.collect { hosts = self.nixosConfigurations; };
@@ -34,28 +35,28 @@ let
     inherit util;
   };
 
-  guests = import ./guests.nix {
+  guests = import ./guest.nix {
     inherit
       inputs
       lib
       self
       specialArgs
-      repositoryModules
       registryAssembly
       util
       ;
+    repositoryModules = modules;
   };
 
-  hosts = import ./hosts.nix {
+  hosts = import ./host.nix {
     inherit
       inputs
       lib
       self
       specialArgs
-      repositoryModules
       guestFiles
       registryAssembly
       ;
+    repositoryModules = modules;
   };
 in
 flake
diff --git a/flake/guests.nix b/flake/guest.nix
similarity index 100%
rename from flake/guests.nix
rename to flake/guest.nix
diff --git a/flake/hosts.nix b/flake/host.nix
similarity index 100%
rename from flake/hosts.nix
rename to flake/host.nix
diff --git a/flake/modules.nix b/flake/module.nix
similarity index 100%
rename from flake/modules.nix
rename to flake/module.nix