diff --git a/TODO b/TODO
new file mode 100644
index 0000000..017ec7f
--- /dev/null
+++ b/TODO
@@ -0,0 +1,3 @@
+- texture mapping
+- depth sampling
+- replace Graphics module in 'Modules' project
\ No newline at end of file
diff --git a/extern/Modules b/extern/Modules
index 7622683..068348b 160000
--- a/extern/Modules
+++ b/extern/Modules
@@ -1 +1 @@
-Subproject commit 762268387e6e5da36dc23e23c1cd46cef184941a
+Subproject commit 068348b3e3e56efb13c94a2e2d09239ec8a3b63c
diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt
index f0aca42..92412c1 100644
--- a/src/App/CMakeLists.txt
+++ b/src/App/CMakeLists.txt
@@ -2,17 +2,9 @@ cmake_minimum_required(VERSION 3.30)
 
 project(App)
 
-add_executable(${PROJECT_NAME}
-        private/main.cpp
-        private/shader.cpp
-        private/swapchain.cpp
-        private/renderer.cpp
-        private/vulkan_utils.cpp
-        private/app_interactive.cpp
-        private/app_offscreen.cpp
-)
-
+file(GLOB SOURCES "./private/*.cpp")
+add_executable(${PROJECT_NAME} ${SOURCES})
 target_include_directories(${PROJECT_NAME} PUBLIC public)
 target_link_libraries(${PROJECT_NAME} PUBLIC Common GPU PlatformWindow)
 
-file(COPY private/shaders DESTINATION ${PROJECT_BINARY_DIR}/)
\ No newline at end of file
+file(COPY shaders DESTINATION ${PROJECT_BINARY_DIR}/)
\ No newline at end of file
diff --git a/src/App/private/shaders/compile.sh b/src/App/shaders/compile.sh
similarity index 100%
rename from src/App/private/shaders/compile.sh
rename to src/App/shaders/compile.sh
diff --git a/src/App/private/shaders/shader.frag b/src/App/shaders/shader.frag
similarity index 100%
rename from src/App/private/shaders/shader.frag
rename to src/App/shaders/shader.frag
diff --git a/src/App/private/shaders/shader.vert b/src/App/shaders/shader.vert
similarity index 100%
rename from src/App/private/shaders/shader.vert
rename to src/App/shaders/shader.vert
diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt
index 03cebf5..70e2ae4 100644
--- a/src/Common/CMakeLists.txt
+++ b/src/Common/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.30)
 
 project(Common)
 
-add_library(${PROJECT_NAME} utils.cpp)
-target_include_directories(${PROJECT_NAME} PUBLIC .)
+file(GLOB SOURCES "./private/*.cpp")
+add_library(${PROJECT_NAME} ${SOURCES})
+target_include_directories(${PROJECT_NAME} PUBLIC public)
 target_link_libraries(${PROJECT_NAME} PUBLIC Containers Math)
diff --git a/src/Common/stb_image.h b/src/Common/private/stb_image.h
similarity index 100%
rename from src/Common/stb_image.h
rename to src/Common/private/stb_image.h
diff --git a/src/Common/stb_image_write.h b/src/Common/private/stb_image_write.h
similarity index 100%
rename from src/Common/stb_image_write.h
rename to src/Common/private/stb_image_write.h
diff --git a/src/Common/utils.cpp b/src/Common/private/utils.cpp
similarity index 100%
rename from src/Common/utils.cpp
rename to src/Common/private/utils.cpp
diff --git a/src/App/public/common.hpp b/src/Common/public/common.hpp
similarity index 100%
rename from src/App/public/common.hpp
rename to src/Common/public/common.hpp
diff --git a/src/Common/utils.hpp b/src/Common/public/utils.hpp
similarity index 100%
rename from src/Common/utils.hpp
rename to src/Common/public/utils.hpp
diff --git a/src/GPU/CMakeLists.txt b/src/GPU/CMakeLists.txt
index 45c72e6..40d6b6e 100644
--- a/src/GPU/CMakeLists.txt
+++ b/src/GPU/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.30)
 
 project(GPU)
 
-add_library(${PROJECT_NAME} private/GPU.cpp)
+file(GLOB SOURCES "./private/*.cpp")
+add_library(${PROJECT_NAME} ${SOURCES})
 target_include_directories(${PROJECT_NAME} PUBLIC public)
 target_link_libraries(${PROJECT_NAME} PUBLIC vulkan Common)
\ No newline at end of file
diff --git a/src/App/private/swapchain.cpp b/src/GPU/private/swapchain.cpp
similarity index 100%
rename from src/App/private/swapchain.cpp
rename to src/GPU/private/swapchain.cpp
diff --git a/src/App/private/vulkan_utils.cpp b/src/GPU/private/vulkan_utils.cpp
similarity index 100%
rename from src/App/private/vulkan_utils.cpp
rename to src/GPU/private/vulkan_utils.cpp
diff --git a/src/App/public/swapchain.hpp b/src/GPU/public/swapchain.hpp
similarity index 100%
rename from src/App/public/swapchain.hpp
rename to src/GPU/public/swapchain.hpp
diff --git a/src/App/public/vulkan_utils.hpp b/src/GPU/public/vulkan_utils.hpp
similarity index 100%
rename from src/App/public/vulkan_utils.hpp
rename to src/GPU/public/vulkan_utils.hpp
diff --git a/src/PlatformWindow/CMakeLists.txt b/src/PlatformWindow/CMakeLists.txt
index bf50477..bb1513d 100644
--- a/src/PlatformWindow/CMakeLists.txt
+++ b/src/PlatformWindow/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.30)
 
 project(PlatformWindow)
 
-add_library(${PROJECT_NAME} private/PlatformWindow.cpp)
+file(GLOB SOURCES "./private/*.cpp")
+add_library(${PROJECT_NAME} ${SOURCES})
 target_include_directories(${PROJECT_NAME} PUBLIC public)
 target_link_libraries(${PROJECT_NAME} PUBLIC glfw GPU)
\ No newline at end of file