docs: update TEST_SPEC.md and README.md to reflect new directory structure

- TEST_SPEC.md: Updated test directory structure to reflect Core/Asset,
  Core/IO, and Resources/<Type> subdirectories
- TEST_SPEC.md: Updated module names and test counts (852 total)
- TEST_SPEC.md: Updated build commands for new Resources subdirectories
- README.md: Updated engine structure with Core/Asset/ and Core/IO/
- README.md: Updated Resources section with layered architecture
- README.md: Updated test coverage table with accurate counts

README.md

@@ -29,7 +29,7 @@ XCEngine/
 │   │   │   ├── Reverbation.h     # 混响效果
 │   │   │   ├── Equalizer.h       # 均衡器
 │   │   │   ├── IAudioEffect.h    # 音频效果接口
-│   │   │   ├── WASAPI/           # WASAPI 后端实现
+│   │   │   ├── WindowsAudioBackend.h # Windows 音频后端
 │   │   │   └── IAudioBackend.h   # 音频后端接口
 │   │   ├── Components/           # 游戏组件系统
 │   │   │   ├── Component.h       # 组件基类
@@ -37,12 +37,45 @@ XCEngine/
 │   │   │   ├── TransformComponent.h # 变换组件
 │   │   │   ├── AudioSourceComponent.h # 音频源组件
 │   │   │   └── AudioListenerComponent.h # 音频监听器组件
-│   │   ├── Containers/           # 容器模块
-│   │   │   ├── Array.h           # 动态数组
-│   │   │   ├── String.h          # 字符串类
-│   │   │   ├── HashMap.h         # 哈希表
-│   │   │   └── Containers.h      # 模块统一头文件
 │   │   ├── Core/                # 核心基础模块
+│   │   │   ├── Asset/            # 资源系统核心
+│   │   │   │   ├── IResource.h       # 资源接口
+│   │   │   │   ├── ResourceTypes.h   # 资源类型定义
+│   │   │   │   ├── ResourceHandle.h  # 资源句柄
+│   │   │   │   ├── ResourceManager.h # 资源管理器
+│   │   │   │   ├── ResourceCache.h   # 资源缓存
+│   │   │   │   ├── AsyncLoader.h     # 异步加载器
+│   │   │   │   ├── ResourceDependencyGraph.h # 依赖图
+│   │   │   │   └── ImportSettings.h  # 导入设置基类
+│   │   │   ├── IO/               # IO 系统
+│   │   │   │   ├── IResourceLoader.h # 资源加载器接口
+│   │   │   │   ├── ResourceFileSystem.h # 资源文件系统
+│   │   │   │   ├── ResourcePath.h    # 资源路径
+│   │   │   │   ├── FileArchive.h     # 文件归档
+│   │   │   │   └── ResourcePackage.h # 资源包
+│   │   │   ├── Containers/       # 容器模块
+│   │   │   │   ├── Array.h           # 动态数组
+│   │   │   │   ├── String.h          # 字符串类
+│   │   │   │   ├── HashMap.h         # 哈希表
+│   │   │   │   └── Containers.h      # 模块统一头文件
+│   │   │   ├── Math/             # 数学库
+│   │   │   │   ├── Vector2.h         # 二维向量
+│   │   │   │   ├── Vector3.h         # 三维向量
+│   │   │   │   ├── Vector4.h         # 四维向量
+│   │   │   │   ├── Matrix3.h         # 3x3 矩阵
+│   │   │   │   ├── Matrix4.h         # 4x4 矩阵
+│   │   │   │   ├── Quaternion.h      # 四元数
+│   │   │   │   ├── Transform.h       # 变换
+│   │   │   │   ├── Color.h           # 颜色
+│   │   │   │   ├── Rect.h            # 矩形
+│   │   │   │   ├── Sphere.h          # 球体
+│   │   │   │   ├── Box.h             # 盒子
+│   │   │   │   ├── Plane.h           # 平面
+│   │   │   │   ├── Ray.h             # 射线
+│   │   │   │   ├── AABB.h            # 轴对齐包围盒
+│   │   │   │   ├── Bounds.h          # 包围体
+│   │   │   │   ├── Frustum.h         # 视锥体
+│   │   │   │   └── Math.h            # 数学库统一头文件
 │   │   │   ├── Types.h           # 基础类型别名
 │   │   │   ├── RefCounted.h      # 引用计数基类
 │   │   │   ├── SmartPtr.h        # 智能指针
@@ -58,24 +91,6 @@ XCEngine/
 │   │   │   ├── ILogSink.h        # 日志槽接口
 │   │   │   ├── Debug.h           # 调试宏
 │   │   │   └── Profiler.h        # 性能分析
-│   │   ├── Math/                 # 数学库
-│   │   │   ├── Vector2.h         # 二维向量
-│   │   │   ├── Vector3.h         # 三维向量
-│   │   │   ├── Vector4.h         # 四维向量
-│   │   │   ├── Matrix3.h         # 3x3 矩阵
-│   │   │   ├── Matrix4.h         # 4x4 矩阵
-│   │   │   ├── Quaternion.h      # 四元数
-│   │   │   ├── Transform.h       # 变换
-│   │   │   ├── Color.h           # 颜色
-│   │   │   ├── Rect.h            # 矩形
-│   │   │   ├── Sphere.h          # 球体
-│   │   │   ├── Box.h             # 盒子
-│   │   │   ├── Plane.h           # 平面
-│   │   │   ├── Ray.h             # 射线
-│   │   │   ├── AABB.h            # 轴对齐包围盒
-│   │   │   ├── Bounds.h          # 包围体
-│   │   │   └── Frustum.h         # 视锥体
-│   │   │   └── Math.h            # 数学库统一头文件
 │   │   ├── Memory/              # 内存管理模块
 │   │   │   ├── Allocator.h       # 分配器接口
 │   │   │   ├── LinearAllocator.h # 线性分配器
@@ -93,33 +108,25 @@ XCEngine/
 │   │   │   ├── TaskSystem.h      # 任务系统
 │   │   │   ├── TaskSystemConfig.h # 任务系统配置
 │   │   │   └── Threading.h       # 线程模块统一头文件
