diff --git a/modules/app/src/application.cpp b/modules/app/private/application.cpp
similarity index 98%
rename from modules/app/src/application.cpp
rename to modules/app/private/application.cpp
index 1138743..f526f83 100644
--- a/modules/app/src/application.cpp
+++ b/modules/app/private/application.cpp
@@ -2,18 +2,18 @@
 #include <app/layer.hpp>
 #include <app/layer_stack.hpp>
 #include <asset_manager/asset_manager.hpp>
-#include <debug/assertions.hpp>
 #include <input/events/event.hpp>
 #include <input/events/keyboard.hpp>
 #include <input/events/window.hpp>
 #include <input/input.hpp>
+#include <lt_debug/assertions.hpp>
 #include <ranges>
 #include <renderer/blender.hpp>
 #include <renderer/graphics_context.hpp>
 #include <renderer/render_command.hpp>
 #include <renderer/renderer.hpp>
 #include <ui/ui.hpp>
-#include <window/linux/window.hpp>
+#include <window/window.hpp>
 
 namespace lt {
 
diff --git a/modules/app/src/layer.cpp b/modules/app/private/layer.cpp
similarity index 100%
rename from modules/app/src/layer.cpp
rename to modules/app/private/layer.cpp
diff --git a/modules/app/src/layer_stack.cpp b/modules/app/private/layer_stack.cpp
similarity index 100%
rename from modules/app/src/layer_stack.cpp
rename to modules/app/private/layer_stack.cpp
diff --git a/modules/app/include/app/application.hpp b/modules/app/public/application.hpp
similarity index 100%
rename from modules/app/include/app/application.hpp
rename to modules/app/public/application.hpp
diff --git a/modules/app/include/app/entrypoint.hpp b/modules/app/public/entrypoint.hpp
similarity index 100%
rename from modules/app/include/app/entrypoint.hpp
rename to modules/app/public/entrypoint.hpp
diff --git a/modules/app/include/app/layer.hpp b/modules/app/public/layer.hpp
similarity index 100%
rename from modules/app/include/app/layer.hpp
rename to modules/app/public/layer.hpp
diff --git a/modules/app/include/app/layer_stack.hpp b/modules/app/public/layer_stack.hpp
similarity index 100%
rename from modules/app/include/app/layer_stack.hpp
rename to modules/app/public/layer_stack.hpp
diff --git a/modules/asset_baker/CMakeLists.txt b/modules/asset_baker/CMakeLists.txt
index 4115268..eca7ceb 100644
--- a/modules/asset_baker/CMakeLists.txt
+++ b/modules/asset_baker/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_executable_module(
-    asset_baker baker.cpp
+    asset_baker entrypoint/baker.cpp
 )
 
 target_link_libraries(
diff --git a/modules/asset_baker/src/baker.cpp b/modules/asset_baker/private/entrypoint/baker.cpp
similarity index 100%
rename from modules/asset_baker/src/baker.cpp
rename to modules/asset_baker/private/entrypoint/baker.cpp
diff --git a/modules/asset_baker/include/asset_baker/bakers.hpp b/modules/asset_baker/public/bakers.hpp
similarity index 100%
rename from modules/asset_baker/include/asset_baker/bakers.hpp
rename to modules/asset_baker/public/bakers.hpp
diff --git a/modules/asset_manager/src/asset_manager.cpp b/modules/asset_manager/private/asset_manager.cpp
similarity index 100%
rename from modules/asset_manager/src/asset_manager.cpp
rename to modules/asset_manager/private/asset_manager.cpp
diff --git a/modules/asset_manager/include/asset_manager/asset_manager.hpp b/modules/asset_manager/public/asset_manager.hpp
similarity index 100%
rename from modules/asset_manager/include/asset_manager/asset_manager.hpp
rename to modules/asset_manager/public/asset_manager.hpp
diff --git a/modules/asset_parser/src/assets/text.cpp b/modules/asset_parser/private/assets/text.cpp
similarity index 100%
rename from modules/asset_parser/src/assets/text.cpp
rename to modules/asset_parser/private/assets/text.cpp
diff --git a/modules/asset_parser/src/assets/texture.cpp b/modules/asset_parser/private/assets/texture.cpp
similarity index 100%
rename from modules/asset_parser/src/assets/texture.cpp
rename to modules/asset_parser/private/assets/texture.cpp
diff --git a/modules/asset_parser/src/parser.cpp b/modules/asset_parser/private/parser.cpp
similarity index 100%
rename from modules/asset_parser/src/parser.cpp
rename to modules/asset_parser/private/parser.cpp
diff --git a/modules/asset_parser/include/asset_parser/assets/text.hpp b/modules/asset_parser/public/assets/text.hpp
similarity index 95%
rename from modules/asset_parser/include/asset_parser/assets/text.hpp
rename to modules/asset_parser/public/assets/text.hpp
index f9fd472..768e3a1 100644
--- a/modules/asset_parser/include/asset_parser/assets/text.hpp
+++ b/modules/asset_parser/public/assets/text.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <asset_parser/compressors/compressors.hpp>
 #include <asset_parser/parser.hpp>
-#include <compressors/compressors.hpp>
 #include <cstdint>
 #include <filesystem>
 #include <fstream>
diff --git a/modules/asset_parser/include/asset_parser/assets/texture.hpp b/modules/asset_parser/public/assets/texture.hpp
similarity index 95%
rename from modules/asset_parser/include/asset_parser/assets/texture.hpp
rename to modules/asset_parser/public/assets/texture.hpp
index 04bd18c..09bcda7 100644
--- a/modules/asset_parser/include/asset_parser/assets/texture.hpp
+++ b/modules/asset_parser/public/assets/texture.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <asset_parser/compressors/compressors.hpp>
 #include <asset_parser/parser.hpp>
-#include <compressors/compressors.hpp>
 #include <cstdint>
 #include <filesystem>
 #include <fstream>
diff --git a/modules/asset_parser/include/compressors/compressors.hpp b/modules/asset_parser/public/compressors/compressors.hpp
similarity index 100%
rename from modules/asset_parser/include/compressors/compressors.hpp
rename to modules/asset_parser/public/compressors/compressors.hpp
diff --git a/modules/asset_parser/include/asset_parser/parser.hpp b/modules/asset_parser/public/parser.hpp
similarity index 94%
rename from modules/asset_parser/include/asset_parser/parser.hpp
rename to modules/asset_parser/public/parser.hpp
index 1dfc1e8..43c6832 100644
--- a/modules/asset_parser/include/asset_parser/parser.hpp
+++ b/modules/asset_parser/public/parser.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <compressors/compressors.hpp>
+#include <asset_parser/compressors/compressors.hpp>
 #include <cstdint>
 #include <filesystem>
 #include <fstream>
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index b520576..5d975bb 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -1,3 +1,2 @@
 add_library_module(base)
-
-target_precompile_headers(base INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/pch.hpp)
+target_precompile_headers(base INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/private/pch.hpp)
diff --git a/modules/base/src/pch.hpp b/modules/base/private/pch.hpp
similarity index 100%
rename from modules/base/src/pch.hpp
rename to modules/base/private/pch.hpp
diff --git a/modules/base/include/base/base.hpp b/modules/base/public/base.hpp
similarity index 100%
rename from modules/base/include/base/base.hpp
rename to modules/base/public/base.hpp
diff --git a/modules/camera/src/camera.cpp b/modules/camera/private/camera.cpp
similarity index 100%
rename from modules/camera/src/camera.cpp
rename to modules/camera/private/camera.cpp
diff --git a/modules/camera/src/scene.cpp b/modules/camera/private/scene.cpp
similarity index 100%
rename from modules/camera/src/scene.cpp
rename to modules/camera/private/scene.cpp
diff --git a/modules/camera/include/camera/camera.hpp b/modules/camera/public/camera.hpp
similarity index 100%
rename from modules/camera/include/camera/camera.hpp
rename to modules/camera/public/camera.hpp
diff --git a/modules/camera/include/camera/component.hpp b/modules/camera/public/component.hpp
similarity index 100%
rename from modules/camera/include/camera/component.hpp
rename to modules/camera/public/component.hpp
diff --git a/modules/camera/include/camera/scene.hpp b/modules/camera/public/scene.hpp
similarity index 100%
rename from modules/camera/include/camera/scene.hpp
rename to modules/camera/public/scene.hpp
diff --git a/modules/debug/CMakeLists.txt b/modules/debug/CMakeLists.txt
index 24c3e15..5d56470 100644
--- a/modules/debug/CMakeLists.txt
+++ b/modules/debug/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_library_module(lt_debug instrumentor.cpp)
 target_link_libraries(lt_debug PUBLIC logger)
-target_precompile_headers(lt_debug PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/pch.hpp)
+target_precompile_headers(lt_debug PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/private/pch.hpp)
diff --git a/modules/debug/src/instrumentor.cpp b/modules/debug/private/instrumentor.cpp
similarity index 98%
rename from modules/debug/src/instrumentor.cpp
rename to modules/debug/private/instrumentor.cpp
index 4cc3c7b..adfb1c3 100644
--- a/modules/debug/src/instrumentor.cpp
+++ b/modules/debug/private/instrumentor.cpp
@@ -1,5 +1,5 @@
-#include <debug/instrumentor.hpp>
 #include <logger/logger.hpp>
+#include <lt_debug/instrumentor.hpp>
 
 namespace lt {
 
diff --git a/modules/debug/private/pch.hpp b/modules/debug/private/pch.hpp
new file mode 100644
index 0000000..68fff38
--- /dev/null
+++ b/modules/debug/private/pch.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <lt_debug/assertions.hpp>
diff --git a/modules/debug/include/debug/assertions.hpp b/modules/debug/public/assertions.hpp
similarity index 100%
rename from modules/debug/include/debug/assertions.hpp
rename to modules/debug/public/assertions.hpp
diff --git a/modules/debug/include/debug/instrumentor.hpp b/modules/debug/public/instrumentor.hpp
similarity index 100%
rename from modules/debug/include/debug/instrumentor.hpp
rename to modules/debug/public/instrumentor.hpp
diff --git a/modules/debug/src/pch.hpp b/modules/debug/src/pch.hpp
deleted file mode 100644
index 9fd8d34..0000000
--- a/modules/debug/src/pch.hpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include <debug/assertions.hpp>
diff --git a/modules/ecs/src/entity.cpp b/modules/ecs/private/entity.cpp
similarity index 100%
rename from modules/ecs/src/entity.cpp
rename to modules/ecs/private/entity.cpp
diff --git a/modules/ecs/src/scene.cpp b/modules/ecs/private/scene.cpp
similarity index 100%
rename from modules/ecs/src/scene.cpp
rename to modules/ecs/private/scene.cpp
diff --git a/modules/ecs/src/serializer.cpp b/modules/ecs/private/serializer.cpp
similarity index 100%
rename from modules/ecs/src/serializer.cpp
rename to modules/ecs/private/serializer.cpp
diff --git a/modules/ecs/src/uuid.cpp b/modules/ecs/private/uuid.cpp
similarity index 100%
rename from modules/ecs/src/uuid.cpp
rename to modules/ecs/private/uuid.cpp
diff --git a/modules/ecs/include/ecs/components.hpp b/modules/ecs/public/components.hpp
similarity index 100%
rename from modules/ecs/include/ecs/components.hpp
rename to modules/ecs/public/components.hpp
diff --git a/modules/ecs/include/ecs/components/native_script.hpp b/modules/ecs/public/components/native_script.hpp
similarity index 100%
rename from modules/ecs/include/ecs/components/native_script.hpp
rename to modules/ecs/public/components/native_script.hpp
diff --git a/modules/ecs/include/ecs/components/scriptable_entity.hpp b/modules/ecs/public/components/scriptable_entity.hpp
similarity index 100%
rename from modules/ecs/include/ecs/components/scriptable_entity.hpp
rename to modules/ecs/public/components/scriptable_entity.hpp
diff --git a/modules/ecs/include/ecs/components/sprite_renderer.hpp b/modules/ecs/public/components/sprite_renderer.hpp
similarity index 100%
rename from modules/ecs/include/ecs/components/sprite_renderer.hpp
rename to modules/ecs/public/components/sprite_renderer.hpp
diff --git a/modules/ecs/include/ecs/components/tag.hpp b/modules/ecs/public/components/tag.hpp
similarity index 100%
rename from modules/ecs/include/ecs/components/tag.hpp
rename to modules/ecs/public/components/tag.hpp
diff --git a/modules/ecs/include/ecs/components/transform.hpp b/modules/ecs/public/components/transform.hpp
similarity index 100%
rename from modules/ecs/include/ecs/components/transform.hpp
rename to modules/ecs/public/components/transform.hpp
diff --git a/modules/ecs/include/ecs/components/uuid.hpp b/modules/ecs/public/components/uuid.hpp
similarity index 100%
rename from modules/ecs/include/ecs/components/uuid.hpp
rename to modules/ecs/public/components/uuid.hpp
diff --git a/modules/ecs/include/ecs/entity.hpp b/modules/ecs/public/entity.hpp
similarity index 100%
rename from modules/ecs/include/ecs/entity.hpp
rename to modules/ecs/public/entity.hpp
diff --git a/modules/ecs/include/ecs/scene.hpp b/modules/ecs/public/scene.hpp
similarity index 100%
rename from modules/ecs/include/ecs/scene.hpp
rename to modules/ecs/public/scene.hpp
diff --git a/modules/ecs/include/ecs/serializer.hpp b/modules/ecs/public/serializer.hpp
similarity index 100%
rename from modules/ecs/include/ecs/serializer.hpp
rename to modules/ecs/public/serializer.hpp
diff --git a/modules/ecs/include/ecs/uuid.hpp b/modules/ecs/public/uuid.hpp
similarity index 100%
rename from modules/ecs/include/ecs/uuid.hpp
rename to modules/ecs/public/uuid.hpp
diff --git a/modules/input/src/input.cpp b/modules/input/private/input.cpp
similarity index 100%
rename from modules/input/src/input.cpp
rename to modules/input/private/input.cpp
diff --git a/modules/input/include/input/events/char.hpp b/modules/input/public/events/char.hpp
similarity index 100%
rename from modules/input/include/input/events/char.hpp
rename to modules/input/public/events/char.hpp
diff --git a/modules/input/include/input/events/event.hpp b/modules/input/public/events/event.hpp
similarity index 100%
rename from modules/input/include/input/events/event.hpp
rename to modules/input/public/events/event.hpp
diff --git a/modules/input/include/input/events/keyboard.hpp b/modules/input/public/events/keyboard.hpp
similarity index 100%
rename from modules/input/include/input/events/keyboard.hpp
rename to modules/input/public/events/keyboard.hpp
diff --git a/modules/input/include/input/events/mouse.hpp b/modules/input/public/events/mouse.hpp
similarity index 100%
rename from modules/input/include/input/events/mouse.hpp
rename to modules/input/public/events/mouse.hpp
diff --git a/modules/input/include/input/events/window.hpp b/modules/input/public/events/window.hpp
similarity index 100%
rename from modules/input/include/input/events/window.hpp
rename to modules/input/public/events/window.hpp
diff --git a/modules/input/include/input/input.hpp b/modules/input/public/input.hpp
similarity index 100%
rename from modules/input/include/input/input.hpp
rename to modules/input/public/input.hpp
diff --git a/modules/input/include/input/key_codes.hpp b/modules/input/public/key_codes.hpp
similarity index 100%
rename from modules/input/include/input/key_codes.hpp
rename to modules/input/public/key_codes.hpp
diff --git a/modules/input/include/input/mouse_codes.hpp b/modules/input/public/mouse_codes.hpp
similarity index 100%
rename from modules/input/include/input/mouse_codes.hpp
rename to modules/input/public/mouse_codes.hpp
diff --git a/modules/logger/src/logger.cpp b/modules/logger/private/logger.cpp
similarity index 100%
rename from modules/logger/src/logger.cpp
rename to modules/logger/private/logger.cpp
diff --git a/modules/logger/include/logger/logger.hpp b/modules/logger/public/logger.hpp
similarity index 100%
rename from modules/logger/include/logger/logger.hpp
rename to modules/logger/public/logger.hpp
diff --git a/modules/math/include/math/algebra.hpp b/modules/math/public/algebra.hpp
similarity index 100%
rename from modules/math/include/math/algebra.hpp
rename to modules/math/public/algebra.hpp
diff --git a/modules/math/include/math/mat4.hpp b/modules/math/public/mat4.hpp
similarity index 100%
rename from modules/math/include/math/mat4.hpp
rename to modules/math/public/mat4.hpp
diff --git a/modules/math/include/math/trig.hpp b/modules/math/public/trig.hpp
similarity index 100%
rename from modules/math/include/math/trig.hpp
rename to modules/math/public/trig.hpp
diff --git a/modules/math/include/math/vec2.hpp b/modules/math/public/vec2.hpp
similarity index 100%
rename from modules/math/include/math/vec2.hpp
rename to modules/math/public/vec2.hpp
diff --git a/modules/math/include/math/vec3.hpp b/modules/math/public/vec3.hpp
similarity index 100%
rename from modules/math/include/math/vec3.hpp
rename to modules/math/public/vec3.hpp
diff --git a/modules/math/include/math/vec4.hpp b/modules/math/public/vec4.hpp
similarity index 100%
rename from modules/math/include/math/vec4.hpp
rename to modules/math/public/vec4.hpp
diff --git a/modules/mirror/CMakeLists.txt b/modules/mirror/CMakeLists.txt
index efe5578..6612579 100644
--- a/modules/mirror/CMakeLists.txt
+++ b/modules/mirror/CMakeLists.txt
@@ -1,16 +1,24 @@
-add_executable_module(mirror 
-    editor_layer.cpp
-    mirror.cpp
-    panel/asset_browser.cpp
-    panel/properties.cpp
-    panel/scene_hierarchy.cpp
+add_library_module(libmirror 
+    layers/editor_layer.cpp
+    panels/asset_browser.cpp
+    panels/properties.cpp
+    panels/scene_hierarchy.cpp
 )
-
 target_link_libraries(
-  mirror
+  libmirror
   PUBLIC app
   PUBLIC opengl::opengl
   PUBLIC ui
   PUBLIC imgui
   PUBLIC input
 )
+
+add_test_module(libmirror 
+    layers/editor_layer.test.cpp
+    panels/asset_browser.test.cpp
+    panels/properties.test.cpp
+    panels/scene_hierarchy.test.cpp
+)
+
+add_executable_module(mirror entrypoint/mirror.cpp)
+target_link_libraries(mirror PRIVATE libmirror)
diff --git a/modules/mirror/src/mirror.cpp b/modules/mirror/private/entrypoint/mirror.cpp
similarity index 93%
rename from modules/mirror/src/mirror.cpp
rename to modules/mirror/private/entrypoint/mirror.cpp
index 2c23c1d..b442b17 100644
--- a/modules/mirror/src/mirror.cpp
+++ b/modules/mirror/private/entrypoint/mirror.cpp
@@ -2,7 +2,7 @@
 #include <app/entrypoint.hpp>
 #include <app/layer_stack.hpp>
 #include <math/vec2.hpp>
-#include <mirror/editor_layer.hpp>
+#include <mirror/layers/editor_layer.hpp>
 #include <window/window.hpp>
 
 namespace lt {
diff --git a/modules/mirror/src/editor_layer.cpp b/modules/mirror/private/layers/editor_layer.cpp
similarity index 98%
rename from modules/mirror/src/editor_layer.cpp
rename to modules/mirror/private/layers/editor_layer.cpp
index fc34262..e43fcdd 100644
--- a/modules/mirror/src/editor_layer.cpp
+++ b/modules/mirror/private/layers/editor_layer.cpp
@@ -7,7 +7,7 @@
 #include <input/input.hpp>
 #include <input/key_codes.hpp>
 #include <math/vec4.hpp>
-#include <mirror/editor_layer.hpp>
+#include <mirror/layers/editor_layer.hpp>
 #include <renderer/framebuffer.hpp>
 #include <renderer/graphics_context.hpp>
 #include <renderer/texture.hpp>
diff --git a/modules/test/src/test.cpp b/modules/mirror/private/layers/editor_layer.test.cpp
similarity index 100%
rename from modules/test/src/test.cpp
rename to modules/mirror/private/layers/editor_layer.test.cpp
diff --git a/modules/mirror/src/panel/asset_browser.cpp b/modules/mirror/private/panels/asset_browser.cpp
similarity index 99%
rename from modules/mirror/src/panel/asset_browser.cpp
rename to modules/mirror/private/panels/asset_browser.cpp
index 3e4b051..a59fc8b 100644
--- a/modules/mirror/src/panel/asset_browser.cpp
+++ b/modules/mirror/private/panels/asset_browser.cpp
@@ -2,7 +2,7 @@
 #include <ecs/scene.hpp>
 #include <ecs/serializer.hpp>
 #include <imgui.h>
-#include <mirror/panel/asset_browser.hpp>
+#include <mirror/panels/asset_browser.hpp>
 #include <renderer/texture.hpp>
 
 namespace lt {
diff --git a/modules/window/include/window/mac/window.hpp b/modules/mirror/private/panels/asset_browser.test.cpp
similarity index 100%
rename from modules/window/include/window/mac/window.hpp
rename to modules/mirror/private/panels/asset_browser.test.cpp
diff --git a/modules/mirror/src/panel/properties.cpp b/modules/mirror/private/panels/properties.cpp
similarity index 99%
rename from modules/mirror/src/panel/properties.cpp
rename to modules/mirror/private/panels/properties.cpp
index 782ba04..9e29837 100644
--- a/modules/mirror/src/panel/properties.cpp
+++ b/modules/mirror/private/panels/properties.cpp
@@ -4,7 +4,7 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <math/trig.hpp>
-#include <mirror/panel/properties.hpp>
+#include <mirror/panels/properties.hpp>
 
 namespace lt {
 
diff --git a/modules/window/src/mac/window.cpp b/modules/mirror/private/panels/properties.test.cpp
similarity index 100%
rename from modules/window/src/mac/window.cpp
rename to modules/mirror/private/panels/properties.test.cpp
diff --git a/modules/mirror/src/panel/scene_hierarchy.cpp b/modules/mirror/private/panels/scene_hierarchy.cpp
similarity index 95%
rename from modules/mirror/src/panel/scene_hierarchy.cpp
rename to modules/mirror/private/panels/scene_hierarchy.cpp
index c83961b..b6a850e 100644
--- a/modules/mirror/src/panel/scene_hierarchy.cpp
+++ b/modules/mirror/private/panels/scene_hierarchy.cpp
@@ -1,8 +1,8 @@
 #include <ecs/components.hpp>
 #include <entt/entt.hpp>
 #include <imgui.h>
-#include <mirror/panel/properties.hpp>
-#include <mirror/panel/scene_hierarchy.hpp>
+#include <mirror/panels/properties.hpp>
+#include <mirror/panels/scene_hierarchy.hpp>
 
 namespace lt {
 
diff --git a/modules/mirror/private/panels/scene_hierarchy.test.cpp b/modules/mirror/private/panels/scene_hierarchy.test.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/modules/mirror/include/mirror/editor_layer.hpp b/modules/mirror/public/layers/editor_layer.hpp
similarity index 88%
rename from modules/mirror/include/mirror/editor_layer.hpp
rename to modules/mirror/public/layers/editor_layer.hpp
index 9d8bda9..512ea41 100644
--- a/modules/mirror/include/mirror/editor_layer.hpp
+++ b/modules/mirror/public/layers/editor_layer.hpp
@@ -3,9 +3,9 @@
 #include <app/layer.hpp>
 #include <imgui.h>
 #include <math/vec2.hpp>
-#include <mirror/panel/asset_browser.hpp>
-#include <mirror/panel/properties.hpp>
-#include <mirror/panel/scene_hierarchy.hpp>
+#include <mirror/panels/asset_browser.hpp>
+#include <mirror/panels/properties.hpp>
+#include <mirror/panels/scene_hierarchy.hpp>
 #include <renderer/texture.hpp>
 
 namespace lt {
diff --git a/modules/mirror/include/mirror/panel/asset_browser.hpp b/modules/mirror/public/panels/asset_browser.hpp
similarity index 94%
rename from modules/mirror/include/mirror/panel/asset_browser.hpp
rename to modules/mirror/public/panels/asset_browser.hpp
index aad6365..d8cdc12 100644
--- a/modules/mirror/include/mirror/panel/asset_browser.hpp
+++ b/modules/mirror/public/panels/asset_browser.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <filesystem>
-#include <mirror/panel/panel.hpp>
+#include <mirror/panels/panel.hpp>
 #include <renderer/texture.hpp>
 
 namespace lt {
diff --git a/modules/mirror/include/mirror/panel/panel.hpp b/modules/mirror/public/panels/panel.hpp
similarity index 100%
rename from modules/mirror/include/mirror/panel/panel.hpp
rename to modules/mirror/public/panels/panel.hpp
diff --git a/modules/mirror/include/mirror/panel/properties.hpp b/modules/mirror/public/panels/properties.hpp
similarity index 94%
rename from modules/mirror/include/mirror/panel/properties.hpp
rename to modules/mirror/public/panels/properties.hpp
index 8ea18df..8d6045c 100644
--- a/modules/mirror/include/mirror/panel/properties.hpp
+++ b/modules/mirror/public/panels/properties.hpp
@@ -2,7 +2,7 @@
 
 #include <ecs/entity.hpp>
 #include <math/vec3.hpp>
-#include <mirror/panel/panel.hpp>
+#include <mirror/panels/panel.hpp>
 
 namespace lt {
 
diff --git a/modules/mirror/include/mirror/panel/scene_hierarchy.hpp b/modules/mirror/public/panels/scene_hierarchy.hpp
similarity index 94%
rename from modules/mirror/include/mirror/panel/scene_hierarchy.hpp
rename to modules/mirror/public/panels/scene_hierarchy.hpp
index a7cb8e4..8f31b5d 100644
--- a/modules/mirror/include/mirror/panel/scene_hierarchy.hpp
+++ b/modules/mirror/public/panels/scene_hierarchy.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-
 #include <ecs/entity.hpp>
 #include <ecs/scene.hpp>
-#include <mirror/panel/panel.hpp>
+#include <mirror/panels/panel.hpp>
 
 namespace lt {
 
diff --git a/modules/renderer/src/blender.cpp b/modules/renderer/private/blender.cpp
similarity index 100%
rename from modules/renderer/src/blender.cpp
rename to modules/renderer/private/blender.cpp
diff --git a/modules/renderer/src/buffers.cpp b/modules/renderer/private/buffers.cpp
similarity index 98%
rename from modules/renderer/src/buffers.cpp
rename to modules/renderer/private/buffers.cpp
index b009afc..624ec7f 100644
--- a/modules/renderer/src/buffers.cpp
+++ b/modules/renderer/private/buffers.cpp
@@ -1,4 +1,4 @@
-#include <debug/assertions.hpp>
+#include <lt_debug/assertions.hpp>
 #include <renderer/buffers.hpp>
 #include <renderer/gl/buffers.hpp>
 #include <renderer/shared_context.hpp>
diff --git a/modules/renderer/src/dx/blender.cpp b/modules/renderer/private/dx/blender.cpp
similarity index 100%
rename from modules/renderer/src/dx/blender.cpp
rename to modules/renderer/private/dx/blender.cpp
diff --git a/modules/renderer/src/dx/buffers.cpp b/modules/renderer/private/dx/buffers.cpp
similarity index 100%
rename from modules/renderer/src/dx/buffers.cpp
rename to modules/renderer/private/dx/buffers.cpp
diff --git a/modules/renderer/src/dx/framebuffers.cpp b/modules/renderer/private/dx/framebuffers.cpp
similarity index 100%
rename from modules/renderer/src/dx/framebuffers.cpp
rename to modules/renderer/private/dx/framebuffers.cpp
diff --git a/modules/renderer/src/dx/graphics_context.cpp b/modules/renderer/private/dx/graphics_context.cpp
similarity index 100%
rename from modules/renderer/src/dx/graphics_context.cpp
rename to modules/renderer/private/dx/graphics_context.cpp
diff --git a/modules/renderer/src/dx/render_command.cpp b/modules/renderer/private/dx/render_command.cpp
similarity index 100%
rename from modules/renderer/src/dx/render_command.cpp
rename to modules/renderer/private/dx/render_command.cpp
diff --git a/modules/renderer/src/dx/shader.cpp b/modules/renderer/private/dx/shader.cpp
similarity index 100%
rename from modules/renderer/src/dx/shader.cpp
rename to modules/renderer/private/dx/shader.cpp
diff --git a/modules/renderer/src/dx/texture.cpp b/modules/renderer/private/dx/texture.cpp
similarity index 100%
rename from modules/renderer/src/dx/texture.cpp
rename to modules/renderer/private/dx/texture.cpp
diff --git a/modules/renderer/src/dx/user_interface.cpp b/modules/renderer/private/dx/user_interface.cpp
similarity index 100%
rename from modules/renderer/src/dx/user_interface.cpp
rename to modules/renderer/private/dx/user_interface.cpp
diff --git a/modules/renderer/src/dx/vertex_layout.cpp b/modules/renderer/private/dx/vertex_layout.cpp
similarity index 100%
rename from modules/renderer/src/dx/vertex_layout.cpp
rename to modules/renderer/private/dx/vertex_layout.cpp
diff --git a/modules/renderer/src/framebuffer.cpp b/modules/renderer/private/framebuffer.cpp
similarity index 100%
rename from modules/renderer/src/framebuffer.cpp
rename to modules/renderer/private/framebuffer.cpp
diff --git a/modules/renderer/src/gl/blender.cpp b/modules/renderer/private/gl/blender.cpp
similarity index 100%
rename from modules/renderer/src/gl/blender.cpp
rename to modules/renderer/private/gl/blender.cpp
diff --git a/modules/renderer/src/gl/buffers.cpp b/modules/renderer/private/gl/buffers.cpp
similarity index 100%
rename from modules/renderer/src/gl/buffers.cpp
rename to modules/renderer/private/gl/buffers.cpp
diff --git a/modules/renderer/src/gl/framebuffers.cpp b/modules/renderer/private/gl/framebuffers.cpp
similarity index 100%
rename from modules/renderer/src/gl/framebuffers.cpp
rename to modules/renderer/private/gl/framebuffers.cpp
diff --git a/modules/renderer/src/gl/graphics_context.cpp b/modules/renderer/private/gl/graphics_context.cpp
similarity index 100%
rename from modules/renderer/src/gl/graphics_context.cpp
rename to modules/renderer/private/gl/graphics_context.cpp
diff --git a/modules/renderer/src/gl/render_command.cpp b/modules/renderer/private/gl/render_command.cpp
similarity index 100%
rename from modules/renderer/src/gl/render_command.cpp
rename to modules/renderer/private/gl/render_command.cpp
diff --git a/modules/renderer/src/gl/shader.cpp b/modules/renderer/private/gl/shader.cpp
similarity index 100%
rename from modules/renderer/src/gl/shader.cpp
rename to modules/renderer/private/gl/shader.cpp
diff --git a/modules/renderer/src/gl/texture.cpp b/modules/renderer/private/gl/texture.cpp
similarity index 98%
rename from modules/renderer/src/gl/texture.cpp
rename to modules/renderer/private/gl/texture.cpp
index 59fb5e1..aeb7939 100644
--- a/modules/renderer/src/gl/texture.cpp
+++ b/modules/renderer/private/gl/texture.cpp
@@ -1,6 +1,6 @@
 #include <asset_parser/assets/texture.hpp>
-#include <debug/assertions.hpp>
 #include <glad/gl.h>
+#include <lt_debug/assertions.hpp>
 #include <renderer/gl/texture.hpp>
 
 namespace lt {
diff --git a/modules/renderer/src/gl/user_interface.cpp b/modules/renderer/private/gl/user_interface.cpp
similarity index 100%
rename from modules/renderer/src/gl/user_interface.cpp
rename to modules/renderer/private/gl/user_interface.cpp
diff --git a/modules/renderer/src/gl/vertex_layout.cpp b/modules/renderer/private/gl/vertex_layout.cpp
similarity index 99%
rename from modules/renderer/src/gl/vertex_layout.cpp
rename to modules/renderer/private/gl/vertex_layout.cpp
index bedf2f1..08a4fb2 100644
--- a/modules/renderer/src/gl/vertex_layout.cpp
+++ b/modules/renderer/private/gl/vertex_layout.cpp
@@ -1,5 +1,5 @@
-#include <debug/assertions.hpp>
 #include <glad/gl.h>
+#include <lt_debug/assertions.hpp>
 #include <renderer/gl/buffers.hpp>
 #include <renderer/gl/vertex_layout.hpp>
 
diff --git a/modules/renderer/src/graphics_context.cpp b/modules/renderer/private/graphics_context.cpp
similarity index 100%
rename from modules/renderer/src/graphics_context.cpp
rename to modules/renderer/private/graphics_context.cpp
diff --git a/modules/renderer/src/programs/quad.cpp b/modules/renderer/private/programs/quad.cpp
similarity index 100%
rename from modules/renderer/src/programs/quad.cpp
rename to modules/renderer/private/programs/quad.cpp
diff --git a/modules/renderer/src/programs/texture.cpp b/modules/renderer/private/programs/texture.cpp
similarity index 100%
rename from modules/renderer/src/programs/texture.cpp
rename to modules/renderer/private/programs/texture.cpp
diff --git a/modules/renderer/src/programs/tinted_texture.cpp b/modules/renderer/private/programs/tinted_texture.cpp
similarity index 100%
rename from modules/renderer/src/programs/tinted_texture.cpp
rename to modules/renderer/private/programs/tinted_texture.cpp
diff --git a/modules/renderer/src/render_command.cpp b/modules/renderer/private/render_command.cpp
similarity index 96%
rename from modules/renderer/src/render_command.cpp
rename to modules/renderer/private/render_command.cpp
index 3f405a3..4d69cad 100644
--- a/modules/renderer/src/render_command.cpp
+++ b/modules/renderer/private/render_command.cpp
@@ -1,4 +1,4 @@
-#include <debug/assertions.hpp>
+#include <lt_debug/assertions.hpp>
 #include <renderer/gl/render_command.hpp>
 #include <renderer/render_command.hpp>
 
diff --git a/modules/renderer/src/renderer.cpp b/modules/renderer/private/renderer.cpp
similarity index 99%
rename from modules/renderer/src/renderer.cpp
rename to modules/renderer/private/renderer.cpp
index 77d9c6b..4d9044d 100644
--- a/modules/renderer/src/renderer.cpp
+++ b/modules/renderer/private/renderer.cpp
@@ -1,6 +1,6 @@
 #include <camera/scene.hpp>
-#include <debug/assertions.hpp>
 #include <input/events/window.hpp>
+#include <lt_debug/assertions.hpp>
 #include <renderer/blender.hpp>
 #include <renderer/buffers.hpp>
 #include <renderer/framebuffer.hpp>
diff --git a/modules/renderer/src/shader.cpp b/modules/renderer/private/shader.cpp
similarity index 100%
rename from modules/renderer/src/shader.cpp
rename to modules/renderer/private/shader.cpp
diff --git a/modules/renderer/src/texture.cpp b/modules/renderer/private/texture.cpp
similarity index 100%
rename from modules/renderer/src/texture.cpp
rename to modules/renderer/private/texture.cpp
diff --git a/modules/renderer/src/vertex_layout.cpp b/modules/renderer/private/vertex_layout.cpp
similarity index 96%
rename from modules/renderer/src/vertex_layout.cpp
rename to modules/renderer/private/vertex_layout.cpp
index 4b76a66..ffc8dd9 100644
--- a/modules/renderer/src/vertex_layout.cpp
+++ b/modules/renderer/private/vertex_layout.cpp
@@ -1,4 +1,4 @@
-#include <debug/assertions.hpp>
+#include <lt_debug/assertions.hpp>
 #include <renderer/gl/vertex_layout.hpp>
 #include <renderer/vertex_layout.hpp>
 
diff --git a/modules/renderer/include/renderer/blender.hpp b/modules/renderer/public/blender.hpp
similarity index 100%
rename from modules/renderer/include/renderer/blender.hpp
rename to modules/renderer/public/blender.hpp
diff --git a/modules/renderer/include/renderer/buffers.hpp b/modules/renderer/public/buffers.hpp
similarity index 100%
rename from modules/renderer/include/renderer/buffers.hpp
rename to modules/renderer/public/buffers.hpp
diff --git a/modules/renderer/include/renderer/dx/blender.hpp b/modules/renderer/public/dx/blender.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/blender.hpp
rename to modules/renderer/public/dx/blender.hpp
diff --git a/modules/renderer/include/renderer/dx/buffers.hpp b/modules/renderer/public/dx/buffers.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/buffers.hpp
rename to modules/renderer/public/dx/buffers.hpp
diff --git a/modules/renderer/include/renderer/dx/framebuffers.hpp b/modules/renderer/public/dx/framebuffers.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/framebuffers.hpp
rename to modules/renderer/public/dx/framebuffers.hpp
diff --git a/modules/renderer/include/renderer/dx/graphics_context.hpp b/modules/renderer/public/dx/graphics_context.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/graphics_context.hpp
rename to modules/renderer/public/dx/graphics_context.hpp
diff --git a/modules/renderer/include/renderer/dx/render_command.hpp b/modules/renderer/public/dx/render_command.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/render_command.hpp
rename to modules/renderer/public/dx/render_command.hpp
diff --git a/modules/renderer/include/renderer/dx/shader.hpp b/modules/renderer/public/dx/shader.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/shader.hpp
rename to modules/renderer/public/dx/shader.hpp
diff --git a/modules/renderer/include/renderer/dx/shared_context.hpp b/modules/renderer/public/dx/shared_context.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/shared_context.hpp
rename to modules/renderer/public/dx/shared_context.hpp
diff --git a/modules/renderer/include/renderer/dx/texture.hpp b/modules/renderer/public/dx/texture.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/texture.hpp
rename to modules/renderer/public/dx/texture.hpp
diff --git a/modules/renderer/include/renderer/dx/user_interface.hpp b/modules/renderer/public/dx/user_interface.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/user_interface.hpp
rename to modules/renderer/public/dx/user_interface.hpp
diff --git a/modules/renderer/include/renderer/dx/vertex_layout.hpp b/modules/renderer/public/dx/vertex_layout.hpp
similarity index 100%
rename from modules/renderer/include/renderer/dx/vertex_layout.hpp
rename to modules/renderer/public/dx/vertex_layout.hpp
diff --git a/modules/renderer/include/renderer/framebuffer.hpp b/modules/renderer/public/framebuffer.hpp
similarity index 100%
rename from modules/renderer/include/renderer/framebuffer.hpp
rename to modules/renderer/public/framebuffer.hpp
diff --git a/modules/renderer/include/renderer/gl/blender.hpp b/modules/renderer/public/gl/blender.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/blender.hpp
rename to modules/renderer/public/gl/blender.hpp
diff --git a/modules/renderer/include/renderer/gl/buffers.hpp b/modules/renderer/public/gl/buffers.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/buffers.hpp
rename to modules/renderer/public/gl/buffers.hpp
diff --git a/modules/renderer/include/renderer/gl/framebuffers.hpp b/modules/renderer/public/gl/framebuffers.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/framebuffers.hpp
rename to modules/renderer/public/gl/framebuffers.hpp
diff --git a/modules/renderer/include/renderer/gl/graphics_context.hpp b/modules/renderer/public/gl/graphics_context.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/graphics_context.hpp
rename to modules/renderer/public/gl/graphics_context.hpp
diff --git a/modules/renderer/include/renderer/gl/render_command.hpp b/modules/renderer/public/gl/render_command.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/render_command.hpp
rename to modules/renderer/public/gl/render_command.hpp
diff --git a/modules/renderer/include/renderer/gl/shader.hpp b/modules/renderer/public/gl/shader.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/shader.hpp
rename to modules/renderer/public/gl/shader.hpp
diff --git a/modules/renderer/include/renderer/gl/shared_context.hpp b/modules/renderer/public/gl/shared_context.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/shared_context.hpp
rename to modules/renderer/public/gl/shared_context.hpp
diff --git a/modules/renderer/include/renderer/gl/texture.hpp b/modules/renderer/public/gl/texture.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/texture.hpp
rename to modules/renderer/public/gl/texture.hpp
diff --git a/modules/renderer/include/renderer/gl/user_interface.hpp b/modules/renderer/public/gl/user_interface.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/user_interface.hpp
rename to modules/renderer/public/gl/user_interface.hpp
diff --git a/modules/renderer/include/renderer/gl/vertex_layout.hpp b/modules/renderer/public/gl/vertex_layout.hpp
similarity index 100%
rename from modules/renderer/include/renderer/gl/vertex_layout.hpp
rename to modules/renderer/public/gl/vertex_layout.hpp
diff --git a/modules/renderer/include/renderer/graphics_context.hpp b/modules/renderer/public/graphics_context.hpp
similarity index 100%
rename from modules/renderer/include/renderer/graphics_context.hpp
rename to modules/renderer/public/graphics_context.hpp
diff --git a/modules/renderer/include/renderer/programs/quad.hpp b/modules/renderer/public/programs/quad.hpp
similarity index 100%
rename from modules/renderer/include/renderer/programs/quad.hpp
rename to modules/renderer/public/programs/quad.hpp
diff --git a/modules/renderer/include/renderer/programs/renderer_program.hpp b/modules/renderer/public/programs/renderer_program.hpp
similarity index 100%
rename from modules/renderer/include/renderer/programs/renderer_program.hpp
rename to modules/renderer/public/programs/renderer_program.hpp
diff --git a/modules/renderer/include/renderer/programs/texture.hpp b/modules/renderer/public/programs/texture.hpp
similarity index 100%
rename from modules/renderer/include/renderer/programs/texture.hpp
rename to modules/renderer/public/programs/texture.hpp
diff --git a/modules/renderer/include/renderer/programs/tinted_texture.hpp b/modules/renderer/public/programs/tinted_texture.hpp
similarity index 100%
rename from modules/renderer/include/renderer/programs/tinted_texture.hpp
rename to modules/renderer/public/programs/tinted_texture.hpp
diff --git a/modules/renderer/include/renderer/render_command.hpp b/modules/renderer/public/render_command.hpp
similarity index 100%
rename from modules/renderer/include/renderer/render_command.hpp
rename to modules/renderer/public/render_command.hpp
diff --git a/modules/renderer/include/renderer/renderer.hpp b/modules/renderer/public/renderer.hpp
similarity index 100%
rename from modules/renderer/include/renderer/renderer.hpp
rename to modules/renderer/public/renderer.hpp
diff --git a/modules/renderer/include/renderer/shader.hpp b/modules/renderer/public/shader.hpp
similarity index 100%
rename from modules/renderer/include/renderer/shader.hpp
rename to modules/renderer/public/shader.hpp
diff --git a/modules/renderer/include/renderer/shared_context.hpp b/modules/renderer/public/shared_context.hpp
similarity index 100%
rename from modules/renderer/include/renderer/shared_context.hpp
rename to modules/renderer/public/shared_context.hpp
diff --git a/modules/renderer/include/renderer/texture.hpp b/modules/renderer/public/texture.hpp
similarity index 100%
rename from modules/renderer/include/renderer/texture.hpp
rename to modules/renderer/public/texture.hpp
diff --git a/modules/renderer/include/renderer/vertex_layout.hpp b/modules/renderer/public/vertex_layout.hpp
similarity index 95%
rename from modules/renderer/include/renderer/vertex_layout.hpp
rename to modules/renderer/public/vertex_layout.hpp
index b746a6f..c5afe80 100644
--- a/modules/renderer/include/renderer/vertex_layout.hpp
+++ b/modules/renderer/public/vertex_layout.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <debug/assertions.hpp>
+#include <lt_debug/assertions.hpp>
 
 namespace lt {
 
diff --git a/modules/test/src/entrypoint.cpp b/modules/test/private/entrypoint.cpp
similarity index 100%
rename from modules/test/src/entrypoint.cpp
rename to modules/test/private/entrypoint.cpp
diff --git a/modules/test/private/test.cpp b/modules/test/private/test.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/modules/test/src/test.tests.cpp b/modules/test/private/test.tests.cpp
similarity index 100%
rename from modules/test/src/test.tests.cpp
rename to modules/test/private/test.tests.cpp
diff --git a/modules/test/include/test/expects.hpp b/modules/test/public/expects.hpp
similarity index 100%
rename from modules/test/include/test/expects.hpp
rename to modules/test/public/expects.hpp
diff --git a/modules/test/include/test/test.hpp b/modules/test/public/test.hpp
similarity index 100%
rename from modules/test/include/test/test.hpp
rename to modules/test/public/test.hpp
diff --git a/modules/time/src/timer.cpp b/modules/time/private/timer.cpp
similarity index 100%
rename from modules/time/src/timer.cpp
rename to modules/time/private/timer.cpp
diff --git a/modules/time/src/timer.tests.cpp b/modules/time/private/timer.tests.cpp
similarity index 100%
rename from modules/time/src/timer.tests.cpp
rename to modules/time/private/timer.tests.cpp
diff --git a/modules/time/include/time/timer.hpp b/modules/time/public/timer.hpp
similarity index 100%
rename from modules/time/include/time/timer.hpp
rename to modules/time/public/timer.hpp
diff --git a/modules/ui/src/gl/ui.cpp b/modules/ui/private/gl/ui.cpp
similarity index 100%
rename from modules/ui/src/gl/ui.cpp
rename to modules/ui/private/gl/ui.cpp
diff --git a/modules/ui/include/ui/gl/ui.hpp b/modules/ui/private/gl/ui.hpp
similarity index 100%
rename from modules/ui/include/ui/gl/ui.hpp
rename to modules/ui/private/gl/ui.hpp
diff --git a/modules/ui/src/ui.cpp b/modules/ui/private/ui.cpp
similarity index 100%
rename from modules/ui/src/ui.cpp
rename to modules/ui/private/ui.cpp
diff --git a/modules/ui/include/ui/ui.hpp b/modules/ui/public/ui.hpp
similarity index 100%
rename from modules/ui/include/ui/ui.hpp
rename to modules/ui/public/ui.hpp
diff --git a/modules/window/src/linux/window.cpp b/modules/window/private/linux/window.cpp
similarity index 100%
rename from modules/window/src/linux/window.cpp
rename to modules/window/private/linux/window.cpp
diff --git a/modules/window/include/window/linux/window.hpp b/modules/window/private/linux/window.hpp
similarity index 100%
rename from modules/window/include/window/linux/window.hpp
rename to modules/window/private/linux/window.hpp
diff --git a/modules/window/private/mac/window.cpp b/modules/window/private/mac/window.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/modules/window/private/mac/window.hpp b/modules/window/private/mac/window.hpp
new file mode 100644
index 0000000..e69de29
diff --git a/modules/window/src/windows/window.cpp b/modules/window/private/windows/window.cpp
similarity index 100%
rename from modules/window/src/windows/window.cpp
rename to modules/window/private/windows/window.cpp
diff --git a/modules/window/include/window/windows/window.hpp b/modules/window/private/windows/window.hpp
similarity index 100%
rename from modules/window/include/window/windows/window.hpp
rename to modules/window/private/windows/window.hpp
diff --git a/modules/window/include/window/window.hpp b/modules/window/public/window.hpp
similarity index 100%
rename from modules/window/include/window/window.hpp
rename to modules/window/public/window.hpp
diff --git a/tools/cmake/functions.cmake b/tools/cmake/functions.cmake
index b62d542..2217600 100644
--- a/tools/cmake/functions.cmake
+++ b/tools/cmake/functions.cmake
@@ -1,8 +1,16 @@
 function (add_library_module libname)
+    set(PUBLIC_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/public_includes")
+    file(MAKE_DIRECTORY "${PUBLIC_INCLUDE_DIR}")
+    file(CREATE_LINK
+        "${CMAKE_CURRENT_SOURCE_DIR}/public/"
+        "${PUBLIC_INCLUDE_DIR}/${libname}"
+        SYMBOLIC
+    )
+
     if ("${ARGN}" STREQUAL "") # Header only library
         message("Adding INTERFACE library ${libname}")
         add_library(${libname} INTERFACE)
-        target_include_directories(${libname} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+        target_include_directories(${libname} INTERFACE ${PUBLIC_INCLUDE_DIR})
 
         # Do not link base against base :D
         if (NOT ${libname} STREQUAL "base")
@@ -11,50 +19,95 @@ function (add_library_module libname)
 
     else () # Compiled library
         set(source_files)
-        set(source_directory "${CMAKE_CURRENT_SOURCE_DIR}/src")
+        set(source_directory "${CMAKE_CURRENT_SOURCE_DIR}/private")
         foreach (source_file ${ARGN})
             list(APPEND source_files "${source_directory}/${source_file}")
         endforeach ()
 
         message("Adding library ${libname} with source files: ${source_files}")
         add_library(${libname} ${source_files})
-        target_include_directories(${libname} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+        set(PRIVATE_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/private_includes")
+        file(MAKE_DIRECTORY "${PRIVATE_INCLUDE_DIR}")
+        file(CREATE_LINK
+            "${CMAKE_CURRENT_SOURCE_DIR}/private/"
+            "${PRIVATE_INCLUDE_DIR}/${libname}"
+            SYMBOLIC
+        )
+
+        target_include_directories(${libname} 
+            PUBLIC ${PUBLIC_INCLUDE_DIR}
+            PRIVATE ${PRIVATE_INCLUDE_DIR}
+        )
 
         # Do not link base against base :D
         if (NOT ${libname} STREQUAL "base")
             target_link_libraries(${libname} PUBLIC base)
         endif ()
     endif ()
+
 endfunction ()
 
 function (add_executable_module exename)
     set(source_files)
-    set(source_directory "${CMAKE_CURRENT_SOURCE_DIR}/src")
+    set(source_directory "${CMAKE_CURRENT_SOURCE_DIR}/private")
     foreach (source_file ${ARGN})
         list(APPEND source_files "${source_directory}/${source_file}")
     endforeach ()
 
     message("Adding executable ${exename} with source files: ${source_files}")
+
+    set(PUBLIC_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/public_includes")
+    file(MAKE_DIRECTORY "${PUBLIC_INCLUDE_DIR}")
+    file(CREATE_LINK
+        "${CMAKE_CURRENT_SOURCE_DIR}/public/"
+        "${PUBLIC_INCLUDE_DIR}/${exename}"
+        SYMBOLIC
+    )
+    set(PRIVATE_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/private_includes")
+    file(MAKE_DIRECTORY "${PRIVATE_INCLUDE_DIR}")
+    file(CREATE_LINK
+        "${CMAKE_CURRENT_SOURCE_DIR}/private/"
+        "${PRIVATE_INCLUDE_DIR}${exename}"
+        SYMBOLIC
+    )
+
     add_executable(${exename} ${source_files})
-    target_include_directories(${exename} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
     target_link_libraries(${exename} PRIVATE base)
+    target_include_directories(${exename} PRIVATE ${PUBLIC_INCLUDE_DIR} ${PRIVATE_INCLUDE_DIR})
 endfunction ()
 
-function (add_test_module exename)
+function (add_test_module target_lib_name)
     if (NOT ${ENABLE_TESTS})
         return()
     endif ()
 
     set(source_files)
-    set(source_directory "${CMAKE_CURRENT_SOURCE_DIR}/src")
+    set(source_directory "${CMAKE_CURRENT_SOURCE_DIR}/private")
     foreach (source_file ${ARGN})
         list(APPEND source_files "${source_directory}/${source_file}")
     endforeach ()
 
-    message("Adding test executable ${exename}_tests with source files: ${source_files}")
-    add_executable(${exename}_tests ${source_files})
-    target_include_directories(${exename} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-    target_link_libraries(${exename}_tests PRIVATE ${exename} base test)
+    message("Adding test executable ${target_lib_name}_tests with source files: ${source_files}")
+
+    set(PUBLIC_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/public_includes")
+    file(MAKE_DIRECTORY "${PUBLIC_INCLUDE_DIR}")
+    file(CREATE_LINK
+        "${CMAKE_CURRENT_SOURCE_DIR}/public/"
+        "${PUBLIC_INCLUDE_DIR}/${target_lib_name}"
+        SYMBOLIC
+    )
+    set(PRIVATE_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/private_includes")
+    file(MAKE_DIRECTORY "${PRIVATE_INCLUDE_DIR}")
+    file(CREATE_LINK
+        "${CMAKE_CURRENT_SOURCE_DIR}/private/"
+        "${PRIVATE_INCLUDE_DIR}${target_lib_name}"
+        SYMBOLIC
+    )
+
+    add_executable(${target_lib_name}_tests ${source_files})
+    target_link_libraries(${target_lib_name}_tests PRIVATE ${target_lib_name} base test)
+
 endfunction ()
 
 function (add_option option help)