diff --git a/Crafter.Build-Configuration.cpp b/Crafter.Build-Configuration.cpp
index 034676d..2e55a1c 100644
--- a/Crafter.Build-Configuration.cpp
+++ b/Crafter.Build-Configuration.cpp
@@ -19,19 +19,10 @@ USA
 */
 
 module;
-#include <vector>
-#include <string>
-#include <fstream>
 #include "json.hpp"
-#include <filesystem>
-#include <iostream>
-#include <chrono>
-module Crafter.Build:ConfigurationImpl;
-import :Configuration;
-import :Dependency;
+module Crafter.Build;
 using namespace Crafter::Build;
 namespace fs = std::filesystem;
-using namespace std::chrono;
 
 Configuration::Configuration(std::string name, std::string standard, std::vector<fs::path> sourceFiles, std::vector<fs::path> moduleFiles, std::string optimizationLevel, std::string buildDir, std::string outputDir, std::string type, std::string target, std::vector<Dependency> dependencies): name(name), standard(standard), sourceFiles(sourceFiles), moduleFiles(moduleFiles), optimizationLevel(optimizationLevel), buildDir(buildDir), outputDir(outputDir), type(type), target(target), dependencies(dependencies) {
 
@@ -122,4 +113,3 @@ Configuration::Configuration(nlohmann::json& configs, nlohmann::json& config, fs
         }
     }
 }
-
diff --git a/Crafter.Build-Configuration.cppm b/Crafter.Build-Configuration.cppm
index 012cfbf..1c921c4 100644
--- a/Crafter.Build-Configuration.cppm
+++ b/Crafter.Build-Configuration.cppm
@@ -20,7 +20,6 @@ USA
 
 module;
 #include <string>
-#include <cstdint>
 #include <vector>
 #include "json.hpp"
 #include <unordered_map>
diff --git a/Crafter.Build-Dependency.cpp b/Crafter.Build-Dependency.cpp
index 2dd0766..8bf0202 100644
--- a/Crafter.Build-Dependency.cpp
+++ b/Crafter.Build-Dependency.cpp
@@ -20,8 +20,7 @@ USA
 
 module;
 #include <string>
-module Crafter.Build:DependencyImpl;
-import :Dependency;
+module Crafter.Build;
 using namespace Crafter::Build;
 
 Dependency::Dependency(std::string path, std::string configuration): path(path), configuration(configuration) {
diff --git a/Crafter.Build-Project.cpp b/Crafter.Build-Project.cpp
index 885de40..e3737fd 100644
--- a/Crafter.Build-Project.cpp
+++ b/Crafter.Build-Project.cpp
@@ -26,11 +26,7 @@ module;
 #include "json.hpp"
 #include <filesystem>
 #include <thread>
-#include <stdlib.h>
-module Crafter.Build:ProjectImpl;
-import :Project;
-import :Configuration;
-import :Dependency;
+module Crafter.Build;
 using namespace Crafter::Build;
 namespace fs = std::filesystem;
 
diff --git a/main.cpp b/main.cpp
index 9eb633a..a614e23 100644
--- a/main.cpp
+++ b/main.cpp
@@ -19,12 +19,8 @@ USA
 */
 
 #include <cstdint>
-#include <iostream>
-#include <fstream>
 #include <print>
 #include "json.hpp"
-#include <linux/limits.h>
-#include <unistd.h>
 import Crafter.Build;
 using namespace Crafter::Build;
 namespace fs = std::filesystem;