diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ae00fe..f114b12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 17)
 find_package(OpenGL REQUIRED)
 find_package(glfw3 REQUIRED)
 
-add_executable(ecsgame glad.c OBJ_Loader.h Shader.cpp Shader.h main.cpp)
+add_executable(ecsgame Util/glad.c Util/OBJ_Loader.h Rendering/Shader.cpp Rendering/Shader.h main.cpp)
 
 include_directories(${OPENGL_INCLUDE_DIRS})
 
diff --git a/ECS.h b/ECS/ECS.h
similarity index 100%
rename from ECS.h
rename to ECS/ECS.h
diff --git a/Shader.cpp b/Rendering/Shader.cpp
similarity index 100%
rename from Shader.cpp
rename to Rendering/Shader.cpp
diff --git a/Shader.h b/Rendering/Shader.h
similarity index 100%
rename from Shader.h
rename to Rendering/Shader.h
diff --git a/OBJ_Loader.h b/Util/OBJ_Loader.h
similarity index 100%
rename from OBJ_Loader.h
rename to Util/OBJ_Loader.h
diff --git a/glad.c b/Util/glad.c
similarity index 100%
rename from glad.c
rename to Util/glad.c
diff --git a/main.cpp b/main.cpp
index 8792ed4..a4389f0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,8 +3,8 @@
 
 #include <iostream>
 
-#include "Shader.h"
-#include "ECS.h"
+#include "Rendering/Shader.h"
+#include "ECS/ECS.h"
 
 using namespace ECS;