diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4001897..46552d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ project(Types)
 
 add_compile_definitions(MEM_DEBUG)
 
-add_subdirectory(Module)
+add_subdirectory(Modules)
 add_subdirectory(Utils)
 add_subdirectory(Containers)
 #add_subdirectory(Allocators)
\ No newline at end of file
diff --git a/Containers/CMakeLists.txt b/Containers/CMakeLists.txt
index 15823e9..f63ea2f 100644
--- a/Containers/CMakeLists.txt
+++ b/Containers/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB SOURCES "./private/*.cpp")
 file(GLOB HEADERS "./public/*.hpp")
 add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
 target_include_directories(${PROJECT_NAME} PUBLIC ./public/)
-target_link_libraries(${PROJECT_NAME} PUBLIC BaseModule)
+target_link_libraries(${PROJECT_NAME} PUBLIC Modules)
 
 ### -------------------------- Tests  --------------------------  ###
 enable_testing()
diff --git a/Module/CMakeLists.txt b/Modules/CMakeLists.txt
similarity index 97%
rename from Module/CMakeLists.txt
rename to Modules/CMakeLists.txt
index 7c4e3d0..c3c6221 100644
--- a/Module/CMakeLists.txt
+++ b/Modules/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.2)
 
 set(CMAKE_CXX_STANDARD 23)
 
-project(BaseModule)
+project(Modules)
 
 ### ---------------------- Static Library  ---------------------  ###
 file(GLOB SOURCES "./private/*.cpp")
diff --git a/Module/README.md b/Modules/README.md
similarity index 100%
rename from Module/README.md
rename to Modules/README.md
diff --git a/Module/private/Assert.cpp b/Modules/private/Assert.cpp
similarity index 100%
rename from Module/private/Assert.cpp
rename to Modules/private/Assert.cpp
diff --git a/Module/private/Common.cpp b/Modules/private/Common.cpp
similarity index 100%
rename from Module/private/Common.cpp
rename to Modules/private/Common.cpp
diff --git a/Module/private/Environment.cpp b/Modules/private/Environment.cpp
similarity index 100%
rename from Module/private/Environment.cpp
rename to Modules/private/Environment.cpp
diff --git a/Module/private/Module.cpp b/Modules/private/Module.cpp
similarity index 100%
rename from Module/private/Module.cpp
rename to Modules/private/Module.cpp
diff --git a/Module/public/Assert.hpp b/Modules/public/Assert.hpp
similarity index 100%
rename from Module/public/Assert.hpp
rename to Modules/public/Assert.hpp
diff --git a/Module/public/Common.hpp b/Modules/public/Common.hpp
similarity index 100%
rename from Module/public/Common.hpp
rename to Modules/public/Common.hpp
diff --git a/Module/public/Environment.hpp b/Modules/public/Environment.hpp
similarity index 100%
rename from Module/public/Environment.hpp
rename to Modules/public/Environment.hpp
diff --git a/Module/public/Module.hpp b/Modules/public/Module.hpp
similarity index 92%
rename from Module/public/Module.hpp
rename to Modules/public/Module.hpp
index 31ba4c5..19ae60b 100644
--- a/Module/public/Module.hpp
+++ b/Modules/public/Module.hpp
@@ -4,7 +4,7 @@
 #include "Common.hpp"
 #include "Assert.hpp"
 
-#define MODULE_SANITY_CHECK(name) ASSERT(name.isInitialized() && "Module Is Not Initialized" && #name)
+#define MODULE_SANITY_CHECK(name) ASSERT(name.isInitialized() && "Modules Is Not Initialized" && #name)
 
 namespace tp {
 
diff --git a/Module/public/TypeInfo.hpp b/Modules/public/TypeInfo.hpp
similarity index 100%
rename from Module/public/TypeInfo.hpp
rename to Modules/public/TypeInfo.hpp
diff --git a/Module/tests/Tests.cpp b/Modules/tests/Tests.cpp
similarity index 100%
rename from Module/tests/Tests.cpp
rename to Modules/tests/Tests.cpp