111 files changed, 189 insertions, 189 deletions

diff --git a/3rdparty/imgui/CMakeLists.txt b/3rdparty/imgui/CMakeLists.txt
index 4bdfe9c..a491ca0 100644
--- a/3rdparty/imgui/CMakeLists.txt
+++ b/3rdparty/imgui/CMakeLists.txt
@@ -4,7 +4,7 @@ file(GLOB IMGUI_SOURCES *.cpp)
 # depending on build flags. Technically it is possible to write then here too, but doing so would require repeating
 # the build flags twice both in here and in core/CMakeLists.txt
 
-add_library(imgui ${IMGUI_SOURCES} ../../core/src/Model/Template/TableTemplateIterator.hpp)
+add_library(imgui ${IMGUI_SOURCES})
 target_include_directories(imgui
 PUBLIC
 	${CMAKE_CURRENT_LIST_DIR}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da50547..0edd517 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,4 +20,4 @@ add_subdirectory(3rdparty/imgui)
 add_subdirectory(3rdparty/implot)
 add_subdirectory(3rdparty/imgui-node-editor)
 add_subdirectory(3rdparty/sqlitecpp)
-add_subdirectory(core)
+add_subdirectory(app)
diff --git a/core/CMakeLists.txt b/app/CMakeLists.txt
index 337ed63..e898800 100644
--- a/core/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -29,12 +29,12 @@ if(BUILD_CORE_WITH_DX11_BACKEND OR BUILD_CORE_WITH_DX12_BACKEND)
 endif()
 
 file(GLOB_RECURSE CPLT_CORE_SOURCES_NORMAL
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.h
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.c
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.m
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.mm
+    ${CMAKE_CURRENT_LIST_DIR}/source/*.h
+    ${CMAKE_CURRENT_LIST_DIR}/source/*.c
+    ${CMAKE_CURRENT_LIST_DIR}/source/*.m
+    ${CMAKE_CURRENT_LIST_DIR}/source/*.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/source/*.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/source/*.mm
 )
 
 add_executable(CpltCore ${CPLT_CORE_SOURCES_SPECIAL} ${CPLT_CORE_SOURCES_NORMAL})
@@ -46,21 +46,21 @@ PROPERTIES
 )
 
 set(CPLT_CORE_SOURCES_NORMAL_UNITY_EXCLUDED
-    src/Entrypoint/main.cpp
-    src/Entrypoint/Backend_OpenGL2.cpp
-    src/Entrypoint/Backend_OpenGL3.cpp
-    src/Entrypoint/Backend_Vulkan.cpp
-    src/Entrypoint/Backend_DirectX11.cpp
-    src/Entrypoint/Backend_DirectX12.cpp
-    src/Entrypoint/Backend_Metal.mm
-    src/UI/UI_DatabaseView.cpp
-    src/UI/UI_Items.cpp
-    src/UI/UI_MainWindow.cpp
-    src/UI/UI_Settings.cpp
-    src/UI/UI_Templates.cpp
-    src/UI/UI_Utils.cpp
-    src/UI/UI_Workflows.cpp
-    src/Utils/IO/FileStream.cpp
+    source/Cplt/Entrypoint/main.cpp
+    source/Cplt/Entrypoint/Backend_OpenGL2.cpp
+    source/Cplt/Entrypoint/Backend_OpenGL3.cpp
+    source/Cplt/Entrypoint/Backend_Vulkan.cpp
+    source/Cplt/Entrypoint/Backend_DirectX11.cpp
+    source/Cplt/Entrypoint/Backend_DirectX12.cpp
+    source/Cplt/Entrypoint/Backend_Metal.mm
+    source/Cplt/UI/UI_DatabaseView.cpp
+    source/Cplt/UI/UI_Items.cpp
+    source/Cplt/UI/UI_MainWindow.cpp
+    source/Cplt/UI/UI_Settings.cpp
+    source/Cplt/UI/UI_Templates.cpp
+    source/Cplt/UI/UI_Utils.cpp
+    source/Cplt/UI/UI_Workflows.cpp
+    source/Cplt/Utils/IO/FileStream.cpp
 )
 set_source_files_properties(
     ${CPLT_CORE_SOURCES_SPECIAL}
@@ -70,7 +70,7 @@ PROPERTIES
 )
 
 target_include_directories(CpltCore PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}/src
+    ${CMAKE_CURRENT_LIST_DIR}/source
 )
 target_link_libraries(CpltCore
 PRIVATE
diff --git a/core/fonts/FontAwesome5-Solid.otf b/app/fonts/FontAwesome5-Solid.otf
index 8fb28d5..8fb28d5 100644
--- a/core/fonts/FontAwesome5-Solid.otf
+++ b/app/fonts/FontAwesome5-Solid.otf
diff --git a/core/fonts/NotoSansSC-LICENSE.txt b/app/fonts/NotoSansSC-LICENSE.txt
index 77b1731..77b1731 100644
--- a/core/fonts/NotoSansSC-LICENSE.txt
+++ b/app/fonts/NotoSansSC-LICENSE.txt
diff --git a/core/fonts/NotoSansSC-Regular.otf b/app/fonts/NotoSansSC-Regular.otf
index fdb0506..fdb0506 100644
--- a/core/fonts/NotoSansSC-Regular.otf
+++ b/app/fonts/NotoSansSC-Regular.otf
diff --git a/core/src/Entrypoint/Backend.hpp b/app/source/Cplt/Entrypoint/Backend.hpp
index ca391e6..ca391e6 100644
--- a/core/src/Entrypoint/Backend.hpp
+++ b/app/source/Cplt/Entrypoint/Backend.hpp
diff --git a/core/src/Entrypoint/Backend_DirectX11.cpp b/app/source/Cplt/Entrypoint/Backend_DirectX11.cpp
index 4dc33f7..4dc33f7 100644
--- a/core/src/Entrypoint/Backend_DirectX11.cpp
+++ b/app/source/Cplt/Entrypoint/Backend_DirectX11.cpp
diff --git a/core/src/Entrypoint/Backend_DirectX12.cpp b/app/source/Cplt/Entrypoint/Backend_DirectX12.cpp
index fd4a531..fd4a531 100644
--- a/core/src/Entrypoint/Backend_DirectX12.cpp
+++ b/app/source/Cplt/Entrypoint/Backend_DirectX12.cpp
diff --git a/core/src/Entrypoint/Backend_Metal.mm b/app/source/Cplt/Entrypoint/Backend_Metal.mm
index 276bef2..276bef2 100644
--- a/core/src/Entrypoint/Backend_Metal.mm
+++ b/app/source/Cplt/Entrypoint/Backend_Metal.mm
diff --git a/core/src/Entrypoint/Backend_OpenGL2.cpp b/app/source/Cplt/Entrypoint/Backend_OpenGL2.cpp
index 8f80094..0f20997 100644
--- a/core/src/Entrypoint/Backend_OpenGL2.cpp
+++ b/app/source/Cplt/Entrypoint/Backend_OpenGL2.cpp
@@ -1,4 +1,4 @@
-#include "Entrypoint/Backend.hpp"
+#include <Cplt/Entrypoint/Backend.hpp>
 
 #if BUILD_CORE_WITH_OPENGL2_BACKEND
 #	include <glad/glad.h>
diff --git a/core/src/Entrypoint/Backend_OpenGL3.cpp b/app/source/Cplt/Entrypoint/Backend_OpenGL3.cpp
index 96a260a..28a34ca 100644
--- a/core/src/Entrypoint/Backend_OpenGL3.cpp
+++ b/app/source/Cplt/Entrypoint/Backend_OpenGL3.cpp
@@ -1,4 +1,4 @@
-#include "Entrypoint/Backend.hpp"
+#include <Cplt/Entrypoint/Backend.hpp>
 
 #if BUILD_CORE_WITH_OPENGL3_BACKEND
 #	include <glad/glad.h>
diff --git a/core/src/Entrypoint/Backend_Vulkan.cpp b/app/source/Cplt/Entrypoint/Backend_Vulkan.cpp
index de3b5ca..280a82b 100644
--- a/core/src/Entrypoint/Backend_Vulkan.cpp
+++ b/app/source/Cplt/Entrypoint/Backend_Vulkan.cpp
@@ -1,4 +1,4 @@
-#include "Entrypoint/Backend.hpp"
+#include <Cplt/Entrypoint/Backend.hpp>
 
 #if BUILD_CORE_WITH_VULKAN_BACKEND
 #	include <iostream>
diff --git a/core/src/Entrypoint/main.cpp b/app/source/Cplt/Entrypoint/main.cpp
index abfb26c..8f67d32 100644
--- a/core/src/Entrypoint/main.cpp
+++ b/app/source/Cplt/Entrypoint/main.cpp
@@ -1,9 +1,9 @@
-#include "Entrypoint/Backend.hpp"
-#include "Model/GlobalStates.hpp"
-#include "UI/UI.hpp"
-#include "Utils/I18n.hpp"
-#include "Utils/ScopeGuard.hpp"
-#include "Utils/Sigslot.hpp"
+#include <Cplt/Entrypoint/Backend.hpp>
+#include <Cplt/Model/GlobalStates.hpp>
+#include <Cplt/UI/UI.hpp>
+#include <Cplt/Utils/I18n.hpp>
+#include <Cplt/Utils/ScopeGuard.hpp>
+#include <Cplt/Utils/Sigslot.hpp>
 
 #include <IconsFontAwesome.h>
 #include <imgui.h>
diff --git a/core/src/Locale/zh_CN.h b/app/source/Cplt/Locale/zh_CN.h
index f654464..f654464 100644
--- a/core/src/Locale/zh_CN.h
+++ b/app/source/Cplt/Locale/zh_CN.h
diff --git a/core/src/Model/Assets.cpp b/app/source/Cplt/Model/Assets.cpp
index fa29523..0dfe847 100644
--- a/core/src/Model/Assets.cpp
+++ b/app/source/Cplt/Model/Assets.cpp
@@ -1,10 +1,10 @@
 #include "Assets.hpp"
 
-#include "UI/UI.hpp"
-#include "Utils/I18n.hpp"
-#include "Utils/IO/DataStream.hpp"
-#include "Utils/IO/StringIntegration.hpp"
-#include "Utils/IO/UuidIntegration.hpp"
+#include <Cplt/UI/UI.hpp>
+#include <Cplt/Utils/I18n.hpp>
+#include <Cplt/Utils/IO/DataStream.hpp>
+#include <Cplt/Utils/IO/StringIntegration.hpp>
+#include <Cplt/Utils/IO/UuidIntegration.hpp>
 
 #include <IconsFontAwesome.h>
 #include <imgui.h>
diff --git a/core/src/Model/Assets.hpp b/app/source/Cplt/Model/Assets.hpp
index 3d90d3f..d2f8570 100644
--- a/core/src/Model/Assets.hpp
+++ b/app/source/Cplt/Model/Assets.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Utils/UUID.hpp"
-#include "cplt_fwd.hpp"
+#include <Cplt/Utils/UUID.hpp>
+#include <Cplt/fwd.hpp>
 
 #include <tsl/array_map.h>
 #include <filesystem>
diff --git a/core/src/Model/Database.cpp b/app/source/Cplt/Model/Database.cpp
index 569b949..07c6e36 100644
--- a/core/src/Model/Database.cpp
+++ b/app/source/Cplt/Model/Database.cpp
@@ -1,6 +1,6 @@
 #include "Database.hpp"
 
-#include "Model/Project.hpp"
+#include <Cplt/Model/Project.hpp>
 
 #include <filesystem>
 #include <stdexcept>
diff --git a/core/src/Model/Database.hpp b/app/source/Cplt/Model/Database.hpp
index 107baf6..222e43d 100644
--- a/core/src/Model/Database.hpp
+++ b/app/source/Cplt/Model/Database.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cplt_fwd.hpp"
+#include <Cplt/fwd.hpp>
 
 #include <SQLiteCpp/Database.h>
 #include <SQLiteCpp/Statement.h>
diff --git a/core/src/Model/Filter.cpp b/app/source/Cplt/Model/Filter.cpp
index 1e4b31b..1e4b31b 100644
--- a/core/src/Model/Filter.cpp
+++ b/app/source/Cplt/Model/Filter.cpp
diff --git a/core/src/Model/Filter.hpp b/app/source/Cplt/Model/Filter.hpp
index 1b923e1..1b923e1 100644
--- a/core/src/Model/Filter.hpp
+++ b/app/source/Cplt/Model/Filter.hpp
diff --git a/core/src/Model/GlobalStates.cpp b/app/source/Cplt/Model/GlobalStates.cpp
index a449afb..417514f 100644
--- a/core/src/Model/GlobalStates.cpp
+++ b/app/source/Cplt/Model/GlobalStates.cpp
@@ -1,7 +1,7 @@
 #include "GlobalStates.hpp"
 
-#include "Model/Project.hpp"
-#include "Utils/StandardDirectories.hpp"
+#include <Cplt/Model/Project.hpp>
+#include <Cplt/Utils/StandardDirectories.hpp>
 
 #include <json/reader.h>
 #include <json/value.h>
diff --git a/core/src/Model/GlobalStates.hpp b/app/source/Cplt/Model/GlobalStates.hpp
index cc41bd5..1eb47fb 100644
--- a/core/src/Model/GlobalStates.hpp
+++ b/app/source/Cplt/Model/GlobalStates.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Utils/Sigslot.hpp"
-#include "cplt_fwd.hpp"
+#include <Cplt/Utils/Sigslot.hpp>
+#include <Cplt/fwd.hpp>
 
 #include <filesystem>
 #include <string>
diff --git a/core/src/Model/Items.cpp b/app/source/Cplt/Model/Items.cpp
index 9d2abc6..9d2abc6 100644
--- a/core/src/Model/Items.cpp
+++ b/app/source/Cplt/Model/Items.cpp
diff --git a/core/src/Model/Items.hpp b/app/source/Cplt/Model/Items.hpp
index 859aedf..c00ee59 100644
--- a/core/src/Model/Items.hpp
+++ b/app/source/Cplt/Model/Items.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cplt_fwd.hpp"
+#include <Cplt/fwd.hpp>
 
 #include <json/reader.h>
 #include <json/value.h>
diff --git a/core/src/Model/Project.cpp b/app/source/Cplt/Model/Project.cpp
index 523ee9b..a1e9bab 100644
--- a/core/src/Model/Project.cpp
+++ b/app/source/Cplt/Model/Project.cpp
@@ -1,7 +1,7 @@
 #include "Project.hpp"
 
-#include "Model/Workflow/Workflow.hpp"
-#include "Utils/Macros.hpp"
+#include <Cplt/Model/Workflow/Workflow.hpp>
+#include <Cplt/Utils/Macros.hpp>
 
 #include <json/reader.h>
 #include <json/value.h>
diff --git a/core/src/Model/Project.hpp b/app/source/Cplt/Model/Project.hpp
index 17d9acb..8119a97 100644
--- a/core/src/Model/Project.hpp
+++ b/app/source/Cplt/Model/Project.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Model/Assets.hpp"
-#include "Model/Database.hpp"
-#include "Model/Items.hpp"
-#include "Model/Template/Template.hpp"
-#include "Model/Workflow/Workflow.hpp"
+#include <Cplt/Model/Assets.hpp>
+#include <Cplt/Model/Database.hpp>
+#include <Cplt/Model/Items.hpp>
+#include <Cplt/Model/Template/Template.hpp>
+#include <Cplt/Model/Workflow/Workflow.hpp>
 
 #include <json/forwards.h>
 #include <tsl/array_map.h>
diff --git a/core/src/Model/Template/TableTemplate.cpp b/app/source/Cplt/Model/Template/TableTemplate.cpp
index 57caac4..5cd9ed8 100644
--- a/core/src/Model/Template/TableTemplate.cpp
+++ b/app/source/Cplt/Model/Template/TableTemplate.cpp
@@ -1,8 +1,8 @@
 #include "TableTemplate.hpp"
 
-#include "Utils/IO/StringIntegration.hpp"
-#include "Utils/IO/TslArrayIntegration.hpp"
-#include "Utils/IO/VectorIntegration.hpp"
+#include <Cplt/Utils/IO/StringIntegration.hpp>
+#include <Cplt/Utils/IO/TslArrayIntegration.hpp>
+#include <Cplt/Utils/IO/VectorIntegration.hpp>
 
 #include <xlsxwriter.h>
 #include <algorithm>
diff --git a/core/src/Model/Template/TableTemplate.hpp b/app/source/Cplt/Model/Template/TableTemplate.hpp
index 8771867..3e931d4 100644
--- a/core/src/Model/Template/TableTemplate.hpp
+++ b/app/source/Cplt/Model/Template/TableTemplate.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Model/Template/Template.hpp"
-#include "Utils/Vector.hpp"
-#include "Utils/VectorHash.hpp"
-#include "cplt_fwd.hpp"
+#include <Cplt/Model/Template/Template.hpp>
+#include <Cplt/Utils/Vector.hpp>
+#include <Cplt/Utils/VectorHash.hpp>
+#include <Cplt/fwd.hpp>
 
 #include <tsl/array_map.h>
 #include <tsl/robin_map.h>
diff --git a/core/src/Model/Template/TableTemplateIterator.cpp b/app/source/Cplt/Model/Template/TableTemplateIterator.cpp
index 19e30b9..19e30b9 100644
--- a/core/src/Model/Template/TableTemplateIterator.cpp
+++ b/app/source/Cplt/Model/Template/TableTemplateIterator.cpp
diff --git a/core/src/Model/Template/TableTemplateIterator.hpp b/app/source/Cplt/Model/Template/TableTemplateIterator.hpp
index bf7f517..c4b5bf9 100644
--- a/core/src/Model/Template/TableTemplateIterator.hpp
+++ b/app/source/Cplt/Model/Template/TableTemplateIterator.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Model/Template/TableTemplate.hpp"
-#include "Model/Template/Template.hpp"
+#include <Cplt/Model/Template/TableTemplate.hpp>
+#include <Cplt/Model/Template/Template.hpp>
 
 #include <string_view>
 
diff --git a/core/src/Model/Template/Template.hpp b/app/source/Cplt/Model/Template/Template.hpp
index 061cc07..cf926d0 100644
--- a/core/src/Model/Template/Template.hpp
+++ b/app/source/Cplt/Model/Template/Template.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Model/Assets.hpp"
-#include "cplt_fwd.hpp"
+#include <Cplt/Model/Assets.hpp>
+#include <Cplt/fwd.hpp>
 
 #include <filesystem>
 #include <iosfwd>
diff --git a/core/src/Model/Template/Template_Main.cpp b/app/source/Cplt/Model/Template/Template_Main.cpp
index 4d6b67c..d658231 100644
--- a/core/src/Model/Template/Template_Main.cpp
+++ b/app/source/Cplt/Model/Template/Template_Main.cpp
@@ -1,11 +1,11 @@
 #include "Template.hpp"
 
-#include "Model/GlobalStates.hpp"
-#include "Model/Project.hpp"
-#include "UI/UI.hpp"
-#include "Utils/I18n.hpp"
-#include "Utils/IO/Archive.hpp"
-#include "Utils/UUID.hpp"
+#include <Cplt/Model/GlobalStates.hpp>
+#include <Cplt/Model/Project.hpp>
+#include <Cplt/UI/UI.hpp>
+#include <Cplt/Utils/I18n.hpp>
+#include <Cplt/Utils/IO/Archive.hpp>
+#include <Cplt/Utils/UUID.hpp>
 
 #include <imgui.h>
 #include <imgui_stdlib.h>
diff --git a/core/src/Model/Template/Template_RTTI.cpp b/app/source/Cplt/Model/Template/Template_RTTI.cpp
index d1affe7..a96680b 100644
--- a/core/src/Model/Template/Template_RTTI.cpp
+++ b/app/source/Cplt/Model/Template/Template_RTTI.cpp
@@ -1,7 +1,7 @@
 #include "Template.hpp"
 
-#include "Model/Template/TableTemplate.hpp"
-#include "Utils/I18n.hpp"
+#include <Cplt/Model/Template/TableTemplate.hpp>
+#include <Cplt/Utils/I18n.hpp>
 
 const char* Template::FormatKind(Kind kind)
 {
diff --git a/core/src/Model/Template/fwd.hpp b/app/source/Cplt/Model/Template/fwd.hpp
index 8378871..8378871 100644
--- a/core/src/Model/Template/fwd.hpp
+++ b/app/source/Cplt/Model/Template/fwd.hpp
diff --git a/core/src/Model/Workflow/Evaluation.cpp b/app/source/Cplt/Model/Workflow/Evaluation.cpp
index 7035bf9..7035bf9 100644
--- a/core/src/Model/Workflow/Evaluation.cpp
+++ b/app/source/Cplt/Model/Workflow/Evaluation.cpp
diff --git a/core/src/Model/Workflow/Evaluation.hpp b/app/source/Cplt/Model/Workflow/Evaluation.hpp
index 4d78872..5b8c6cc 100644
--- a/core/src/Model/Workflow/Evaluation.hpp
+++ b/app/source/Cplt/Model/Workflow/Evaluation.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/Workflow/Workflow.hpp"
+#include <Cplt/Model/Workflow/Workflow.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/core/src/Model/Workflow/Nodes/DocumentNodes.cpp b/app/source/Cplt/Model/Workflow/Nodes/DocumentNodes.cpp
index 6729c63..df4a8bb 100644
--- a/core/src/Model/Workflow/Nodes/DocumentNodes.cpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/DocumentNodes.cpp
@@ -1,7 +1,7 @@
 #include "DocumentNodes.hpp"
 
-#include "Model/Workflow/Evaluation.hpp"
-#include "Model/Workflow/Values/Basic.hpp"
+#include <Cplt/Model/Workflow/Evaluation.hpp>
+#include <Cplt/Model/Workflow/Values/Basic.hpp>
 
 bool DocumentTemplateExpansionNode::IsInstance(const WorkflowNode* node)
 {
diff --git a/core/src/Model/Workflow/Nodes/DocumentNodes.hpp b/app/source/Cplt/Model/Workflow/Nodes/DocumentNodes.hpp
index 85bba9e..a266b2c 100644
--- a/core/src/Model/Workflow/Nodes/DocumentNodes.hpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/DocumentNodes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/Workflow/Workflow.hpp"
+#include <Cplt/Model/Workflow/Workflow.hpp>
 
 class DocumentTemplateExpansionNode : public WorkflowNode
 {
diff --git a/core/src/Model/Workflow/Nodes/NumericNodes.cpp b/app/source/Cplt/Model/Workflow/Nodes/NumericNodes.cpp
index 3a81979..f8b29bb 100644
--- a/core/src/Model/Workflow/Nodes/NumericNodes.cpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/NumericNodes.cpp
@@ -1,10 +1,10 @@
 #include "NumericNodes.hpp"
 
-#include "Model/Workflow/Evaluation.hpp"
-#include "Model/Workflow/Values/Basic.hpp"
-#include "Utils/I18n.hpp"
-#include "Utils/Macros.hpp"
-#include "Utils/RTTI.hpp"
+#include <Cplt/Model/Workflow/Evaluation.hpp>
+#include <Cplt/Model/Workflow/Values/Basic.hpp>
+#include <Cplt/Utils/I18n.hpp>
+#include <Cplt/Utils/Macros.hpp>
+#include <Cplt/Utils/RTTI.hpp>
 
 #include <cassert>
 #include <utility>
diff --git a/core/src/Model/Workflow/Nodes/NumericNodes.hpp b/app/source/Cplt/Model/Workflow/Nodes/NumericNodes.hpp
index 56c0313..3c89708 100644
--- a/core/src/Model/Workflow/Nodes/NumericNodes.hpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/NumericNodes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/Workflow/Workflow.hpp"
+#include <Cplt/Model/Workflow/Workflow.hpp>
 
 #include <cstddef>
 #include <memory>
diff --git a/core/src/Model/Workflow/Nodes/TextNodes.cpp b/app/source/Cplt/Model/Workflow/Nodes/TextNodes.cpp
index 4628dd3..9b31f7a 100644
--- a/core/src/Model/Workflow/Nodes/TextNodes.cpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/TextNodes.cpp
@@ -1,10 +1,10 @@
 #include "TextNodes.hpp"
 
-#include "Model/Workflow/Evaluation.hpp"
-#include "Model/Workflow/Values/Basic.hpp"
-#include "Utils/Macros.hpp"
-#include "Utils/RTTI.hpp"
-#include "Utils/Variant.hpp"
+#include <Cplt/Model/Workflow/Evaluation.hpp>
+#include <Cplt/Model/Workflow/Values/Basic.hpp>
+#include <Cplt/Utils/Macros.hpp>
+#include <Cplt/Utils/RTTI.hpp>
+#include <Cplt/Utils/Variant.hpp>
 
 #include <cassert>
 #include <utility>
diff --git a/core/src/Model/Workflow/Nodes/TextNodes.hpp b/app/source/Cplt/Model/Workflow/Nodes/TextNodes.hpp
index c33854c..4689931 100644
--- a/core/src/Model/Workflow/Nodes/TextNodes.hpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/TextNodes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/Workflow/Workflow.hpp"
+#include <Cplt/Model/Workflow/Workflow.hpp>
 
 #include <cstddef>
 #include <memory>
diff --git a/core/src/Model/Workflow/Nodes/UserInputNodes.cpp b/app/source/Cplt/Model/Workflow/Nodes/UserInputNodes.cpp
index 0b6d471..93d458c 100644
--- a/core/src/Model/Workflow/Nodes/UserInputNodes.cpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/UserInputNodes.cpp
@@ -1,7 +1,7 @@
 #include "UserInputNodes.hpp"
 
-#include "Model/Workflow/Evaluation.hpp"
-#include "Model/Workflow/Values/Basic.hpp"
+#include <Cplt/Model/Workflow/Evaluation.hpp>
+#include <Cplt/Model/Workflow/Values/Basic.hpp>
 
 bool FormInputNode::IsInstance(const WorkflowNode* node)
 {
diff --git a/core/src/Model/Workflow/Nodes/UserInputNodes.hpp b/app/source/Cplt/Model/Workflow/Nodes/UserInputNodes.hpp
index 10ea95d..f0b923c 100644
--- a/core/src/Model/Workflow/Nodes/UserInputNodes.hpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/UserInputNodes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/Workflow/Workflow.hpp"
+#include <Cplt/Model/Workflow/Workflow.hpp>
 
 class FormInputNode : public WorkflowNode
 {
diff --git a/core/src/Model/Workflow/Nodes/fwd.hpp b/app/source/Cplt/Model/Workflow/Nodes/fwd.hpp
index 4153825..4153825 100644
--- a/core/src/Model/Workflow/Nodes/fwd.hpp
+++ b/app/source/Cplt/Model/Workflow/Nodes/fwd.hpp
diff --git a/core/src/Model/Workflow/Value.hpp b/app/source/Cplt/Model/Workflow/Value.hpp
index 2198674..70fcb57 100644
--- a/core/src/Model/Workflow/Value.hpp
+++ b/app/source/Cplt/Model/Workflow/Value.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Utils/Color.hpp"
-#include "cplt_fwd.hpp"
+#include <Cplt/Utils/Color.hpp>
+#include <Cplt/fwd.hpp>
 
 #include <iosfwd>
 #include <memory>
diff --git a/core/src/Model/Workflow/ValueInternals.hpp b/app/source/Cplt/Model/Workflow/ValueInternals.hpp
index 49981f0..45842db 100644
--- a/core/src/Model/Workflow/ValueInternals.hpp
+++ b/app/source/Cplt/Model/Workflow/ValueInternals.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Utils/RTTI.hpp"
+#include <Cplt/Utils/RTTI.hpp>
 
 #include <utility>
 
diff --git a/core/src/Model/Workflow/Value_Main.cpp b/app/source/Cplt/Model/Workflow/Value_Main.cpp
index ca972c4..ca972c4 100644
--- a/core/src/Model/Workflow/Value_Main.cpp
+++ b/app/source/Cplt/Model/Workflow/Value_Main.cpp
diff --git a/core/src/Model/Workflow/Value_RTTI.cpp b/app/source/Cplt/Model/Workflow/Value_RTTI.cpp
index 0561239..a2a6960 100644
--- a/core/src/Model/Workflow/Value_RTTI.cpp
+++ b/app/source/Cplt/Model/Workflow/Value_RTTI.cpp
@@ -1,11 +1,11 @@
 #include "Value.hpp"
 
-#include "Model/Workflow/Values/Basic.hpp"
-#include "Model/Workflow/Values/Database.hpp"
-#include "Model/Workflow/Values/Dictionary.hpp"
-#include "Model/Workflow/Values/List.hpp"
-#include "UI/UI.hpp"
-#include "Utils/I18n.hpp"
+#include <Cplt/Model/Workflow/Values/Basic.hpp>
+#include <Cplt/Model/Workflow/Values/Database.hpp>
+#include <Cplt/Model/Workflow/Values/Dictionary.hpp>
+#include <Cplt/Model/Workflow/Values/List.hpp>
+#include <Cplt/UI/UI.hpp>
+#include <Cplt/Utils/I18n.hpp>
 
 constexpr BaseValue::KindInfo kEmptyInfo{
 	.PinIcon = ImGui::IconType::Circle,
diff --git a/core/src/Model/Workflow/Values/Basic.cpp b/app/source/Cplt/Model/Workflow/Values/Basic.cpp
index 198387c..198387c 100644
--- a/core/src/Model/Workflow/Values/Basic.cpp
+++ b/app/source/Cplt/Model/Workflow/Values/Basic.cpp
diff --git a/core/src/Model/Workflow/Values/Basic.hpp b/app/source/Cplt/Model/Workflow/Values/Basic.hpp
index 38e0531..820fb13 100644
--- a/core/src/Model/Workflow/Values/Basic.hpp
+++ b/app/source/Cplt/Model/Workflow/Values/Basic.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/Workflow/Value.hpp"
+#include <Cplt/Model/Workflow/Value.hpp>
 
 #include <chrono>
 #include <cstdint>
diff --git a/core/src/Model/Workflow/Values/Database.cpp b/app/source/Cplt/Model/Workflow/Values/Database.cpp
index cdc2b4f..25b77e9 100644
--- a/core/src/Model/Workflow/Values/Database.cpp
+++ b/app/source/Cplt/Model/Workflow/Values/Database.cpp
@@ -1,7 +1,7 @@
 #include "Database.hpp"
 
-#include "Model/Database.hpp"
-#include "Model/Workflow/ValueInternals.hpp"
+#include <Cplt/Model/Database.hpp>
+#include <Cplt/Model/Workflow/ValueInternals.hpp>
 
 #include <limits>
 
diff --git a/core/src/Model/Workflow/Values/Database.hpp b/app/source/Cplt/Model/Workflow/Values/Database.hpp
index e8a4f83..f1c1571 100644
--- a/core/src/Model/Workflow/Values/Database.hpp
+++ b/app/source/Cplt/Model/Workflow/Values/Database.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Model/Workflow/Value.hpp"
-#include "Model/Workflow/Values/Basic.hpp"
-#include "cplt_fwd.hpp"
+#include <Cplt/Model/Workflow/Value.hpp>
+#include <Cplt/Model/Workflow/Values/Basic.hpp>
+#include <Cplt/fwd.hpp>
 
 class DatabaseRowIdValue : public BaseValue
 {
diff --git a/core/src/Model/Workflow/Values/Dictionary.cpp b/app/source/Cplt/Model/Workflow/Values/Dictionary.cpp
index 106e48d..97bf509 100644
--- a/core/src/Model/Workflow/Values/Dictionary.cpp
+++ b/app/source/Cplt/Model/Workflow/Values/Dictionary.cpp
@@ -1,6 +1,6 @@
 #include "Dictionary.hpp"
 
-#include "Utils/Macros.hpp"
+#include <Cplt/Utils/Macros.hpp>
 
 bool DictionaryValue::IsInstance(const BaseValue* value)
 {
diff --git a/core/src/Model/Workflow/Values/Dictionary.hpp b/app/source/Cplt/Model/Workflow/Values/Dictionary.hpp
index 65ea82f..6eff308 100644
--- a/core/src/Model/Workflow/Values/Dictionary.hpp
+++ b/app/source/Cplt/Model/Workflow/Values/Dictionary.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/Workflow/Value.hpp"
+#include <Cplt/Model/Workflow/Value.hpp>
 
 #include <tsl/array_map.h>
 #include <memory>
diff --git a/core/src/Model/Workflow/Values/List.cpp b/app/source/Cplt/Model/Workflow/Values/List.cpp
index 9fd6bfd..9fd6bfd 100644
--- a/core/src/Model/Workflow/Values/List.cpp
+++ b/app/source/Cplt/Model/Workflow/Values/List.cpp
diff --git a/core/src/Model/Workflow/Values/List.hpp b/app/source/Cplt/Model/Workflow/Values/List.hpp
index 706a95c..cc8e061 100644
--- a/core/src/Model/Workflow/Values/List.hpp
+++ b/app/source/Cplt/Model/Workflow/Values/List.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Model/Workflow/Value.hpp"
+#include <Cplt/Model/Workflow/Value.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/core/src/Model/Workflow/Values/fwd.hpp b/app/source/Cplt/Model/Workflow/Values/fwd.hpp
index 51a04e9..51a04e9 100644
--- a/core/src/Model/Workflow/Values/fwd.hpp
+++ b/app/source/Cplt/Model/Workflow/Values/fwd.hpp
diff --git a/core/src/Model/Workflow/Workflow.hpp b/app/source/Cplt/Model/Workflow/Workflow.hpp
index 3c4d320..e075e3c 100644
--- a/core/src/Model/Workflow/Workflow.hpp
+++ b/app/source/Cplt/Model/Workflow/Workflow.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Model/Assets.hpp"
-#include "Model/Workflow/Value.hpp"
-#include "Utils/Vector.hpp"
-#include "cplt_fwd.hpp"
+#include <Cplt/Model/Assets.hpp>
+#include <Cplt/Model/Workflow/Value.hpp>
+#include <Cplt/Utils/Vector.hpp>
+#include <Cplt/fwd.hpp>
 
 #include <imgui_node_editor.h>
 #include <cstddef>
diff --git a/core/src/Model/Workflow/Workflow_Main.cpp b/app/source/Cplt/Model/Workflow/Workflow_Main.cpp
index 3be2d4d..0f35b32 100644
--- a/core/src/Model/Workflow/Workflow_Main.cpp
+++ b/app/source/Cplt/Model/Workflow/Workflow_Main.cpp
@@ -1,11 +1,11 @@
 #include "Workflow.hpp"
 
-#include "Model/GlobalStates.hpp"
-#include "Model/Project.hpp"
-#include "UI/UI.hpp"
-#include "Utils/I18n.hpp"
-#include "Utils/IO/Archive.hpp"
-#include "Utils/UUID.hpp"
+#include <Cplt/Model/GlobalStates.hpp>
+#include <Cplt/Model/Project.hpp>
+#include <Cplt/UI/UI.hpp>
+#include <Cplt/Utils/I18n.hpp>
+#include <Cplt/Utils/IO/Archive.hpp>
+#include <Cplt/Utils/UUID.hpp>
 
 #include <imgui.h>
 #include <imgui_node_editor.h>
diff --git a/core/src/Model/Workflow/Workflow_RTTI.cpp b/app/source/Cplt/Model/Workflow/Workflow_RTTI.cpp
index cb66c69..ee3da28 100644
--- a/core/src/Model/Workflow/Workflow_RTTI.cpp
+++ b/app/source/Cplt/Model/Workflow/Workflow_RTTI.cpp
@@ -1,11 +1,11 @@
 #include "Workflow.hpp"
 
-#include "Model/Workflow/Nodes/DocumentNodes.hpp"
-#include "Model/Workflow/Nodes/NumericNodes.hpp"
-#include "Model/Workflow/Nodes/TextNodes.hpp"
-#include "Model/Workflow/Nodes/UserInputNodes.hpp"
-#include "Utils/I18n.hpp"
-#include "Utils/Macros.hpp"
+#include <Cplt/Model/Workflow/Nodes/DocumentNodes.hpp>
+#include <Cplt/Model/Workflow/Nodes/NumericNodes.hpp>
+#include <Cplt/Model/Workflow/Nodes/TextNodes.hpp>
+#include <Cplt/Model/Workflow/Nodes/UserInputNodes.hpp>
+#include <Cplt/Utils/I18n.hpp>
+#include <Cplt/Utils/Macros.hpp>
 
 #include <memory>
 
diff --git a/core/src/Model/Workflow/fwd.hpp b/app/source/Cplt/Model/Workflow/fwd.hpp
index ed39bdb..ce5b6db 100644
--- a/core/src/Model/Workflow/fwd.hpp
+++ b/app/source/Cplt/Model/Workflow/fwd.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Model/Workflow/Nodes/fwd.hpp"
-#include "Model/Workflow/Values/fwd.hpp"
+#include <Cplt/Model/Workflow/Nodes/fwd.hpp>
+#include <Cplt/Model/Workflow/Values/fwd.hpp>
 
 // Evaluation.hpp
 class WorkflowEvaluationError;
diff --git a/core/src/Model/fwd.hpp b/app/source/Cplt/Model/fwd.hpp
index 358fc49..c7e44e6 100644
--- a/core/src/Model/fwd.hpp
+++ b/app/source/Cplt/Model/fwd.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Model/Template/fwd.hpp"
-#include "Model/Workflow/fwd.hpp"
+#include <Cplt/Model/Template/fwd.hpp>
+#include <Cplt/Model/Workflow/fwd.hpp>
 
 // Database.hpp
 enum class TableKind;
diff --git a/core/src/UI/UI.hpp b/app/source/Cplt/UI/UI.hpp
index 0a80b4c..0a80b4c 100644
--- a/core/src/UI/UI.hpp
+++ b/app/source/Cplt/UI/UI.hpp
diff --git a/core/src/UI/UI_DatabaseView.cpp b/app/source/Cplt/UI/UI_DatabaseView.cpp
index e128a59..1e58eb0 100644
--- a/core/src/UI/UI_DatabaseView.cpp
+++ b/app/source/Cplt/UI/UI_DatabaseView.cpp
@@ -1,11 +1,11 @@
 #include "UI.hpp"
 
-#include "Model/Filter.hpp"
-#include "Model/GlobalStates.hpp"
-#include "Model/Project.hpp"
-#include "Utils/I18n.hpp"
-#include "Utils/ScopeGuard.hpp"
-#include "Utils/Time.hpp"
+#include <Cplt/Model/Filter.hpp>
+#include <Cplt/Model/GlobalStates.hpp>
+#include <Cplt/Model/Project.hpp>
+#include <Cplt/Utils/I18n.hpp>
+#include <Cplt/Utils/ScopeGuard.hpp>
+#include <Cplt/Utils/Time.hpp>
 
 #include <IconsFontAwesome.h>
 #include <SQLiteCpp/Statement.h>
diff --git a/core/src/UI/UI_Items.cpp b/app/source/Cplt/UI/UI_Items.cpp
index a33c61b..0170e1a 100644
--- a/core/src/UI/UI_Items.cpp
+++ b/app/source/Cplt/UI/UI_Items.cpp
@@ -1,8 +1,8 @@
 #include "UI.hpp"
 
-#include "Model/GlobalStates.hpp"
-#include "Model/Project.hpp"
-#include "Utils/I18n.hpp"
+#include <Cplt/Model/GlobalStates.hpp>
+#include <Cplt/Model/Project.hpp>
+#include <Cplt/Utils/I18n.hpp>
 
 #include <IconsFontAwesome.h>
 #include <imgui.h>
diff --git a/core/src/UI/UI_MainWindow.cpp b/app/source/Cplt/UI/UI_MainWindow.cpp
index d059359..4653f79 100644
--- a/core/src/UI/UI_MainWindow.cpp
+++ b/app/source/Cplt/UI/UI_MainWindow.cpp
@@ -1,8 +1,8 @@
 #include "UI.hpp"
 
-#include "Model/GlobalStates.hpp"
-#include "Model/Project.hpp"
-#include "Utils/I18n.hpp"
+#include <Cplt/Model/GlobalStates.hpp>
+#include <Cplt/Model/Project.hpp>
+#include <Cplt/Utils/I18n.hpp>
 
 #include <IconsFontAwesome.h>
 #include <imgui.h>
diff --git a/core/src/UI/UI_Settings.cpp b/app/source/Cplt/UI/UI_Settings.cpp
index 107b94c..71a752a 100644
--- a/core/src/UI/UI_Settings.cpp
+++ b/app/source/Cplt/UI/UI_Settings.cpp
@@ -1,4 +1,4 @@
-#include "UI/UI.hpp"
+#include <Cplt/UI/UI.hpp>
 
 #include <imgui.h>
 
diff --git a/core/src/UI/UI_Templates.cpp b/app/source/Cplt/UI/UI_Templates.cpp
index cd15cb7..e01a97d 100644
--- a/core/src/UI/UI_Templates.cpp
+++ b/app/source/Cplt/UI/UI_Templates.cpp
@@ -1,11 +1,11 @@
 #include "UI.hpp"
 
-#include "Model/GlobalStates.hpp"
-#include "Model/Project.hpp"
-#include "Model/Template/TableTemplate.hpp"
-#include "Model/Template/TableTemplateIterator.hpp"
-#include "Model/Template/Template.hpp"
-#include "Utils/I18n.hpp"
+#include <Cplt/Model/GlobalStates.hpp>
+#include <Cplt/Model/Project.hpp>
+#include <Cplt/Model/Template/TableTemplate.hpp>
+#include <Cplt/Model/Template/TableTemplateIterator.hpp>
+#include <Cplt/Model/Template/Template.hpp>
+#include <Cplt/Utils/I18n.hpp>
 
 #include <IconsFontAwesome.h>
 #include <imgui.h>
diff --git a/core/src/UI/UI_Utils.cpp b/app/source/Cplt/UI/UI_Utils.cpp
index a2bf692..a2bf692 100644
--- a/core/src/UI/UI_Utils.cpp
+++ b/app/source/Cplt/UI/UI_Utils.cpp
diff --git a/core/src/UI/UI_Workflows.cpp b/app/source/Cplt/UI/UI_Workflows.cpp
index c85850a..5eea53a 100644
--- a/core/src/UI/UI_Workflows.cpp
+++ b/app/source/Cplt/UI/UI_Workflows.cpp
@@ -1,14 +1,14 @@
 #include "UI.hpp"
 
-#include "Model/GlobalStates.hpp"
-#include "Model/Project.hpp"
-#include "Model/Workflow/Nodes/DocumentNodes.hpp"
-#include "Model/Workflow/Nodes/NumericNodes.hpp"
-#include "Model/Workflow/Nodes/TextNodes.hpp"
-#include "Model/Workflow/Nodes/UserInputNodes.hpp"
-#include "Model/Workflow/Workflow.hpp"
-#include "Utils/I18n.hpp"
-#include "Utils/Macros.hpp"
+#include <Cplt/Model/GlobalStates.hpp>
+#include <Cplt/Model/Project.hpp>
+#include <Cplt/Model/Workflow/Nodes/DocumentNodes.hpp>
+#include <Cplt/Model/Workflow/Nodes/NumericNodes.hpp>
+#include <Cplt/Model/Workflow/Nodes/TextNodes.hpp>
+#include <Cplt/Model/Workflow/Nodes/UserInputNodes.hpp>
+#include <Cplt/Model/Workflow/Workflow.hpp>
+#include <Cplt/Utils/I18n.hpp>
+#include <Cplt/Utils/Macros.hpp>
 
 #include <IconsFontAwesome.h>
 #include <imgui.h>
diff --git a/core/src/UI/fwd.hpp b/app/source/Cplt/UI/fwd.hpp
index 756e567..756e567 100644
--- a/core/src/UI/fwd.hpp
+++ b/app/source/Cplt/UI/fwd.hpp
diff --git a/core/src/Utils/Color.hpp b/app/source/Cplt/Utils/Color.hpp
index 19227e0..15fe6a1 100644
--- a/core/src/Utils/Color.hpp
+++ b/app/source/Cplt/Utils/Color.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Utils/Math.hpp"
-#include "Utils/Vector.hpp"
-#include "Utils/fwd.hpp"
+#include <Cplt/Utils/Math.hpp>
+#include <Cplt/Utils/Vector.hpp>
+#include <Cplt/Utils/fwd.hpp>
 
 #include <imgui.h>
 #include <algorithm>
diff --git a/core/src/Utils/Hash.hpp b/app/source/Cplt/Utils/Hash.hpp
index cf7713a..cf7713a 100644
--- a/core/src/Utils/Hash.hpp
+++ b/app/source/Cplt/Utils/Hash.hpp
diff --git a/core/src/Utils/I18n.hpp b/app/source/Cplt/Utils/I18n.hpp
index e9eaac9..895856a 100644
--- a/core/src/Utils/I18n.hpp
+++ b/app/source/Cplt/Utils/I18n.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/Macros.hpp"
+#include <Cplt/Utils/Macros.hpp>
 
 #if !defined(TARGET_LOCALE)
 #	define I18N_TEXT(defaultText, name) defaultText
diff --git a/core/src/Utils/IO/Archive.cpp b/app/source/Cplt/Utils/IO/Archive.cpp
index f6e7b27..f6e7b27 100644
--- a/core/src/Utils/IO/Archive.cpp
+++ b/app/source/Cplt/Utils/IO/Archive.cpp
diff --git a/core/src/Utils/IO/Archive.hpp b/app/source/Cplt/Utils/IO/Archive.hpp
index 1bb8b59..7632f3b 100644
--- a/core/src/Utils/IO/Archive.hpp
+++ b/app/source/Cplt/Utils/IO/Archive.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/IO/DataStream.hpp"
+#include <Cplt/Utils/IO/DataStream.hpp>
 
 #include <cstdint>
 #include <filesystem>
diff --git a/core/src/Utils/IO/CstdioFile.cpp b/app/source/Cplt/Utils/IO/CstdioFile.cpp
index 0f6378a..c414dfb 100644
--- a/core/src/Utils/IO/CstdioFile.cpp
+++ b/app/source/Cplt/Utils/IO/CstdioFile.cpp
@@ -1,6 +1,6 @@
 #include "CstdioFile.hpp"
 
-#include "Utils/Macros.hpp"
+#include <Cplt/Utils/Macros.hpp>
 
 #pragma push_macro("MODE_STRING")
 #undef MODE_STRING
diff --git a/core/src/Utils/IO/CstdioFile.hpp b/app/source/Cplt/Utils/IO/CstdioFile.hpp
index e863dd5..e863dd5 100644
--- a/core/src/Utils/IO/CstdioFile.hpp
+++ b/app/source/Cplt/Utils/IO/CstdioFile.hpp
diff --git a/core/src/Utils/IO/DataStream.cpp b/app/source/Cplt/Utils/IO/DataStream.cpp
index c0797e3..c0797e3 100644
--- a/core/src/Utils/IO/DataStream.cpp
+++ b/app/source/Cplt/Utils/IO/DataStream.cpp
diff --git a/core/src/Utils/IO/DataStream.hpp b/app/source/Cplt/Utils/IO/DataStream.hpp
index c0891ac..133adc2 100644
--- a/core/src/Utils/IO/DataStream.hpp
+++ b/app/source/Cplt/Utils/IO/DataStream.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FileStream.hpp"
-#include "cplt_fwd.hpp"
+#include <Cplt/fwd.hpp>
 
 #include <bit>
 #include <cstddef>
diff --git a/core/src/Utils/IO/FileStream.cpp b/app/source/Cplt/Utils/IO/FileStream.cpp
index 8b83712..8b83712 100644
--- a/core/src/Utils/IO/FileStream.cpp
+++ b/app/source/Cplt/Utils/IO/FileStream.cpp
diff --git a/core/src/Utils/IO/FileStream.hpp b/app/source/Cplt/Utils/IO/FileStream.hpp
index 453ddbe..453ddbe 100644
--- a/core/src/Utils/IO/FileStream.hpp
+++ b/app/source/Cplt/Utils/IO/FileStream.hpp
diff --git a/core/src/Utils/IO/FileStream_Cstdio.inl b/app/source/Cplt/Utils/IO/FileStream_Cstdio.inl
index ee55681..ff2ca01 100644
--- a/core/src/Utils/IO/FileStream_Cstdio.inl
+++ b/app/source/Cplt/Utils/IO/FileStream_Cstdio.inl
@@ -1,7 +1,7 @@
 // Note: included by FileStream.cpp conditionally, not compiled separately
 #include "FileStream.hpp"
 
-#include "Utils/IO/CstdioFile.hpp"
+#include <Cplt/Utils/IO/CstdioFile.hpp>
 
 #include <cstdio>
 #include <filesystem>
diff --git a/core/src/Utils/IO/FileStream_Custom.inl b/app/source/Cplt/Utils/IO/FileStream_Custom.inl
index 004dd01..004dd01 100644
--- a/core/src/Utils/IO/FileStream_Custom.inl
+++ b/app/source/Cplt/Utils/IO/FileStream_Custom.inl
diff --git a/core/src/Utils/IO/Helper.hpp b/app/source/Cplt/Utils/IO/Helper.hpp
index ebd47a7..7a84103 100644
--- a/core/src/Utils/IO/Helper.hpp
+++ b/app/source/Cplt/Utils/IO/Helper.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/IO/DataStream.hpp"
+#include <Cplt/Utils/IO/DataStream.hpp>
 
 namespace DataStreamAdapters {
 
diff --git a/core/src/Utils/IO/StringIntegration.hpp b/app/source/Cplt/Utils/IO/StringIntegration.hpp
index 536cb83..66f42b0 100644
--- a/core/src/Utils/IO/StringIntegration.hpp
+++ b/app/source/Cplt/Utils/IO/StringIntegration.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/IO/DataStream.hpp"
+#include <Cplt/Utils/IO/DataStream.hpp>
 
 #include <iterator>
 #include <string>
diff --git a/core/src/Utils/IO/TslArrayIntegration.hpp b/app/source/Cplt/Utils/IO/TslArrayIntegration.hpp
index af1197c..b585bee 100644
--- a/core/src/Utils/IO/TslArrayIntegration.hpp
+++ b/app/source/Cplt/Utils/IO/TslArrayIntegration.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Utils/IO/DataStream.hpp"
-#include "Utils/IO/Helper.hpp"
-#include "Utils/IO/StringIntegration.hpp"
+#include <Cplt/Utils/IO/DataStream.hpp>
+#include <Cplt/Utils/IO/Helper.hpp>
+#include <Cplt/Utils/IO/StringIntegration.hpp>
 
 #include <tsl/array_map.h>
 #include <tsl/array_set.h>
diff --git a/core/src/Utils/IO/TslRobinIntegration.hpp b/app/source/Cplt/Utils/IO/TslRobinIntegration.hpp
index 50775fe..bdea505 100644
--- a/core/src/Utils/IO/TslRobinIntegration.hpp
+++ b/app/source/Cplt/Utils/IO/TslRobinIntegration.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Utils/IO/DataStream.hpp"
-#include "Utils/IO/Helper.hpp"
+#include <Cplt/Utils/IO/DataStream.hpp>
+#include <Cplt/Utils/IO/Helper.hpp>
 
 #include <tsl/robin_map.h>
 #include <tsl/robin_set.h>
diff --git a/core/src/Utils/IO/UuidIntegration.hpp b/app/source/Cplt/Utils/IO/UuidIntegration.hpp
index d028c50..20c1e7e 100644
--- a/core/src/Utils/IO/UuidIntegration.hpp
+++ b/app/source/Cplt/Utils/IO/UuidIntegration.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Utils/IO/DataStream.hpp"
-#include "Utils/UUID.hpp"
+#include <Cplt/Utils/IO/DataStream.hpp>
+#include <Cplt/Utils/UUID.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/core/src/Utils/IO/VectorIntegration.hpp b/app/source/Cplt/Utils/IO/VectorIntegration.hpp
index 3689505..93967f6 100644
--- a/core/src/Utils/IO/VectorIntegration.hpp
+++ b/app/source/Cplt/Utils/IO/VectorIntegration.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Utils/IO/DataStream.hpp"
-#include "Utils/IO/Helper.hpp"
+#include <Cplt/Utils/IO/DataStream.hpp>
+#include <Cplt/Utils/IO/Helper.hpp>
 
 #include <type_traits>
 #include <vector>
diff --git a/core/src/Utils/IO/fwd.hpp b/app/source/Cplt/Utils/IO/fwd.hpp
index 9f1492b..9f1492b 100644
--- a/core/src/Utils/IO/fwd.hpp
+++ b/app/source/Cplt/Utils/IO/fwd.hpp
diff --git a/core/src/Utils/Macros.hpp b/app/source/Cplt/Utils/Macros.hpp
index 6958ed1..6958ed1 100644
--- a/core/src/Utils/Macros.hpp
+++ b/app/source/Cplt/Utils/Macros.hpp
diff --git a/core/src/Utils/Math.hpp b/app/source/Cplt/Utils/Math.hpp
index da53da2..da53da2 100644
--- a/core/src/Utils/Math.hpp
+++ b/app/source/Cplt/Utils/Math.hpp
diff --git a/core/src/Utils/RTTI.hpp b/app/source/Cplt/Utils/RTTI.hpp
index 86b1e2c..86b1e2c 100644
--- a/core/src/Utils/RTTI.hpp
+++ b/app/source/Cplt/Utils/RTTI.hpp
diff --git a/core/src/Utils/ScopeGuard.hpp b/app/source/Cplt/Utils/ScopeGuard.hpp
index 28ffd0b..f2b7f46 100644
--- a/core/src/Utils/ScopeGuard.hpp
+++ b/app/source/Cplt/Utils/ScopeGuard.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/Macros.hpp"
+#include <Cplt/Utils/Macros.hpp>
 
 #include <utility>
 
diff --git a/core/src/Utils/Sigslot.cpp b/app/source/Cplt/Utils/Sigslot.cpp
index 1132dfb..1132dfb 100644
--- a/core/src/Utils/Sigslot.cpp
+++ b/app/source/Cplt/Utils/Sigslot.cpp
diff --git a/core/src/Utils/Sigslot.hpp b/app/source/Cplt/Utils/Sigslot.hpp
index 5638f12..a4ab94e 100644
--- a/core/src/Utils/Sigslot.hpp
+++ b/app/source/Cplt/Utils/Sigslot.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/fwd.hpp"
+#include <Cplt/Utils/fwd.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/core/src/Utils/Size.hpp b/app/source/Cplt/Utils/Size.hpp
index 98be41a..ae38e8a 100644
--- a/core/src/Utils/Size.hpp
+++ b/app/source/Cplt/Utils/Size.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/Vector.hpp"
+#include <Cplt/Utils/Vector.hpp>
 
 template <class T>
 class Size2 {
diff --git a/core/src/Utils/StandardDirectories.cpp b/app/source/Cplt/Utils/StandardDirectories.cpp
index 2202f51..2202f51 100644
--- a/core/src/Utils/StandardDirectories.cpp
+++ b/app/source/Cplt/Utils/StandardDirectories.cpp
diff --git a/core/src/Utils/StandardDirectories.hpp b/app/source/Cplt/Utils/StandardDirectories.hpp
index 4f7e5e2..4f7e5e2 100644
--- a/core/src/Utils/StandardDirectories.hpp
+++ b/app/source/Cplt/Utils/StandardDirectories.hpp
diff --git a/core/src/Utils/Time.cpp b/app/source/Cplt/Utils/Time.cpp
index 4e79ffa..4e79ffa 100644
--- a/core/src/Utils/Time.cpp
+++ b/app/source/Cplt/Utils/Time.cpp
diff --git a/core/src/Utils/Time.hpp b/app/source/Cplt/Utils/Time.hpp
index fbbd3b2..fbbd3b2 100644
--- a/core/src/Utils/Time.hpp
+++ b/app/source/Cplt/Utils/Time.hpp
diff --git a/core/src/Utils/UUID.hpp b/app/source/Cplt/Utils/UUID.hpp
index 9044aa6..9044aa6 100644
--- a/core/src/Utils/UUID.hpp
+++ b/app/source/Cplt/Utils/UUID.hpp
diff --git a/core/src/Utils/Variant.hpp b/app/source/Cplt/Utils/Variant.hpp
index df2f882..df2f882 100644
--- a/core/src/Utils/Variant.hpp
+++ b/app/source/Cplt/Utils/Variant.hpp
diff --git a/core/src/Utils/Vector.hpp b/app/source/Cplt/Utils/Vector.hpp
index 4d3f3b3..79f4ea2 100644
--- a/core/src/Utils/Vector.hpp
+++ b/app/source/Cplt/Utils/Vector.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/IO/DataStream.hpp"
+#include <Cplt/Utils/IO/DataStream.hpp>
 
 template <class T>
 struct Vec2
diff --git a/core/src/Utils/VectorHash.hpp b/app/source/Cplt/Utils/VectorHash.hpp
index 7df9c35..f649367 100644
--- a/core/src/Utils/VectorHash.hpp
+++ b/app/source/Cplt/Utils/VectorHash.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Utils/Hash.hpp"
-#include "Utils/Vector.hpp"
+#include <Cplt/Utils/Hash.hpp>
+#include <Cplt/Utils/Vector.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/core/src/Utils/fwd.hpp b/app/source/Cplt/Utils/fwd.hpp
index c740bd1..366cacc 100644
--- a/core/src/Utils/fwd.hpp
+++ b/app/source/Cplt/Utils/fwd.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utils/IO/fwd.hpp"
+#include <Cplt/Utils/IO/fwd.hpp>
 
 // Color.hpp
 class RgbaColor;
diff --git a/app/source/Cplt/fwd.hpp b/app/source/Cplt/fwd.hpp
new file mode 100644
index 0000000..97f669d
--- /dev/null
+++ b/app/source/Cplt/fwd.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <Cplt/Model/fwd.hpp>
+#include <Cplt/UI/fwd.hpp>
+#include <Cplt/Utils/fwd.hpp>
diff --git a/core/src/cplt_fwd.hpp b/core/src/cplt_fwd.hpp
deleted file mode 100644
index e05eb4f..0000000
--- a/core/src/cplt_fwd.hpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "Model/fwd.hpp"
-#include "UI/fwd.hpp"
-#include "Utils/fwd.hpp"