-│   │   ├── Resources/           # 资源管理模块
+│   │   ├── Resources/           # 资源管理模块 (按类型分目录)
-│   │   │   ├── ResourceTypes.h   # 资源类型定义
+│   │   │   ├── Texture/         # 纹理资源
-│   │   │   ├── IResource.h       # 资源接口
+│   │   │   │   ├── Texture.h
-│   │   │   ├── ResourceHandle.h  # 资源句柄
+│   │   │   │   ├── TextureLoader.h
-│   │   │   ├── ResourceManager.h # 资源管理器
+│   │   │   │   └── TextureImportSettings.h
-│   │   │   ├── ResourceCache.h   # 资源缓存
+│   │   │   ├── Mesh/            # 网格资源
-│   │   │   ├── ResourcePackage.h # 资源包
+│   │   │   │   ├── Mesh.h
-│   │   │   ├── ResourceFileSystem.h # 资源文件系统
+│   │   │   │   ├── MeshLoader.h
-│   │   │   ├── ResourcePath.h    # 资源路径
+│   │   │   │   └── MeshImportSettings.h
-│   │   │   ├── FileArchive.h     # 文件归档
+│   │   │   ├── Shader/          # 着色器资源
-│   │   │   ├── ResourceDependencyGraph.h # 依赖图
+│   │   │   │   ├── Shader.h
-│   │   │   ├── ImportSettings.h  # 导入设置基类
+│   │   │   │   └── ShaderLoader.h
-│   │   │   ├── IResourceLoader.h # 资源加载器接口
+│   │   │   ├── Material/        # 材质资源
-│   │   │   ├── AsyncLoader.h     # 异步加载器
+│   │   │   │   ├── Material.h
-│   │   │   ├── Texture.h         # 纹理资源
+│   │   │   │   └── MaterialLoader.h
-│   │   │   ├── TextureLoader.h   # 纹理加载器
+│   │   │   ├── AudioClip/       # 音频资源
-│   │   │   ├── TextureImportSettings.h # 纹理导入设置
+│   │   │   │   ├── AudioClip.h
-│   │   │   ├── Mesh.h            # 网格资源
+│   │   │   │   └── AudioLoader.h
-│   │   │   ├── MeshLoader.h      # 网格加载器
+│   │   │   └── Resources.h     # 资源模块统一头文件
-│   │   │   ├── MeshImportSettings.h # 网格导入设置
-│   │   │   ├── Shader.h          # 着色器资源
-│   │   │   ├── ShaderLoader.h    # 着色器加载器
-│   │   │   ├── Material.h        # 材质资源
-│   │   │   ├── MaterialLoader.h  # 材质加载器
-│   │   │   ├── AudioClip.h       # 音频资源
-│   │   │   ├── AudioLoader.h     # 音频加载器
-│   │   │   └── Resources.h       # 资源模块统一头文件
 │   │   ├── Scene/               # 场景管理模块
 │   │   │   ├── Scene.h           # 场景类
 │   │   │   └── SceneManager.h    # 场景管理器
@@ -183,11 +190,18 @@ XCEngine/
 │   │   ├── Audio/
 │   │   ├── Containers/
 │   │   ├── Core/
+│   │   │   ├── Asset/          # Core/Asset 实现
+│   │   │   └── IO/            # Core/IO 实现
 │   │   ├── Debug/
 │   │   ├── Math/
 │   │   ├── Memory/
 │   │   ├── Threading/
 │   │   ├── Resources/
+│   │   │   ├── Texture/
+│   │   │   ├── Mesh/
+│   │   │   ├── Shader/
+│   │   │   ├── Material/
+│   │   │   └── AudioClip/
 │   │   ├── Scene/
 │   │   └── RHI/
 │   └── third_party/            # 第三方库
@@ -195,15 +209,23 @@ XCEngine/
 │       └── stb/                  # 图像处理库
 │
 ├── tests/                        # 单元测试
+│   ├── math/                    # 数学库测试
+│   ├── core/                    # 核心模块测试
+│   │   ├── Asset/              # Core/Asset 模块测试
+│   │   └── IO/                # Core/IO 模块测试
 │   ├── containers/               # 容器测试
 │   ├── memory/                  # 内存管理测试
 │   ├── threading/               # 线程模块测试
-│   ├── core/                    # 核心模块测试
 │   ├── debug/                   # 调试模块测试
-│   ├── math/                    # 数学库测试
 │   ├── Components/              # 组件测试
 │   ├── Scene/                   # 场景测试
 │   ├── Resources/               # 资源管理测试
+│   │   ├── Texture/            # 纹理资源测试
+│   │   ├── Mesh/              # 网格资源测试
+│   │   ├── Material/          # 材质资源测试
+│   │   ├── Shader/            # 着色器资源测试
+│   │   └── AudioClip/         # 音频资源测试
+│   ├── input/                   # 输入模块测试
 │   └── RHI/                     # RHI 抽象层测试
 │       ├── unit/                 # RHI 抽象层测试
 │       ├── OpenGL/              # OpenGL 后端测试
@@ -355,14 +377,30 @@ build/tests/threading/Debug/xcengine_threading_tests.exe
 
 ### Resources（资源管理）
 
+XCEngine 资源系统采用分层架构：
+
+#### Core/Asset（资源系统核心）
+- **IResource**: 资源接口基类
+- **ResourceTypes**: 资源类型定义（GUID、状态等）
+- **ResourceHandle**: 资源句柄，安全引用资源
 - **ResourceManager**: 全局资源管理器，资源加载/卸载
 - **ResourceCache**: 资源缓存，支持引用计数
-- **ResourceHandle**: 资源句柄，安全引用资源
-- **ResourcePackage**: 资源包批量管理
 - **AsyncLoader**: 异步资源加载器
-- **ImportSettings**: 资源导入设置（纹理/网格/材质）
+- **ResourceDependencyGraph**: 资源依赖图管理
+
+#### Core/IO（资源 IO 系统）
 - **IResourceLoader**: 资源加载器接口
-- **Texture/Mesh/Shader/Material/AudioClip**: 各类资源类型
+- **ResourceFileSystem**: 资源文件系统
+- **ResourcePath**: 资源路径解析
+- **FileArchive**: 文件归档支持
+- **ResourcePackage**: 资源包批量管理
+
+#### Resources/<Type>（具体资源类型）
+- **Texture**: 纹理资源（Texture.h、TextureLoader.h、TextureImportSettings.h）
+- **Mesh**: 网格资源（Mesh.h、MeshLoader.h、MeshImportSettings.h）
+- **Shader**: 着色器资源（Shader.h、ShaderLoader.h）
+- **Material**: 材质资源（Material.h、MaterialLoader.h）
+- **AudioClip**: 音频资源（AudioClip.h、AudioLoader.h）
 
 ### Scene（场景管理）
 
