JeanPhilippeKernel · MathewBensonCode · Feb 3, 2026
diff --git a/Obelisk/CMakeLists.txt b/Obelisk/CMakeLists.txt
@@ -9,47 +9,36 @@ project (Obelisk
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set	(CMAKE_CXX_STANDARD 20)
 
-set (TARGET_NAME Obelisk)
-
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    add_executable (${TARGET_NAME} WIN32)
+    add_executable (Obelisk WIN32)
 else()
-    add_executable (${TARGET_NAME})
+    add_executable (Obelisk)
 endif()
 
-target_sources(${TARGET_NAME} PUBLIC EntryPoint.cpp)
+target_sources(Obelisk PRIVATE EntryPoint.cpp)
 
 # We set this debugger directory to find assets and resources file
 # after being copied to Debug and Release output directories 
 #
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    set_target_properties(${TARGET_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)$(Configuration)")
+    set_target_properties(Obelisk PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)$(Configuration)")
 endif ()
 
-target_include_directories (${TARGET_NAME}
-    PRIVATE
-        .
-        ${ENLISTMENT_ROOT}
-        ${ENLISTMENT_ROOT}/ZEngine
-)
-
-target_precompile_headers(${TARGET_NAME} PRIVATE pch.h)
-
-target_compile_definitions(${TARGET_NAME}
+target_compile_definitions(Obelisk
     PRIVATE
         NOMINMAX
         UNICODE
         _UNICODE
 )
 
-target_link_libraries(${TARGET_NAME} PUBLIC
-    tetragrama
+target_link_libraries(Obelisk PUBLIC
+    Tetragrama
     imported::External_obeliskLibs
 )
 
-set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
+set_target_properties(Obelisk PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 
-install(TARGETS ${TARGET_NAME} 
+install(TARGETS Obelisk 
     DESTINATION bin
 )
 

diff --git a/Obelisk/EntryPoint.cpp b/Obelisk/EntryPoint.cpp
@@ -1,10 +1,9 @@
 #include <CLI/CLI.hpp>
+#include <Tetragrama/Editor.h>
+#include <ZEngine/Applications/GameApplication.h>
 #include <ZEngine/Core/Memory/MemoryManager.h>
 #include <ZEngine/EngineConfiguration.h>
 #include <ZEngine/Logging/Logger.h>
-#include <ZEngine/Applications/GameApplication.h>
-
-#include <Tetragrama/Editor.h>
 
 #ifdef ZENGINE_PLATFORM
 
@@ -23,11 +22,9 @@ int applicationEntryPoint(int argc, char* argv[])
     LoggerConfiguration logger_cfg = {};
     Logger::Initialize(arena, logger_cfg);
 
-
     GameApplicationPtr app = nullptr;
 
-
-    CLI::App cli{"ObeliskCLI"};
+    CLI::App           cli{"ObeliskCLI"};
     argv                      = cli.ensure_utf8(argv);
 
     std::string config_file   = "";
@@ -37,10 +34,9 @@ int applicationEntryPoint(int argc, char* argv[])
 
     CLI11_PARSE(cli, argc, argv);
 
-
     if (launch_editor)
     {
-        app = ZPushStructCtor(arena, Tetragrama::Editor);    
+        app                      = ZPushStructCtor(arena, Tetragrama::Editor);
         app->EnableRenderOverlay = true;
     }
 

diff --git a/Obelisk/pch.h b/Obelisk/pch.h
diff --git a/Tetragrama/CMakeLists.txt b/Tetragrama/CMakeLists.txt
@@ -14,41 +14,25 @@ file (GLOB_RECURSE CPP_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
 
 source_group (TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${HEADER_FILES} ${CPP_FILES})
 
-set (TARGET_NAME tetragrama)
+add_library (Tetragrama)
 
-add_library (${TARGET_NAME})
-
-target_sources(${TARGET_NAME} PUBLIC ${HEADER_FILES} ${CPP_FILES})
+target_sources(Tetragrama 
+    PUBLIC FILE_SET HEADERS BASE_DIRS ${PROJECT_SOURCE_DIR}/..
+    PRIVATE ${CPP_FILES}
+)
 
 # We set this debugger directory to find assets and resources file
 # after being copied to Debug and Release output directories 
 #
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    set_target_properties(${TARGET_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)$(Configuration)")
+    set_target_properties(Tetragrama PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)$(Configuration)")
 endif ()
 
-target_include_directories (${TARGET_NAME}
-    PUBLIC
-        .
-        ./Components
-        ./Components/Events
-        ./Controllers
-        ./Inputs
-        ./Layers
-        ./Messengers
-        ./Helpers
-        ./Importers
-        ./Serializers
-        ./Managers
-)
-
-target_precompile_headers(${TARGET_NAME} PRIVATE pch.h)
-
-target_compile_definitions(${TARGET_NAME}
+target_compile_definitions(Tetragrama
     PRIVATE
         NOMINMAX
         UNICODE
         _UNICODE
 )
 
-target_link_libraries(${TARGET_NAME} PUBLIC zEngineLib)
+target_link_libraries(Tetragrama PUBLIC zEngineLib)
diff --git a/Tetragrama/Components/AboutUIComponent.h b/Tetragrama/Components/AboutUIComponent.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <UIComponent.h>
+#include <Tetragrama/Components/UIComponent.h>
 #include <imgui.h>
 
 namespace Tetragrama::Components

diff --git a/Tetragrama/Components/DemoUIComponent.h b/Tetragrama/Components/DemoUIComponent.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <UIComponent.h>
+#include <Tetragrama/Components/UIComponent.h>
 #include <imgui.h>
 
 namespace Tetragrama::Components

diff --git a/Tetragrama/Components/DockspaceUIComponent.cpp b/Tetragrama/Components/DockspaceUIComponent.cpp
@@ -1,12 +1,13 @@
-#include <DockspaceUIComponent.h>
-#include <Editor.h>
-#include <Helpers/UIDispatcher.h>
-#include <Importers/AssimpImporter.h>
-#include <MessageToken.h>
-#include <Messengers/Messenger.h>
+#include <Tetragrama/Components/DockspaceUIComponent.h>
+#include <Tetragrama/Editor.h>
+#include <Tetragrama/Helpers/UIDispatcher.h>
+#include <Tetragrama/MessageToken.h>
+#include <Tetragrama/Messengers/Messenger.h>
+#include <ZEngine/Importers/AssimpImporter.h>
 #include <ZEngine/Logging/LoggerDefinition.h>
 #include <fmt/format.h>
 #include <imgui/imgui_internal.h>
+#include <filesystem>
 
 namespace fs = std::filesystem;
 

diff --git a/Tetragrama/Components/DockspaceUIComponent.h b/Tetragrama/Components/DockspaceUIComponent.h
@@ -1,8 +1,8 @@
 #pragma once
-#include <Importers/IAssetImporter.h>
-#include <Message.h>
-#include <Serializers/EditorSceneSerializer.h>
-#include <UIComponent.h>
+#include <Tetragrama/Components/UIComponent.h>
+#include <Tetragrama/Messengers/Message.h>
+#include <Tetragrama/Serializers/EditorSceneSerializer.h>
+#include <ZEngine/Importers/IAssetImporter.h>
 #include <imgui.h>
 
 namespace Tetragrama::Components

diff --git a/Tetragrama/Components/Events/SceneTextureAvailableEvent.h b/Tetragrama/Components/Events/SceneTextureAvailableEvent.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <UIComponentEvent.h>
+#include <Tetragrama/UIComponentEvent.h>
 
 namespace Tetragrama::Components::Event
 {

diff --git a/Tetragrama/Components/Events/SceneViewportFocusedEvent.h b/Tetragrama/Components/Events/SceneViewportFocusedEvent.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <UIComponentEvent.h>
+#include <Tetragrama/Components/Events/UIComponentEvent.h>
 
 namespace Tetragrama::Components::Event
 {

diff --git a/Tetragrama/Components/Events/SceneViewportResizedEvent.h b/Tetragrama/Components/Events/SceneViewportResizedEvent.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <UIComponentEvent.h>
+#include <Tetragrama/Components/Events/UIComponentEvent.h>
 
 namespace Tetragrama::Components::Event
 {

diff --git a/Tetragrama/Components/Events/SceneViewportUnfocusedEvent.h b/Tetragrama/Components/Events/SceneViewportUnfocusedEvent.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <UIComponentEvent.h>
+#include <Tetragrama/Components/Events/UIComponentEvent.h>
 
 namespace Tetragrama::Components::Event
 {

diff --git a/Tetragrama/Components/HierarchyViewUIComponent.cpp b/Tetragrama/Components/HierarchyViewUIComponent.cpp
@@ -1,13 +1,16 @@
-#include <Controllers/EditorCameraController.h>
-#include <Editor.h>
-#include <HierarchyViewUIComponent.h>
+// clang-format off
+#include <Tetragrama/Components/HierarchyViewUIComponent.h>
+#include <Tetragrama/Controllers/EditorCameraController.h>
 #include <ImGuizmo/ImGuizmo.h>
+#include <Tetragrama/Editor.h>
 #include <ZEngine/Core/Maths/Matrix.h>
 #include <ZEngine/Managers/AssetManager.h>
 #include <ZEngine/Rendering/Scenes/GraphicScene.h>
 #include <ZEngine/Windows/Inputs/KeyCodeDefinition.h>
 #include <ZEngine/Windows/Inputs/Keyboard.h>
 #include <ZEngine/Windows/Inputs/Mouse.h>
+// clang-format on
+#include <stack>
 
 using namespace ZEngine;
 using namespace ZEngine::Helpers;

diff --git a/Tetragrama/Components/HierarchyViewUIComponent.h b/Tetragrama/Components/HierarchyViewUIComponent.h
@@ -1,5 +1,6 @@
 #pragma once
-#include <UIComponent.h>
+#include <Tetragrama/Components/UIComponent.h>
+#include <Tetragrama/EditorScene.h>
 #include <imgui.h>
 
 namespace Tetragrama::Components

diff --git a/Tetragrama/Components/InspectorViewUIComponent.cpp b/Tetragrama/Components/InspectorViewUIComponent.cpp
@@ -1,6 +1,6 @@
-#include <Editor.h>
-#include <InspectorViewUIComponent.h>
-#include <UIComponentDrawerHelper.h>
+#include <Tetragrama/Components/InspectorViewUIComponent.h>
+#include <Tetragrama/Editor.h>
+#include <Tetragrama/Helpers/UIComponentDrawerHelper.h>
 #include <ZEngine/Core/Coroutine.h>
 #include <ZEngine/Core/Maths/Matrix.h>
 #include <ZEngine/Helpers/MeshHelper.h>

diff --git a/Tetragrama/Components/InspectorViewUIComponent.h b/Tetragrama/Components/InspectorViewUIComponent.h
@@ -1,11 +1,8 @@
 #pragma once
-#include <Message.h>
-#include <UIComponent.h>
+#include <Tetragrama/Components/UIComponent.h>
+#include <Tetragrama/Messengers/Message.h>
 #include <ZEngine/ZEngineDef.h>
 #include <imgui.h>
-#include <future>
-#include <mutex>
-#include <string>
 
 namespace Tetragrama::Components
 {

diff --git a/Tetragrama/Components/LogUIComponent.cpp b/Tetragrama/Components/LogUIComponent.cpp
@@ -1,7 +1,7 @@
-#include <Helpers/MemoryOperations.h>
-#include <LogUIComponent.h>
-#include <SearchPatternAlgorithm.h>
+#include <Tetragrama/Components/LogUIComponent.h>
+#include <Tetragrama/Helpers/SearchPatternAlgorithm.h>
 #include <ZEngine/Core/Containers/Array.h>
+#include <ZEngine/Helpers/MemoryOperations.h>
 #include <imgui.h>
 
 using namespace ZEngine::Logging;

diff --git a/Tetragrama/Components/LogUIComponent.h b/Tetragrama/Components/LogUIComponent.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <UIComponent.h>
+#include <Tetragrama/Components/UIComponent.h>
 #include <ZEngine/Core/Memory/Allocator.h>
 #include <ZEngine/Logging/Logger.h>
 #include <atomic>

diff --git a/Tetragrama/Components/ProjectViewUIComponent.cpp b/Tetragrama/Components/ProjectViewUIComponent.cpp
@@ -1,8 +1,10 @@
-#include <Editor.h>
-#include <Helpers/SearchPatternAlgorithm.h>
-#include <ProjectViewUIComponent.h>
+#include <Tetragrama/Components/ProjectViewUIComponent.h>
+#include <Tetragrama/Editor.h>
+#include <Tetragrama/Helpers/SearchPatternAlgorithm.h>
 #include <ZEngine/Helpers/MemoryOperations.h>
 #include <imgui.h>
+#include <filesystem>
+#include <fstream>
 
 using namespace ZEngine::Helpers;
 

diff --git a/Tetragrama/Components/ProjectViewUIComponent.h b/Tetragrama/Components/ProjectViewUIComponent.h
@@ -1,7 +1,9 @@
 #pragma once
-#include <UIComponent.h>
+#include <Tetragrama/Components/ProjectViewUIComponent.h>
+#include <Tetragrama/Components/UIComponent.h>
 #include <ZEngine/Core/Memory/Allocator.h>
 #include <ZEngine/Importers/AssetTypes.h>
+#include <filesystem>
 
 namespace Tetragrama::Components
 {

diff --git a/Tetragrama/Components/SceneViewportUIComponent.cpp b/Tetragrama/Components/SceneViewportUIComponent.cpp
@@ -1,13 +1,15 @@
-#include <Controllers/EditorCameraController.h>
-#include <MessageToken.h>
-#include <Messengers/Messenger.h>
-#include <SceneViewportUIComponent.h>
+#include <Tetragrama/Components/Events/UIComponentEvent.h>
+#include <Tetragrama/Components/SceneViewportUIComponent.h>
+#include <Tetragrama/Controllers/EditorCameraController.h>
+#include <Tetragrama/MessageToken.h>
+#include <Tetragrama/Messengers/Messenger.h>
 #include <ZEngine/Logging/LoggerDefinition.h>
 #include <ZEngine/Rendering/Renderers/GraphicRenderer.h>
 #include <ZEngine/Windows/Inputs/KeyCodeDefinition.h>
 /**/
-#include <Editor.h>
 #include <ImGuizmo/ImGuizmo.h>
+#include <Tetragrama/Editor.h>
+#include <filesystem>
 
 using namespace Tetragrama::Components::Event;
 using namespace ZEngine::Rendering::Renderers;

diff --git a/Tetragrama/Components/SceneViewportUIComponent.h b/Tetragrama/Components/SceneViewportUIComponent.h
@@ -1,9 +1,9 @@
 #pragma once
-#include <Components/Events/SceneViewportFocusedEvent.h>
-#include <Components/Events/SceneViewportResizedEvent.h>
-#include <Components/Events/SceneViewportUnfocusedEvent.h>
-#include <Messengers/Message.h>
-#include <UIComponent.h>
+#include <Tetragrama/Components/Events/SceneViewportFocusedEvent.h>
+#include <Tetragrama/Components/Events/SceneViewportResizedEvent.h>
+#include <Tetragrama/Components/Events/SceneViewportUnfocusedEvent.h>
+#include <Tetragrama/Components/UIComponent.h>
+#include <Tetragrama/Messengers/Message.h>
 #include <imgui.h>
 #include <vulkan/vulkan.h>
 

diff --git a/Tetragrama/Components/UIComponent.h b/Tetragrama/Components/UIComponent.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <ImguiLayer.h>
+#include <Tetragrama/Layers/ImguiLayer.h>
 #include <ZEngine/Core/Containers/Array.h>
 #include <ZEngine/Core/IRenderable.h>
 #include <ZEngine/Core/IUpdatable.h>

diff --git a/Tetragrama/Controllers/EditorCameraController.cpp b/Tetragrama/Controllers/EditorCameraController.cpp
@@ -1,4 +1,4 @@
-#include <EditorCameraController.h>
+#include <Tetragrama/Controllers/EditorCameraController.h>
 #include <ZEngine/Core/Maths/MathUtils.h>
 
 using namespace ZEngine::Rendering::Cameras;

diff --git a/Tetragrama/Editor.cpp b/Tetragrama/Editor.cpp
@@ -1,9 +1,10 @@
-#include <Controllers/EditorCameraController.h>
-#include <Editor.h>
-#include <MessageToken.h>
-#include <Messengers/Messenger.h>
+#include <Tetragrama/Controllers/EditorCameraController.h>
+#include <Tetragrama/Editor.h>
+#include <Tetragrama/MessageToken.h>
+#include <Tetragrama/Messengers/Messenger.h>
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
+#include <fstream>
 
 using namespace ZEngine;
 using namespace ZEngine::Core::Containers;