@@ -401,15 +439,23 @@ XCEngine 采用 RHI（Render Hardware Interface）抽象层设计，支持多渲
 
 | 模块 | 测试用例数 |
 |------|-----------|
-| Containers | 51+ |
+| Math | 140 |
+| Core | 25 |
+| Containers | 51 |
 | Memory | 19 |
 | Threading | 13 |
-| Math | 5+ |
+| Debug | 8 |
-| Components | 2+ |
+| Components | 39 |
-| Scene | 2+ |
+| Scene | 14 |
-| Resources | 4+ |
+| Resources/Texture | 36 |
+| Resources/Mesh | 29 |
+| Resources/Material | 14 |
+| Resources/Shader | 13 |
+| Resources/AudioClip | 15 |
+| Input | 40 |
 | RHI (OpenGL) | 41 (unit 14 + integration 5) |
 | RHI (D3D12) | 23 (unit 15 + integration 8) |
+| **总计** | **852 (+1 disabled)** |
 
 ## mvs 示例程序
 

engine/CMakeLists.txt

@@ -5,37 +5,46 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_library(XCEngine STATIC
-    # Math
+    # Core (Types, RefCounted, SmartPtr, Event)
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Math.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Vector2.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/RefCounted.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Vector3.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/SmartPtr.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Vector4.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Event.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Matrix3.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Core.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Matrix4.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/FileWriter.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Quaternion.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/FileWriter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Transform.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Color.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Ray.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Plane.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Sphere.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Box.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Bounds.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Frustum.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/Rect.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Math/AABB.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Math/Matrix.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Math/Quaternion.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Math/Transform.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Math/Color.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Math/Geometry.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Math/FrustumBounds.cpp
 
-    # Containers
+    # Core/Math
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Containers/Containers.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Math.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Containers/Array.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Vector2.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Containers/String.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Vector3.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Containers/HashMap.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Vector4.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Containers/String.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Matrix3.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Matrix4.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Quaternion.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Transform.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Color.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Ray.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Plane.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Sphere.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Box.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Bounds.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Frustum.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/Rect.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Math/AABB.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Math/Matrix.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Math/Quaternion.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Math/Transform.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Math/Color.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Math/Geometry.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Math/FrustumBounds.cpp
+
+    # Core/Containers
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Containers/Containers.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Containers/Array.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Containers/String.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Containers/HashMap.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Containers/String.cpp
 
     # Memory
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Memory/Allocator.h
@@ -60,10 +69,6 @@ add_library(XCEngine STATIC
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Threading/TaskGroup.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Threading/TaskSystem.cpp
 
-    # Core
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/FileWriter.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/FileWriter.cpp
-
     # Debug
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Debug/Debug.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Debug/LogLevel.h
@@ -156,60 +161,64 @@ add_library(XCEngine STATIC
     ${CMAKE_CURRENT_SOURCE_DIR}/src/RHI/OpenGL/OpenGLUniformBufferManager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/RHI/OpenGL/OpenGLFramebuffer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/RHI/OpenGL/OpenGLResourceView.cpp
-    ${CMAKE_SOURCE_DIR}/tests/opengl/package/src/glad.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/../tests/opengl/package/src/glad.c
 
     # RHI Factory
     ${CMAKE_CURRENT_SOURCE_DIR}/src/RHI/RHIFactory.cpp
 
-    # Resources
+    # Core/Asset (Resource System Core)
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Asset/IResource.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Asset/ResourceTypes.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Asset/ImportSettings.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Asset/ResourceHandle.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Asset/ResourceManager.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Asset/ResourceCache.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Asset/AsyncLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/Asset/ResourceDependencyGraph.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Asset/ResourceManager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Asset/ResourceCache.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Asset/AsyncLoader.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Asset/ResourceTypes.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/Asset/ResourceDependencyGraph.cpp
+
+    # Core/IO (File System Abstraction)
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/IO/IResourceLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/IO/ResourcePath.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/IO/ResourceFileSystem.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/IO/FileArchive.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Core/IO/ResourcePackage.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/IO/IResourceLoader.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/IO/ResourcePath.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/IO/ResourceFileSystem.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/IO/FileArchive.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Core/IO/ResourcePackage.cpp
+
+    # Resources (Concrete Resource Types)
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Resources.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ResourceTypes.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Texture/Texture.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/IResource.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Texture/TextureLoader.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ResourceHandle.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Texture/TextureImportSettings.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/IResourceLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Mesh/Mesh.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ResourceManager.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Mesh/MeshLoader.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ResourceCache.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Mesh/MeshImportSettings.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/AsyncLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Material/Material.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ImportSettings.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Material/MaterialLoader.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Texture.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Shader/Shader.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Mesh.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Shader/ShaderLoader.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/TextureLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/AudioClip/AudioClip.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/TextureImportSettings.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/AudioClip/AudioLoader.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/MeshLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Texture/Texture.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/MeshImportSettings.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Texture/TextureLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Material.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Texture/TextureImportSettings.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/MaterialLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Mesh/Mesh.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/Shader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Mesh/MeshLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ShaderLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Mesh/MeshImportSettings.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/AudioClip.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Material/Material.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/AudioLoader.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Material/MaterialLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ResourceFileSystem.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/Shader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/FileArchive.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader/ShaderLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ResourcePackage.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/AudioClip/AudioClip.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ResourceDependencyGraph.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/AudioClip/AudioLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Resources/ResourcePath.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/ResourceManager.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/ResourceCache.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/AsyncLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/ResourceTypes.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/IResourceLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Texture.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Mesh.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/TextureLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/TextureImportSettings.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/MeshLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/MeshImportSettings.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Material.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/MaterialLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/Shader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/ShaderLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/AudioClip.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/AudioLoader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/ResourceFileSystem.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/FileArchive.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/ResourcePackage.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/ResourceDependencyGraph.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Resources/ResourcePath.cpp
 
     # Components
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Components/Component.h
@@ -227,9 +236,18 @@ add_library(XCEngine STATIC
     # Platform
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/PlatformTypes.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/Window.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/Windows/WindowsWindow.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/IPlatform.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/IWindow.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/IFileSystem.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/IClock.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/IDynamicLibrary.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/IDisplayEnumerator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/GameTime.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform/Window.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/Windows/WindowsWindow.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform/Windows/WindowsWindow.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Platform/Windows/WindowsInputModule.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform/Windows/WindowsInputModule.cpp
 
     # Input
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Input/InputTypes.h
@@ -237,9 +255,7 @@ add_library(XCEngine STATIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Input/InputAxis.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Input/InputModule.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Input/InputManager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Input/Platform/WindowsInputModule.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Input/InputManager.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Input/Windows/WindowsInputModule.cpp
 
     # Audio
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Audio/AudioTypes.h
@@ -247,9 +263,9 @@ add_library(XCEngine STATIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Audio/IAudioEffect.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Audio/IAudioBackend.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Audio/AudioSystem.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Audio/WASAPI/WASAPIBackend.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Audio/WindowsAudioBackend.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/Audio/AudioSystem.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Audio/WASAPI/WASAPIBackend.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Audio/WindowsAudioBackend.cpp
 
     # Audio Components
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Components/AudioSourceComponent.h
@@ -284,7 +300,7 @@ target_include_directories(XCEngine PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine
     ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party
-    ${CMAKE_SOURCE_DIR}/tests/opengl/package/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../tests/opengl/package/include
 )
 
 if(MSVC)

engine/include/XCEngine/Audio/AudioMixer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <XCEngine/Audio/AudioTypes.h>
-#include <XCEngine/Math/Vector3.h>
+#include <XCEngine/Core/Math/Vector3.h>
 #include <vector>
 #include <map>
 #include <string>

engine/include/XCEngine/Audio/AudioSystem.h

@@ -3,8 +3,8 @@
 #include "IAudioBackend.h"
 #include "AudioConfig.h"
 #include "AudioTypes.h"
-#include <XCEngine/Math/Vector3.h>
+#include <XCEngine/Core/Math/Vector3.h>
-#include <XCEngine/Math/Quaternion.h>
+#include <XCEngine/Core/Math/Quaternion.h>
 #include <map>
 #include <vector>
 #include <memory>

engine/include/XCEngine/Audio/HRTF.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "AudioTypes.h"
-#include <XCEngine/Math/Vector3.h>
+#include <XCEngine/Core/Math/Vector3.h>
-#include <XCEngine/Math/Quaternion.h>
+#include <XCEngine/Core/Math/Quaternion.h>
 #include <vector>
 #include <array>
 

engine/include/XCEngine/Audio/WindowsAudioBackend.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../IAudioBackend.h"
+#include <XCEngine/Audio/IAudioBackend.h>
 #include <string>
 #include <vector>
 #include <thread>

engine/include/XCEngine/Components/AudioSourceComponent.h

@@ -3,9 +3,9 @@
 #include <XCEngine/Components/Component.h>
 #include <XCEngine/Components/TransformComponent.h>
 #include <XCEngine/Audio/AudioTypes.h>
-#include <XCEngine/Resources/AudioClip.h>
+#include <XCEngine/Resources/AudioClip/AudioClip.h>
-#include <XCEngine/Math/Vector3.h>
+#include <XCEngine/Core/Math/Vector3.h>
-#include <XCEngine/Math/Quaternion.h>
+#include <XCEngine/Core/Math/Quaternion.h>
 #include <vector>
 #include <deque>
 #include <string>

engine/include/XCEngine/Components/TransformComponent.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "Component.h"
-#include <XCEngine/Math/Vector3.h>
+#include <XCEngine/Core/Math/Vector3.h>
-#include <XCEngine/Math/Quaternion.h>
+#include <XCEngine/Core/Math/Quaternion.h>
-#include <XCEngine/Math/Matrix4.h>
+#include <XCEngine/Core/Math/Matrix4.h>
 #include <vector>
 #include <string>
 #include <istream>

engine/include/XCEngine/Containers/Containers.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "Containers/Array.h"
-#include "Containers/String.h"
-#include "Containers/HashMap.h"
-
-namespace XCEngine {
-namespace Containers {
-
-} // namespace Containers
-} // namespace XCEngine

engine/include/XCEngine/Core/Asset/AsyncLoader.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
-#include "ImportSettings.h"
+#include <XCEngine/Core/Asset/ImportSettings.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Threading/Mutex.h"
+#include <XCEngine/Threading/Mutex.h>
 #include <atomic>
 #include <functional>
 

engine/include/XCEngine/Core/Asset/IResource.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ResourceTypes.h"
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Core/Asset/ImportSettings.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Core/SmartPtr.h"
+#include <XCEngine/Core/SmartPtr.h>
 #include "ResourceTypes.h"
 
 namespace XCEngine {

engine/include/XCEngine/Core/Asset/ResourceCache.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "ResourceTypes.h"
-#include "../Containers/HashMap.h"
+#include <XCEngine/Core/Containers/HashMap.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Threading/Mutex.h"
+#include <XCEngine/Threading/Mutex.h>
 #include <algorithm>
 
 namespace XCEngine {

engine/include/XCEngine/Core/Asset/ResourceDependencyGraph.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "ResourceTypes.h"
-#include "../Containers/HashMap.h"
+#include <XCEngine/Core/Containers/HashMap.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Core/Types.h"
+#include <XCEngine/Core/Types.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Core/Asset/ResourceManager.h

@@ -1,15 +1,15 @@
 #pragma once
 
-#include "IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
 #include "ResourceCache.h"
 #include "AsyncLoader.h"
 #include "ResourceHandle.h"
-#include "ImportSettings.h"
+#include <XCEngine/Core/Asset/ImportSettings.h>
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Containers/HashMap.h"
+#include <XCEngine/Core/Containers/HashMap.h>
-#include "../Threading/Mutex.h"
+#include <XCEngine/Threading/Mutex.h>
-#include "../Debug/Logger.h"
+#include <XCEngine/Debug/Logger.h>
 #include <type_traits>
 
 namespace XCEngine {

engine/include/XCEngine/Core/Asset/ResourceTypes.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../Core/Types.h"
+#include <XCEngine/Core/Types.h>
-#include "../Core/SmartPtr.h"
+#include <XCEngine/Core/SmartPtr.h>
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
 #include <cstdint>
 
 namespace XCEngine {

engine/include/XCEngine/Core/Containers/Array.h

@@ -4,7 +4,7 @@
 #include <initializer_list>
 #include <algorithm>
 #include <stdexcept>
-#include "../Memory/Allocator.h"
+#include <XCEngine/Memory/Allocator.h>
 
 namespace XCEngine {
 namespace Containers {

engine/include/XCEngine/Core/Containers/Containers.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <XCEngine/Core/Containers/Array.h>
+#include <XCEngine/Core/Containers/String.h>
+#include <XCEngine/Core/Containers/HashMap.h>
+
+namespace XCEngine {
+namespace Containers {
+
+} // namespace Containers
+} // namespace XCEngine

engine/include/XCEngine/Core/Containers/HashMap.h

@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <utility>
 #include <functional>
-#include "../Memory/Allocator.h"
+#include <XCEngine/Memory/Allocator.h>
 #include "Array.h"
 
 namespace XCEngine {

engine/include/XCEngine/Core/FileWriter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 #include <cstdio>
 
 namespace XCEngine {

engine/include/XCEngine/Core/IO/IResourceLoader.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "IResource.h"
+#include <XCEngine/Core/Asset/IResource.h>
-#include "ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
-#include "ImportSettings.h"
+#include <XCEngine/Core/Asset/ImportSettings.h>
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
 #include <functional>
 
 namespace XCEngine {

engine/include/XCEngine/Core/IO/ResourceFileSystem.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Containers/HashMap.h"
+#include <XCEngine/Core/Containers/HashMap.h>
-#include "../Core/SmartPtr.h"
+#include <XCEngine/Core/SmartPtr.h>
-#include "../Threading/Mutex.h"
+#include <XCEngine/Threading/Mutex.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Core/IO/ResourcePackage.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Core/Types.h"
+#include <XCEngine/Core/Types.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Core/IO/ResourcePath.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Core/Types.h"
+#include <XCEngine/Core/Types.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Debug/FileLogSink.h

@@ -2,7 +2,7 @@
 
 #include "ILogSink.h"
 #include "LogEntry.h"
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 #include "../Core/FileWriter.h"
 
 namespace XCEngine {

engine/include/XCEngine/Debug/LogEntry.h

@@ -2,7 +2,7 @@
 
 #include "LogLevel.h"
 #include "LogCategory.h"
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 
 namespace XCEngine {
 namespace Debug {

engine/include/XCEngine/Debug/Logger.h

@@ -3,7 +3,7 @@
 #include "LogLevel.h"
 #include "LogCategory.h"
 #include "ILogSink.h"
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 #include "../Threading/Mutex.h"
 
 #include <vector>

engine/include/XCEngine/Debug/Profiler.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "LogLevel.h"
-#include "../Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 
 #include <vector>
 #include <chrono>

engine/include/XCEngine/Input/InputAxis.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "InputTypes.h"
-#include "Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 
 namespace XCEngine {
 namespace Input {

engine/include/XCEngine/Input/InputEvent.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "InputTypes.h"
-#include "Math/Vector2.h"
+#include <XCEngine/Core/Math/Vector2.h>
-#include "Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 
 namespace XCEngine {
 namespace Input {

engine/include/XCEngine/Input/InputManager.h

@@ -3,7 +3,7 @@
 #include "InputTypes.h"
 #include "InputEvent.h"
 #include "InputAxis.h"
-#include "Math/Vector2.h"
+#include <XCEngine/Core/Math/Vector2.h>
 #include <vector>
 #include <unordered_map>
 

engine/include/XCEngine/Platform/GameTime.h

@@ -0,0 +1,15 @@
+#pragma once
+#include "PlatformTypes.h"
+
+namespace XCEngine {
+
+struct GameTime {
+    float deltaTime;
+    float totalTime;
+    Core::uint64_t frameCount;
+
+    float GetFPS() const { return deltaTime > 0.0f ? 1.0f / deltaTime : 0.0f; }
+    float GetSPF() const { return deltaTime; }
+};
+
+} // namespace XCEngine

engine/include/XCEngine/Platform/IClock.h

@@ -0,0 +1,17 @@
+#pragma once
+
+namespace XCEngine {
+namespace Platform {
+
+class IClock {
+public:
+    virtual ~IClock() = default;
+
+    virtual double GetAbsoluteTime() const = 0;
+    virtual double GetTimeSinceInit() const = 0;
+    virtual float GetDeltaTime() const = 0;
+    virtual void Update() = 0;
+};
+
+} // namespace Platform
+} // namespace XCEngine

engine/include/XCEngine/Platform/IDisplayEnumerator.h

@@ -0,0 +1,31 @@
+#pragma once
+#include "PlatformTypes.h"
+#include <vector>
+
+namespace XCEngine {
+namespace Platform {
+
+struct DisplayInfo {
+    Containers::String name;
+    Core::uint32_t width;
+    Core::uint32_t height;
+    Core::uint32_t refreshRate;
+    bool isPrimary;
+
+    std::vector<std::pair<Core::uint32_t, Core::uint32_t>> supportedResolutions;
+};
+
+class IDisplayEnumerator {
+public:
+    virtual ~IDisplayEnumerator() = default;
+
+    virtual Core::uint32_t GetDisplayCount() const = 0;
+    virtual DisplayInfo GetDisplayInfo(Core::uint32_t index) const = 0;
+
+    virtual DisplayInfo GetPrimaryDisplay() const = 0;
+
+    virtual float GetDPIForDisplay(Core::uint32_t index) const = 0;
+};
+
+} // namespace Platform
+} // namespace XCEngine

engine/include/XCEngine/Platform/IDynamicLibrary.h

@@ -0,0 +1,24 @@
+#pragma once
+
+namespace XCEngine {
+namespace Platform {
+
+class IDynamicLibrary {
+public:
+    virtual ~IDynamicLibrary() = default;
+
+    virtual bool Load(const char* path) = 0;
+    virtual void Unload() = 0;
+    virtual bool IsLoaded() const = 0;
+
+    virtual void* GetSymbol(const char* symbolName) = 0;
+    template<typename T>
+    T GetSymbol(const char* symbolName) {
+        return reinterpret_cast<T>(GetSymbol(symbolName));
+    }
+
+    virtual const char* GetPath() const = 0;
+};
+
+} // namespace Platform
+} // namespace XCEngine

engine/include/XCEngine/Platform/IFileSystem.h

@@ -0,0 +1,30 @@
+#pragma once
+#include "PlatformTypes.h"
+
+namespace XCEngine {
+namespace Platform {
+
+class IFileSystem {
+public:
+    virtual ~IFileSystem() = default;
+
+    virtual bool FileExists(const char* path) const = 0;
+    virtual bool DirectoryExists(const char* path) const = 0;
+    virtual int64_t GetFileSize(const char* path) const = 0;
+    virtual bool DeleteFile(const char* path) = 0;
+    virtual bool CreateDirectory(const char* path) = 0;
+
+    virtual std::unique_ptr<uint8_t[]> ReadFile(const char* path, size_t* outSize) const = 0;
+    virtual bool WriteFile(const char* path, const void* data, size_t size) = 0;
+
+    virtual Containers::String GetExecutablePath() const = 0;
+    virtual Containers::String GetWorkingDirectory() const = 0;
+    virtual Containers::String GetUserDirectory() const = 0;
+    virtual Containers::String GetTempDirectory() const = 0;
+
+    virtual Containers::String NormalizePath(const Containers::String& path) const = 0;
+    virtual Containers::String CombinePaths(const Containers::String& base, const Containers::String& relative) const = 0;
+};
+
+} // namespace Platform
+} // namespace XCEngine

engine/include/XCEngine/Platform/IPlatform.h

@@ -0,0 +1,33 @@
+#pragma once
+#include "PlatformTypes.h"
+#include <memory>
+
+namespace XCEngine {
+namespace Platform {
+
+class IWindow;
+class IFileSystem;
+class IClock;
+class IDynamicLibrary;
+class IDisplayEnumerator;
+
+class IPlatform {
+public:
+    virtual ~IPlatform() = default;
+
+    virtual const char* GetName() const = 0;
+    virtual PlatformType GetType() const = 0;
+
+    virtual std::unique_ptr<IWindow> CreateWindow(const WindowDesc& desc) = 0;
+    virtual std::unique_ptr<IFileSystem> CreateFileSystem() = 0;
+    virtual std::unique_ptr<IClock> CreateClock() = 0;
+    virtual std::unique_ptr<IDynamicLibrary> LoadDynamicLibrary(const char* path) = 0;
+    virtual std::unique_ptr<IDisplayEnumerator> CreateDisplayEnumerator() = 0;
+
+    virtual void PumpPlatformMessages() = 0;
+
+    static IPlatform& Get();
+};
+
+} // namespace Platform
+} // namespace XCEngine

engine/include/XCEngine/Platform/IWindow.h

@@ -0,0 +1,43 @@
+#pragma once
+#include "PlatformTypes.h"
+#include <functional>
+
+namespace XCEngine {
+namespace Platform {
+
+class IWindow {
+public:
+    virtual ~IWindow() = default;
+
+    virtual bool Create(const WindowDesc& desc) = 0;
+    virtual void Destroy() = 0;
+    virtual bool IsValid() const = 0;
+
+    virtual WindowHandle GetNativeHandle() const = 0;
+
+    virtual void PumpEvents() = 0;
+
+    virtual void SetTitle(const Containers::String& title) = 0;
+    virtual void SetFullscreen(bool fullscreen) = 0;
+    virtual bool IsFullscreen() const = 0;
+    virtual void Minimize() = 0;
+    virtual void Maximize() = 0;
+    virtual void Restore() = 0;
+    virtual void SetVSync(bool enabled) = 0;
+    virtual bool IsVSync() const = 0;
+
+    virtual Core::uint32_t GetWidth() const = 0;
+    virtual Core::uint32_t GetHeight() const = 0;
+
+    virtual bool ShouldClose() const = 0;
+    virtual void SetShouldClose(bool shouldClose) = 0;
+
+    using CloseCallback = std::function<void()>;
+    using ResizeCallback = std::function<void(Core::uint32_t, Core::uint32_t)>;
+
+    virtual void SetCloseCallback(CloseCallback callback) = 0;
+    virtual void SetResizeCallback(ResizeCallback callback) = 0;
+};
+
+} // namespace Platform
+} // namespace XCEngine

engine/include/XCEngine/Platform/PlatformTypes.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "Core/Types.h"
-#include "Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 
 namespace XCEngine {
 namespace Platform {

engine/include/XCEngine/Platform/Windows/WindowsInputModule.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "Input/InputModule.h"
+#include <XCEngine/Input/InputModule.h>
-#include "Input/InputTypes.h"
+#include <XCEngine/Input/InputTypes.h>
-#include "Math/Vector2.h"
+#include <XCEngine/Core/Math/Vector2.h>
 #include <Windows.h>
 
 namespace XCEngine {

engine/include/XCEngine/Resources/AudioClip/AudioClip.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IResource.h"
+#include <XCEngine/Core/Asset/IResource.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Core/Types.h"
+#include <XCEngine/Core/Types.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Resources/AudioClip/AudioLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
 #include "AudioClip.h"
 
 namespace XCEngine {

engine/include/XCEngine/Resources/Material/MaterialLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
 #include "Material.h"
 
 namespace XCEngine {

engine/include/XCEngine/Resources/Mesh/Mesh.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IResource.h"
+#include <XCEngine/Core/Asset/IResource.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Core/Types.h"
+#include <XCEngine/Core/Types.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Resources/Mesh/MeshImportSettings.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ImportSettings.h"
+#include <XCEngine/Core/Asset/ImportSettings.h>
-#include "Mesh.h"
+#include <XCEngine/Resources/Mesh/Mesh.h>
-#include "../Math/Vector3.h"
+#include <XCEngine/Core/Math/Vector3.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Resources/Mesh/MeshLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
 #include "Mesh.h"
 
 namespace XCEngine {

engine/include/XCEngine/Resources/Resources.h

@@ -1,34 +1,33 @@
 #pragma once
 
-#include "ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
-#include "ImportSettings.h"
+#include <XCEngine/Core/Asset/ImportSettings.h>
-#include "IResource.h"
+#include <XCEngine/Core/Asset/IResource.h>
-#include "ResourceHandle.h"
+#include <XCEngine/Core/Asset/ResourceHandle.h>
-#include "ResourceManager.h"
+#include <XCEngine/Core/Asset/ResourceManager.h>
-#include "IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
-#include "ResourceCache.h"
+#include <XCEngine/Core/Asset/ResourceCache.h>
-#include "AsyncLoader.h"
+#include <XCEngine/Core/Asset/AsyncLoader.h>
-#include "ResourceDependencyGraph.h"
+#include <XCEngine/Core/Asset/ResourceDependencyGraph.h>
 
-#include "Texture.h"
+#include <XCEngine/Resources/Texture/Texture.h>
-#include "TextureLoader.h"
+#include <XCEngine/Resources/Texture/TextureLoader.h>
-#include "TextureImportSettings.h"
+#include <XCEngine/Resources/Texture/TextureImportSettings.h>
-#include "Mesh.h"
+#include <XCEngine/Resources/Mesh/Mesh.h>
-#include "MeshLoader.h"
+#include <XCEngine/Resources/Mesh/MeshLoader.h>
-#include "MeshImportSettings.h"
+#include <XCEngine/Resources/Mesh/MeshImportSettings.h>
-#include "Material.h"
+#include <XCEngine/Resources/Material/Material.h>
-#include "MaterialLoader.h"
+#include <XCEngine/Resources/Material/MaterialLoader.h>
-#include "Shader.h"
+#include <XCEngine/Resources/Shader/Shader.h>
-#include "ShaderLoader.h"
+#include <XCEngine/Resources/Shader/ShaderLoader.h>
-#include "AudioClip.h"
+#include <XCEngine/Resources/AudioClip/AudioClip.h>
-#include "AudioLoader.h"
+#include <XCEngine/Resources/AudioClip/AudioLoader.h>
 
-#include "ResourceFileSystem.h"
+#include <XCEngine/Core/IO/ResourceFileSystem.h>
-#include "FileArchive.h"
+#include <XCEngine/Core/IO/FileArchive.h>
-#include "ResourcePackage.h"
+#include <XCEngine/Core/IO/ResourcePackage.h>
-#include "ResourcePath.h"
+#include <XCEngine/Core/IO/ResourcePath.h>
 
-// Forward declarations for concrete resource types
 namespace XCEngine {
 namespace Resources {
 

engine/include/XCEngine/Resources/Shader/Shader.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IResource.h"
+#include <XCEngine/Core/Asset/IResource.h>
-#include "../Containers/Array.h"
+#include <XCEngine/Core/Containers/Array.h>
-#include "../Core/Types.h"
+#include <XCEngine/Core/Types.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Resources/Shader/ShaderLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
 #include "Shader.h"
 
 namespace XCEngine {

engine/include/XCEngine/Resources/Texture/Texture.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "IResource.h"
+#include <XCEngine/Core/Asset/IResource.h>
-#include "../Core/Types.h"
+#include <XCEngine/Core/Types.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Resources/Texture/TextureImportSettings.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ImportSettings.h"
+#include <XCEngine/Core/Asset/ImportSettings.h>
-#include "Texture.h"
+#include <XCEngine/Resources/Texture/Texture.h>
-#include "../Math/Vector3.h"
+#include <XCEngine/Core/Math/Vector3.h>
 
 namespace XCEngine {
 namespace Resources {

engine/include/XCEngine/Resources/Texture/TextureLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
 #include "Texture.h"
 
 namespace XCEngine {

engine/include/XCEngine/Threading/Thread.h

@@ -2,7 +2,7 @@
 
 #include <thread>
 #include <atomic>
-#include "Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 
 namespace XCEngine {
 namespace Threading {

engine/src/Audio/AudioSystem.cpp

@@ -1,5 +1,5 @@
 #include <XCEngine/Audio/AudioSystem.h>
-#include <XCEngine/Audio/WASAPI/WASAPIBackend.h>
+#include <XCEngine/Audio/WindowsAudioBackend.h>
 #include <XCEngine/Components/AudioSourceComponent.h>
 #include <iostream>
 

engine/src/Audio/WindowsAudioBackend.cpp

@@ -2,7 +2,7 @@
 #define NOMINMAX
 #endif
 
-#include <XCEngine/Audio/WASAPI/WASAPIBackend.h>
+#include <XCEngine/Audio/WindowsAudioBackend.h>
 #include <iostream>
 #include <algorithm>
 

engine/src/Core/Asset/AsyncLoader.cpp

@@ -1,6 +1,6 @@
-#include "Resources/AsyncLoader.h"
+#include <XCEngine/Core/Asset/AsyncLoader.h>
-#include "Resources/ResourceManager.h"
+#include <XCEngine/Core/Asset/ResourceManager.h>
-#include "Resources/ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Core/Asset/ResourceCache.cpp

@@ -1,5 +1,5 @@
-#include "Resources/ResourceCache.h"
+#include <XCEngine/Core/Asset/ResourceCache.h>
-#include "Resources/ResourceManager.h"
+#include <XCEngine/Core/Asset/ResourceManager.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Core/Asset/ResourceDependencyGraph.cpp

@@ -1,4 +1,4 @@
-#include "Resources/ResourceDependencyGraph.h"
+#include <XCEngine/Core/Asset/ResourceDependencyGraph.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Core/Asset/ResourceManager.cpp

@@ -1,6 +1,6 @@
-#include "Resources/ResourceManager.h"
+#include <XCEngine/Core/Asset/ResourceManager.h>
-#include "Resources/ResourceHandle.h"
+#include <XCEngine/Core/Asset/ResourceHandle.h>
-#include "Resources/ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Core/Asset/ResourceTypes.cpp

@@ -1,4 +1,4 @@
-#include "Resources/ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Core/Containers/String.cpp

@@ -1,4 +1,4 @@
-#include "Containers/String.h"
+#include <XCEngine/Core/Containers/String.h>
 #include <cstdlib>
 #include <cstdio>
 

engine/src/Core/IO/FileArchive.cpp

@@ -1,4 +1,4 @@
-#include "Resources/FileArchive.h"
+#include <XCEngine/Core/IO/FileArchive.h>
 #include <cstdio>
 
 namespace XCEngine {

engine/src/Core/IO/IResourceLoader.cpp

@@ -1,4 +1,4 @@
-#include "XCEngine/Resources/IResourceLoader.h"
+#include <XCEngine/Core/IO/IResourceLoader.h>
 #include <fstream>
 
 namespace XCEngine {

engine/src/Core/IO/ResourceFileSystem.cpp

@@ -1,4 +1,4 @@
-#include "Resources/ResourceFileSystem.h"
+#include <XCEngine/Core/IO/ResourceFileSystem.h>
 #include <algorithm>
 #include <cstdio>
 

engine/src/Core/IO/ResourcePackage.cpp

@@ -1,4 +1,4 @@
-#include "Resources/ResourcePackage.h"
+#include <XCEngine/Core/IO/ResourcePackage.h>
 #include <cstdio>
 #include <algorithm>
 

engine/src/Core/IO/ResourcePath.cpp

@@ -1,4 +1,4 @@
-#include <XCEngine/Resources/ResourcePath.h>
+#include <XCEngine/Core/IO/ResourcePath.h>
 #include <algorithm>
 
 namespace XCEngine {

engine/src/Core/Math/Color.cpp

@@ -1,4 +1,4 @@
-#include "Math/Color.h"
+#include "Core/Math/Color.h"
 
 namespace XCEngine {
 namespace Math {

engine/src/Core/Math/FrustumBounds.cpp

@@ -1,5 +1,5 @@
-#include "Math/Frustum.h"
+#include "Core/Math/Frustum.h"
-#include "Math/Bounds.h"
+#include "Core/Math/Bounds.h"
 
 namespace XCEngine {
 namespace Math {

engine/src/Core/Math/Geometry.cpp

@@ -1,7 +1,7 @@
-#include "Math/Sphere.h"
+#include "Core/Math/Sphere.h"
-#include "Math/Plane.h"
+#include "Core/Math/Plane.h"
-#include "Math/Box.h"
+#include "Core/Math/Box.h"
-#include "Math/Ray.h"
+#include "Core/Math/Ray.h"
 
 namespace XCEngine {
 namespace Math {

engine/src/Core/Math/Matrix.cpp

@@ -1,7 +1,7 @@
-#include "Math/Matrix3.h"
+#include "Core/Math/Matrix3.h"
-#include "Math/Matrix4.h"
+#include "Core/Math/Matrix4.h"
-#include "Math/Quaternion.h"
+#include "Core/Math/Quaternion.h"
-#include "Math/Vector3.h"
+#include "Core/Math/Vector3.h"
 
 namespace XCEngine {
 namespace Math {

engine/src/Core/Math/Quaternion.cpp

@@ -1,6 +1,6 @@
-#include "Math/Quaternion.h"
+#include "Core/Math/Quaternion.h"
-#include "Math/Matrix4.h"
+#include "Core/Math/Matrix4.h"
-#include "Math/Vector3.h"
+#include "Core/Math/Vector3.h"
 
 namespace XCEngine {
 namespace Math {

engine/src/Core/Math/Transform.cpp

@@ -1,5 +1,5 @@
-#include "Math/Transform.h"
+#include "Core/Math/Transform.h"
-#include "Math/Matrix4.h"
+#include "Core/Math/Matrix4.h"
 
 namespace XCEngine {
 namespace Math {

engine/src/Platform/Windows/WindowsInputModule.cpp

@@ -1,4 +1,4 @@
-#include "Input/Platform/WindowsInputModule.h"
+#include "Platform/Windows/WindowsInputModule.h"
 #include "Input/InputManager.h"
 #include <Windows.h>
 

engine/src/Platform/Windows/WindowsWindow.cpp

@@ -1,5 +1,5 @@
 #include "Platform/Windows/WindowsWindow.h"
-#include "Input/Platform/WindowsInputModule.h"
+#include "Platform/Windows/WindowsInputModule.h"
 #include <Windows.h>
 
 namespace XCEngine {

engine/src/RHI/OpenGL/OpenGLScreenshot.cpp

@@ -3,7 +3,7 @@
 #include "XCEngine/RHI/OpenGL/OpenGLSwapChain.h"
 #include "XCEngine/Debug/Logger.h"
 #include "XCEngine/Debug/ConsoleLogSink.h"
-#include "XCEngine/Containers/String.h"
+#include "XCEngine/Core/Containers/String.h"
 
 #include <glad/glad.h>
 

engine/src/Resources/AudioClip/AudioClip.cpp

@@ -1,4 +1,4 @@
-#include "Resources/AudioClip.h"
+#include <XCEngine/Resources/AudioClip/AudioClip.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Resources/AudioClip/AudioLoader.cpp

@@ -1,6 +1,6 @@
-#include "Resources/AudioLoader.h"
+#include <XCEngine/Resources/AudioClip/AudioLoader.h>
-#include "Resources/ResourceManager.h"
+#include <XCEngine/Core/Asset/ResourceManager.h>
-#include "Resources/ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
 #include <cstring>
 
 namespace XCEngine {

engine/src/Resources/Material/Material.cpp

@@ -1,5 +1,6 @@
-#include "Resources/Material.h"
+#include <XCEngine/Resources/Material/Material.h>
-#include "Resources/Shader.h"
+#include <XCEngine/Resources/Shader/Shader.h>
+#include <XCEngine/Core/Asset/ResourceManager.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Resources/Material/MaterialLoader.cpp

@@ -1,6 +1,6 @@
-#include "Resources/MaterialLoader.h"
+#include <XCEngine/Resources/Material/MaterialLoader.h>
-#include "Resources/ResourceManager.h"
+#include <XCEngine/Core/Asset/ResourceManager.h>
-#include "Resources/ResourceTypes.h"
+#include <XCEngine/Core/Asset/ResourceTypes.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Resources/Mesh/Mesh.cpp

@@ -1,4 +1,4 @@
-#include "Resources/Mesh.h"
+#include <XCEngine/Resources/Mesh/Mesh.h>
 #include <cstring>
 
 namespace XCEngine {

engine/src/Resources/Mesh/MeshImportSettings.cpp

@@ -1,4 +1,4 @@
-#include <XCEngine/Resources/MeshImportSettings.h>
+#include <XCEngine/Resources/Mesh/MeshImportSettings.h>
 
 namespace XCEngine {
 namespace Resources {

engine/src/Resources/Mesh/MeshLoader.cpp

@@ -1,5 +1,5 @@
-#include "Resources/MeshLoader.h"
+#include <XCEngine/Resources/Mesh/MeshLoader.h>
-#include "Resources/ResourceManager.h"
+#include <XCEngine/Core/Asset/ResourceManager.h>
 
 namespace XCEngine {
 namespace Resources {