diff --git a/src/gfx/DescriptorAllocator.cpp b/src/gfx/DescriptorAllocator.cpp
index 4aa0c8a9..e4ef5eb5 100644
--- a/src/gfx/DescriptorAllocator.cpp
+++ b/src/gfx/DescriptorAllocator.cpp
@@ -1,8 +1,8 @@
 #include "DescriptorAllocator.hpp"
 
-#include "../utils/Utils.hpp"
-#include "Device.hpp"
-#include "VkUtils.hpp"
+#include "gfx/Device.hpp"
+#include "gfx/VkUtils.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/containers/static_array.hpp>
 
diff --git a/src/gfx/DescriptorAllocator.hpp b/src/gfx/DescriptorAllocator.hpp
index ad595016..7b773ce9 100644
--- a/src/gfx/DescriptorAllocator.hpp
+++ b/src/gfx/DescriptorAllocator.hpp
@@ -1,8 +1,8 @@
 #ifndef PROSPER_GFX_DESCRIPTOR_ALLOCATOR_HPP
 #define PROSPER_GFX_DESCRIPTOR_ALLOCATOR_HPP
 
-#include "../Allocators.hpp"
-#include "Fwd.hpp"
+#include "Allocators.hpp"
+#include "gfx/Fwd.hpp"
 
 #include <vulkan/vulkan.hpp>
 #include <wheels/allocators/allocator.hpp>
diff --git a/src/gfx/Device.cpp b/src/gfx/Device.cpp
index bc9f552d..653f06c5 100644
--- a/src/gfx/Device.cpp
+++ b/src/gfx/Device.cpp
@@ -11,15 +11,15 @@
 #include <intrin.h>
 #endif // _WIN32
 
-#include "../Allocators.hpp"
-#include "../Window.hpp"
-#include "../utils/ForEach.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Utils.hpp"
-#include "ShaderIncludes.hpp"
-#include "ShaderReflection.hpp"
-#include "Swapchain.hpp"
-#include "VkUtils.hpp"
+#include "Allocators.hpp"
+#include "Window.hpp"
+#include "gfx/ShaderIncludes.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "gfx/Swapchain.hpp"
+#include "gfx/VkUtils.hpp"
+#include "utils/ForEach.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
 
 #include <GLFW/glfw3.h>
 #include <wheels/containers/hash_map.hpp>
diff --git a/src/gfx/Device.hpp b/src/gfx/Device.hpp
index 47ef6f98..8f1cf06c 100644
--- a/src/gfx/Device.hpp
+++ b/src/gfx/Device.hpp
@@ -1,9 +1,9 @@
 #ifndef PROSPER_GFX_DEVICE_HPP
 #define PROSPER_GFX_DEVICE_HPP
 
-#include "../utils/Hashes.hpp"
-#include "Resources.hpp"
-#include "ShaderReflection.hpp"
+#include "gfx/Resources.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "utils/Hashes.hpp"
 
 #include <atomic>
 #include <filesystem>
diff --git a/src/gfx/RingBuffer.hpp b/src/gfx/RingBuffer.hpp
index 57838143..f6d287da 100644
--- a/src/gfx/RingBuffer.hpp
+++ b/src/gfx/RingBuffer.hpp
@@ -1,9 +1,9 @@
 #ifndef PROSPER_GFX_RING_BUFFER_HPP
 #define PROSPER_GFX_RING_BUFFER_HPP
 
-#include "../utils/Utils.hpp"
-#include "Fwd.hpp"
-#include "Resources.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/containers/inline_array.hpp>
 #include <wheels/containers/span.hpp>
diff --git a/src/gfx/ShaderIncludes.cpp b/src/gfx/ShaderIncludes.cpp
index 923b2721..c422d0de 100644
--- a/src/gfx/ShaderIncludes.cpp
+++ b/src/gfx/ShaderIncludes.cpp
@@ -1,7 +1,7 @@
 #include "ShaderIncludes.hpp"
 
-#include "../utils/Hashes.hpp"
-#include "../utils/Utils.hpp"
+#include "utils/Hashes.hpp"
+#include "utils/Utils.hpp"
 
 #include <charconv>
 #include <wheels/containers/pair.hpp>
diff --git a/src/gfx/ShaderReflection.hpp b/src/gfx/ShaderReflection.hpp
index 03ffa455..961fac9c 100644
--- a/src/gfx/ShaderReflection.hpp
+++ b/src/gfx/ShaderReflection.hpp
@@ -1,10 +1,10 @@
 #ifndef PROSPER_GFX_SHADER_REFLECTION_HPP
 #define PROSPER_GFX_SHADER_REFLECTION_HPP
 
-#include "../Allocators.hpp"
-#include "../utils/Hashes.hpp"
-#include "../utils/Utils.hpp"
-#include "Fwd.hpp"
+#include "Allocators.hpp"
+#include "gfx/Fwd.hpp"
+#include "utils/Hashes.hpp"
+#include "utils/Utils.hpp"
 
 #include <filesystem>
 #include <variant>
diff --git a/src/gfx/Swapchain.cpp b/src/gfx/Swapchain.cpp
index 734d6d3d..b619d781 100644
--- a/src/gfx/Swapchain.cpp
+++ b/src/gfx/Swapchain.cpp
@@ -1,9 +1,9 @@
 #include "Swapchain.hpp"
 
-#include "../utils/Logger.hpp"
-#include "../utils/Utils.hpp"
-#include "Device.hpp"
-#include "VkUtils.hpp"
+#include "gfx/Device.hpp"
+#include "gfx/VkUtils.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
 
 #include <stdexcept>
 #include <wheels/containers/span.hpp>
diff --git a/src/gfx/Swapchain.hpp b/src/gfx/Swapchain.hpp
index c6b847ba..447e1e08 100644
--- a/src/gfx/Swapchain.hpp
+++ b/src/gfx/Swapchain.hpp
@@ -1,8 +1,8 @@
 #ifndef PROSPER_GFX_SWAPCHAIN_HPP
 #define PROSPER_GFX_SWAPCHAIN_HPP
 
-#include "../utils/Utils.hpp"
-#include "Fwd.hpp"
+#include "gfx/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <vulkan/vulkan.hpp>
 #include <wheels/allocators/allocator.hpp>
diff --git a/src/gfx/VkUtils.cpp b/src/gfx/VkUtils.cpp
index 0d9352a5..05ee5290 100644
--- a/src/gfx/VkUtils.cpp
+++ b/src/gfx/VkUtils.cpp
@@ -1,6 +1,6 @@
 #include "VkUtils.hpp"
 
-#include "../utils/Utils.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/containers/static_array.hpp>
 
diff --git a/src/render/ComputePass.cpp b/src/render/ComputePass.cpp
index 57eba31c..e3e44219 100644
--- a/src/render/ComputePass.cpp
+++ b/src/render/ComputePass.cpp
@@ -1,11 +1,11 @@
 #include "ComputePass.hpp"
 
-#include "../gfx/DescriptorAllocator.hpp"
-#include "../gfx/Device.hpp"
-#include "../gfx/VkUtils.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderTargets.hpp"
+#include "gfx/DescriptorAllocator.hpp"
+#include "gfx/Device.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderTargets.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <imgui.h>
diff --git a/src/render/ComputePass.hpp b/src/render/ComputePass.hpp
index 63ac9b20..a3e4add0 100644
--- a/src/render/ComputePass.hpp
+++ b/src/render/ComputePass.hpp
@@ -1,10 +1,10 @@
 #ifndef PROSPER_RENDER_COMPUTE_PASS_HPP
 #define PROSPER_RENDER_COMPUTE_PASS_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/ShaderReflection.hpp"
-#include "../utils/Fwd.hpp"
-#include "../utils/Utils.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <functional>
 #include <glm/glm.hpp>
diff --git a/src/render/DebugRenderer.cpp b/src/render/DebugRenderer.cpp
index 98d6249b..fc190abf 100644
--- a/src/render/DebugRenderer.cpp
+++ b/src/render/DebugRenderer.cpp
@@ -1,15 +1,15 @@
 #include "DebugRenderer.hpp"
 
-#include "../gfx/DescriptorAllocator.hpp"
-#include "../gfx/VkUtils.hpp"
-#include "../scene/Camera.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "LightClustering.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
-#include "Utils.hpp"
+#include "gfx/DescriptorAllocator.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/LightClustering.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/DebugRenderer.hpp b/src/render/DebugRenderer.hpp
index 8d32b069..61ad8f09 100644
--- a/src/render/DebugRenderer.hpp
+++ b/src/render/DebugRenderer.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_DEBUG_RENDERER_HPP
 #define PROSPER_RENDER_DEBUG_RENDERER_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "../gfx/ShaderReflection.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/hash_set.hpp>
diff --git a/src/render/DeferredShading.cpp b/src/render/DeferredShading.cpp
index bf4bcc45..1f35f347 100644
--- a/src/render/DeferredShading.cpp
+++ b/src/render/DeferredShading.cpp
@@ -1,17 +1,17 @@
 #include "DeferredShading.hpp"
 
-#include "../gfx/VkUtils.hpp"
-#include "../scene/Camera.hpp"
-#include "../scene/Light.hpp"
-#include "../scene/World.hpp"
-#include "../scene/WorldRenderStructs.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "GBufferRenderer.hpp"
-#include "LightClustering.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
-#include "Utils.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/GBufferRenderer.hpp"
+#include "render/LightClustering.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Light.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <fstream>
 #include <imgui.h>
diff --git a/src/render/DeferredShading.hpp b/src/render/DeferredShading.hpp
index 40c8d0e2..d19d6e3d 100644
--- a/src/render/DeferredShading.hpp
+++ b/src/render/DeferredShading.hpp
@@ -1,14 +1,14 @@
 #ifndef PROSPER_RENDER_DEFERRED_SHADING_HPP
 #define PROSPER_RENDER_DEFERRED_SHADING_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../scene/DrawType.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "../utils/Utils.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/DrawType.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/ForwardRenderer.cpp b/src/render/ForwardRenderer.cpp
index ea2bdc81..1f1f1149 100644
--- a/src/render/ForwardRenderer.cpp
+++ b/src/render/ForwardRenderer.cpp
@@ -1,24 +1,24 @@
 #include "ForwardRenderer.hpp"
 
-#include "../gfx/DescriptorAllocator.hpp"
-#include "../gfx/VkUtils.hpp"
-#include "../scene/Camera.hpp"
-#include "../scene/Light.hpp"
-#include "../scene/Material.hpp"
-#include "../scene/Mesh.hpp"
-#include "../scene/Scene.hpp"
-#include "../scene/World.hpp"
-#include "../scene/WorldRenderStructs.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "DrawStats.hpp"
-#include "HierarchicalDepthDownsampler.hpp"
-#include "LightClustering.hpp"
-#include "MeshletCuller.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
-#include "Utils.hpp"
+#include "gfx/DescriptorAllocator.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/DrawStats.hpp"
+#include "render/HierarchicalDepthDownsampler.hpp"
+#include "render/LightClustering.hpp"
+#include "render/MeshletCuller.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Light.hpp"
+#include "scene/Material.hpp"
+#include "scene/Mesh.hpp"
+#include "scene/Scene.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/ForwardRenderer.hpp b/src/render/ForwardRenderer.hpp
index ece7ec5f..3574eb25 100644
--- a/src/render/ForwardRenderer.hpp
+++ b/src/render/ForwardRenderer.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_FORWARD_RENDERER_HPP
 #define PROSPER_RENDER_FORWARD_RENDERER_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/ShaderReflection.hpp"
-#include "../scene/DrawType.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/DrawType.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/inline_array.hpp>
diff --git a/src/render/GBufferRenderer.cpp b/src/render/GBufferRenderer.cpp
index 8ec476f0..679ed687 100644
--- a/src/render/GBufferRenderer.cpp
+++ b/src/render/GBufferRenderer.cpp
@@ -1,21 +1,21 @@
 #include "GBufferRenderer.hpp"
 
-#include "../gfx/DescriptorAllocator.hpp"
-#include "../gfx/VkUtils.hpp"
-#include "../scene/Camera.hpp"
-#include "../scene/Material.hpp"
-#include "../scene/Mesh.hpp"
-#include "../scene/Scene.hpp"
-#include "../scene/World.hpp"
-#include "../scene/WorldRenderStructs.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "DrawStats.hpp"
-#include "LightClustering.hpp"
-#include "MeshletCuller.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
+#include "gfx/DescriptorAllocator.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/DrawStats.hpp"
+#include "render/LightClustering.hpp"
+#include "render/MeshletCuller.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Material.hpp"
+#include "scene/Mesh.hpp"
+#include "scene/Scene.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 #include "wheels/assert.hpp"
 
 #include <cstdint>
diff --git a/src/render/GBufferRenderer.hpp b/src/render/GBufferRenderer.hpp
index 4d168484..e0cbfd27 100644
--- a/src/render/GBufferRenderer.hpp
+++ b/src/render/GBufferRenderer.hpp
@@ -1,14 +1,14 @@
 #ifndef PROSPER_RENDER_GBUFFER_RENDERER_HPP
 #define PROSPER_RENDER_GBUFFER_RENDERER_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/ShaderReflection.hpp"
-#include "../scene/DrawType.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "render/Fwd.hpp"
 #include "render/HierarchicalDepthDownsampler.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/DrawType.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/HierarchicalDepthDownsampler.cpp b/src/render/HierarchicalDepthDownsampler.cpp
index b449a787..9e10225d 100644
--- a/src/render/HierarchicalDepthDownsampler.cpp
+++ b/src/render/HierarchicalDepthDownsampler.cpp
@@ -1,10 +1,10 @@
 #include "HierarchicalDepthDownsampler.hpp"
 
-#include "../gfx/VkUtils.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResources.hpp"
+#include "gfx/VkUtils.hpp"
 #include "render/ComputePass.hpp"
+#include "render/RenderResources.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/render/HierarchicalDepthDownsampler.hpp b/src/render/HierarchicalDepthDownsampler.hpp
index 4e7a0df5..f819aeca 100644
--- a/src/render/HierarchicalDepthDownsampler.hpp
+++ b/src/render/HierarchicalDepthDownsampler.hpp
@@ -1,11 +1,11 @@
 #ifndef PROSPER_RENDER_HIERARCHICAL_DEPTH_DOWNSAMLPER_HPP
 #define PROSPER_RENDER_HIERARCHICAL_DEPTH_DOWNSAMLPER_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/hash_set.hpp>
diff --git a/src/render/ImGuiRenderer.cpp b/src/render/ImGuiRenderer.cpp
index 849674a9..14957857 100644
--- a/src/render/ImGuiRenderer.cpp
+++ b/src/render/ImGuiRenderer.cpp
@@ -1,13 +1,13 @@
 #include "ImGuiRenderer.hpp"
 
-#include "../Window.hpp"
-#include "../gfx/Swapchain.hpp"
-#include "../gfx/VkUtils.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
+#include "Window.hpp"
+#include "gfx/Swapchain.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <GLFW/glfw3.h>
 #include <imgui.h>
diff --git a/src/render/ImGuiRenderer.hpp b/src/render/ImGuiRenderer.hpp
index f53fd3a1..15923d92 100644
--- a/src/render/ImGuiRenderer.hpp
+++ b/src/render/ImGuiRenderer.hpp
@@ -2,10 +2,10 @@
 #ifndef PROSPER_RENDER_IMGUI_RENDERER_HPP
 #define PROSPER_RENDER_IMGUI_RENDERER_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../render/RenderResourceHandle.hpp"
-#include "../utils/Fwd.hpp"
-#include "Fwd.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "utils/Fwd.hpp"
 
 #include <imgui.h>
 #include <vulkan/vulkan.hpp>
diff --git a/src/render/ImageBasedLighting.cpp b/src/render/ImageBasedLighting.cpp
index 24fc5963..d5e6132d 100644
--- a/src/render/ImageBasedLighting.cpp
+++ b/src/render/ImageBasedLighting.cpp
@@ -1,8 +1,8 @@
 #include "ImageBasedLighting.hpp"
 
-#include "../scene/World.hpp"
-#include "../scene/WorldRenderStructs.hpp"
-#include "../utils/Profiler.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Profiler.hpp"
 
 #include <glm/glm.hpp>
 
diff --git a/src/render/ImageBasedLighting.hpp b/src/render/ImageBasedLighting.hpp
index f84dbf50..84b25af5 100644
--- a/src/render/ImageBasedLighting.hpp
+++ b/src/render/ImageBasedLighting.hpp
@@ -1,10 +1,10 @@
 #ifndef PROSPER_RENDER_IMAGE_BASED_LIGHTING_HPP
 #define PROSPER_RENDER_IMAGE_BASED_LIGHTING_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../scene/Fwd.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "scene/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/LightClustering.cpp b/src/render/LightClustering.cpp
index 77180624..27025658 100644
--- a/src/render/LightClustering.cpp
+++ b/src/render/LightClustering.cpp
@@ -1,13 +1,13 @@
 #include "LightClustering.hpp"
 
-#include "../gfx/VkUtils.hpp"
-#include "../scene/Camera.hpp"
-#include "../scene/Light.hpp"
-#include "../scene/World.hpp"
-#include "../scene/WorldRenderStructs.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResources.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Light.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/containers/span.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/LightClustering.hpp b/src/render/LightClustering.hpp
index 1643afb5..0c20fe0c 100644
--- a/src/render/LightClustering.hpp
+++ b/src/render/LightClustering.hpp
@@ -1,12 +1,12 @@
 #ifndef PROSPER_RENDER_LIGHT_CLUSTERING_HPP
 #define PROSPER_RENDER_LIGHT_CLUSTERING_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 
diff --git a/src/render/MeshletCuller.cpp b/src/render/MeshletCuller.cpp
index 78f1934d..dacb16c1 100644
--- a/src/render/MeshletCuller.cpp
+++ b/src/render/MeshletCuller.cpp
@@ -1,17 +1,17 @@
 #include "MeshletCuller.hpp"
 
-#include "../gfx/Device.hpp"
-#include "../scene/Camera.hpp"
-#include "../scene/Material.hpp"
-#include "../scene/Mesh.hpp"
-#include "../scene/Model.hpp"
-#include "../scene/Scene.hpp"
-#include "../scene/World.hpp"
-#include "../scene/WorldRenderStructs.hpp"
-#include "../utils/Profiler.hpp"
-#include "DrawStats.hpp"
-#include "RenderResources.hpp"
+#include "gfx/Device.hpp"
+#include "render/DrawStats.hpp"
 #include "render/RenderResourceHandle.hpp"
+#include "render/RenderResources.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Material.hpp"
+#include "scene/Mesh.hpp"
+#include "scene/Model.hpp"
+#include "scene/Scene.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Profiler.hpp"
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/render/MeshletCuller.hpp b/src/render/MeshletCuller.hpp
index 2e5192e4..8c7d994f 100644
--- a/src/render/MeshletCuller.hpp
+++ b/src/render/MeshletCuller.hpp
@@ -1,14 +1,14 @@
 #ifndef PROSPER_RENDER_MESHLET_CULLER_HPP
 #define PROSPER_RENDER_MESHLET_CULLER_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "../utils/Utils.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/hash_set.hpp>
diff --git a/src/render/RenderImageCollection.hpp b/src/render/RenderImageCollection.hpp
index 1e0a0516..e8ae3674 100644
--- a/src/render/RenderImageCollection.hpp
+++ b/src/render/RenderImageCollection.hpp
@@ -1,11 +1,11 @@
 #ifndef PROSPER_RENDER_IMAGE_COLLECTION_HPP
 #define PROSPER_RENDER_IMAGE_COLLECTION_HPP
 
-#include "../Allocators.hpp"
-#include "../gfx/Fwd.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResourceCollection.hpp"
-#include "RenderResourceHandle.hpp"
+#include "Allocators.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/RenderResourceCollection.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "utils/Utils.hpp"
 
 #include <vulkan/vulkan.hpp>
 #include <wheels/allocators/allocator.hpp>
diff --git a/src/render/RenderResourceCollection.hpp b/src/render/RenderResourceCollection.hpp
index 8ce1cbac..c65670be 100644
--- a/src/render/RenderResourceCollection.hpp
+++ b/src/render/RenderResourceCollection.hpp
@@ -1,10 +1,10 @@
 #ifndef PROSPER_RENDER_RESOURCE_COLLECTION_HPP
 #define PROSPER_RENDER_RESOURCE_COLLECTION_HPP
 
-#include "../Allocators.hpp"
-#include "../gfx/Device.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResourceHandle.hpp"
+#include "Allocators.hpp"
+#include "gfx/Device.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "utils/Utils.hpp"
 
 #include <vulkan/vulkan.hpp>
 #include <wheels/allocators/allocator.hpp>
diff --git a/src/render/RenderResourceHandle.hpp b/src/render/RenderResourceHandle.hpp
index 1310fc9a..e1b371b5 100644
--- a/src/render/RenderResourceHandle.hpp
+++ b/src/render/RenderResourceHandle.hpp
@@ -1,7 +1,7 @@
 #ifndef PROSPER_RENDER_RESOURCE_HANDLE_HPP
 #define PROSPER_RENDER_RESOURCE_HANDLE_HPP
 
-#include "../gfx/Fwd.hpp"
+#include "gfx/Fwd.hpp"
 
 #include <wheels/containers/pair.hpp>
 
diff --git a/src/render/RenderResources.hpp b/src/render/RenderResources.hpp
index 94ede86d..ad98b061 100644
--- a/src/render/RenderResources.hpp
+++ b/src/render/RenderResources.hpp
@@ -1,12 +1,12 @@
 #ifndef PROSPER_RENDER_RESOURCES_HPP
 #define PROSPER_RENDER_RESOURCES_HPP
 
-#include "../gfx/Resources.hpp"
-#include "../gfx/RingBuffer.hpp"
-#include "../scene/DebugGeometry.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderImageCollection.hpp"
-#include "RenderResourceCollection.hpp"
+#include "gfx/Resources.hpp"
+#include "gfx/RingBuffer.hpp"
+#include "render/RenderImageCollection.hpp"
+#include "render/RenderResourceCollection.hpp"
+#include "scene/DebugGeometry.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/allocator.hpp>
 #include <wheels/containers/array.hpp>
diff --git a/src/render/RenderTargets.cpp b/src/render/RenderTargets.cpp
index 3d89692a..a023fbd9 100644
--- a/src/render/RenderTargets.cpp
+++ b/src/render/RenderTargets.cpp
@@ -1,8 +1,8 @@
 #include "RenderTargets.hpp"
 
-#include "../gfx/Device.hpp"
-#include "../gfx/Resources.hpp"
-#include "RenderResources.hpp"
+#include "gfx/Device.hpp"
+#include "gfx/Resources.hpp"
+#include "render/RenderResources.hpp"
 
 ImageHandle createDepth(const vk::Extent2D &size, const char *debugName)
 {
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 37f310b0..63f9ea7d 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1,33 +1,33 @@
 #include "Renderer.hpp"
 
-#include "../Allocators.hpp"
-#include "../gfx/Swapchain.hpp"
-#include "../scene/Camera.hpp"
-#include "../scene/World.hpp"
-#include "../utils/InputHandler.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Timer.hpp"
-#include "../utils/Ui.hpp"
-#include "DebugRenderer.hpp"
-#include "DeferredShading.hpp"
-#include "ForwardRenderer.hpp"
-#include "GBufferRenderer.hpp"
-#include "HierarchicalDepthDownsampler.hpp"
-#include "ImGuiRenderer.hpp"
-#include "ImageBasedLighting.hpp"
-#include "LightClustering.hpp"
-#include "MeshletCuller.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
-#include "RtReference.hpp"
-#include "SkyboxRenderer.hpp"
-#include "TemporalAntiAliasing.hpp"
-#include "TextureDebug.hpp"
-#include "TextureReadback.hpp"
-#include "ToneMap.hpp"
-#include "dof/DepthOfField.hpp"
+#include "Allocators.hpp"
+#include "gfx/Swapchain.hpp"
+#include "render/DebugRenderer.hpp"
+#include "render/DeferredShading.hpp"
+#include "render/ForwardRenderer.hpp"
+#include "render/GBufferRenderer.hpp"
+#include "render/HierarchicalDepthDownsampler.hpp"
+#include "render/ImGuiRenderer.hpp"
+#include "render/ImageBasedLighting.hpp"
+#include "render/LightClustering.hpp"
+#include "render/MeshletCuller.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/RtReference.hpp"
+#include "render/SkyboxRenderer.hpp"
+#include "render/TemporalAntiAliasing.hpp"
+#include "render/TextureDebug.hpp"
+#include "render/TextureReadback.hpp"
+#include "render/ToneMap.hpp"
+#include "render/dof/DepthOfField.hpp"
 #include "rtdi/RtDirectIllumination.hpp"
+#include "scene/Camera.hpp"
+#include "scene/World.hpp"
+#include "utils/InputHandler.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Timer.hpp"
+#include "utils/Ui.hpp"
 
 using namespace wheels;
 using namespace glm;
diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp
index 660a02c3..39658a9c 100644
--- a/src/render/Renderer.hpp
+++ b/src/render/Renderer.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_RENDERER_HPP
 #define PROSPER_RENDER_RENDERER_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../scene/DrawType.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Utils.hpp"
-#include "DrawStats.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/DrawStats.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/DrawType.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <vulkan/vulkan.hpp>
diff --git a/src/render/RtReference.cpp b/src/render/RtReference.cpp
index b730b041..fe9361b4 100644
--- a/src/render/RtReference.cpp
+++ b/src/render/RtReference.cpp
@@ -1,18 +1,18 @@
 #include "RtReference.hpp"
 
-#include "../gfx/DescriptorAllocator.hpp"
-#include "../gfx/VkUtils.hpp"
-#include "../scene/Camera.hpp"
-#include "../scene/Light.hpp"
-#include "../scene/Scene.hpp"
-#include "../scene/World.hpp"
-#include "../scene/WorldRenderStructs.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Ui.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
+#include "gfx/DescriptorAllocator.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Light.hpp"
+#include "scene/Scene.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Ui.hpp"
+#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/RtReference.hpp b/src/render/RtReference.hpp
index be900281..0aeaf153 100644
--- a/src/render/RtReference.hpp
+++ b/src/render/RtReference.hpp
@@ -1,15 +1,15 @@
 #ifndef PROSPER_RENDER_RT_REFERENCE_HPP
 #define PROSPER_RENDER_RT_REFERENCE_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "../gfx/ShaderReflection.hpp"
-#include "../scene/DrawType.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "../utils/Utils.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/DrawType.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/SkyboxRenderer.cpp b/src/render/SkyboxRenderer.cpp
index 8898d9f4..c57f0e60 100644
--- a/src/render/SkyboxRenderer.cpp
+++ b/src/render/SkyboxRenderer.cpp
@@ -1,16 +1,16 @@
 #include "SkyboxRenderer.hpp"
 
-#include "../gfx/Device.hpp"
-#include "../gfx/VkUtils.hpp"
-#include "../scene/Camera.hpp"
-#include "../scene/World.hpp"
-#include "../scene/WorldRenderStructs.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
-#include "Utils.hpp"
+#include "gfx/Device.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/render/SkyboxRenderer.hpp b/src/render/SkyboxRenderer.hpp
index 65b2492b..cafa72ff 100644
--- a/src/render/SkyboxRenderer.hpp
+++ b/src/render/SkyboxRenderer.hpp
@@ -1,12 +1,12 @@
 #ifndef PROSPER_RENDER_SKYBOX_RENDERER_HPP
 #define PROSPER_RENDER_SKYBOX_RENDERER_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/ShaderReflection.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/TemporalAntiAliasing.cpp b/src/render/TemporalAntiAliasing.cpp
index 5c2c01a5..6922b53f 100644
--- a/src/render/TemporalAntiAliasing.cpp
+++ b/src/render/TemporalAntiAliasing.cpp
@@ -1,13 +1,13 @@
 #include "TemporalAntiAliasing.hpp"
 
-#include "../gfx/VkUtils.hpp"
-#include "../scene/Camera.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Ui.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResources.hpp"
-#include "RenderTargets.hpp"
-#include "Utils.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Ui.hpp"
+#include "utils/Utils.hpp"
 
 #include <fstream>
 #include <glm/glm.hpp>
diff --git a/src/render/TemporalAntiAliasing.hpp b/src/render/TemporalAntiAliasing.hpp
index ba50ead9..d79946d9 100644
--- a/src/render/TemporalAntiAliasing.hpp
+++ b/src/render/TemporalAntiAliasing.hpp
@@ -1,14 +1,14 @@
 #ifndef PROSPER_RENDER_TEMPORAL_ANTI_ALIASING_HPP
 #define PROSPER_RENDER_TEMPORAL_ANTI_ALIASING_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../scene/Fwd.hpp"
-#include "../utils/ForEach.hpp"
-#include "../utils/Fwd.hpp"
-#include "../utils/Utils.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
 #include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/ForEach.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/TextureDebug.cpp b/src/render/TextureDebug.cpp
index 6ae03805..6052985a 100644
--- a/src/render/TextureDebug.cpp
+++ b/src/render/TextureDebug.cpp
@@ -1,11 +1,11 @@
 #include "TextureDebug.hpp"
 
-#include "../gfx/VkUtils.hpp"
-#include "../utils/Hashes.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Ui.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResources.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "utils/Hashes.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Ui.hpp"
+#include "utils/Utils.hpp"
 
 #include <algorithm>
 #include <fstream>
diff --git a/src/render/TextureDebug.hpp b/src/render/TextureDebug.hpp
index 9e7f9bcf..9f74b03d 100644
--- a/src/render/TextureDebug.hpp
+++ b/src/render/TextureDebug.hpp
@@ -1,15 +1,15 @@
 #ifndef PROSPER_RENDER_TEXTURE_DEBUG_HPP
 #define PROSPER_RENDER_TEXTURE_DEBUG_HPP
 
-#include "../Allocators.hpp"
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "../utils/ForEach.hpp"
-#include "../utils/Fwd.hpp"
-#include "../utils/Utils.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
-#include "RenderResourceHandle.hpp"
+#include "Allocators.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "utils/ForEach.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <wheels/allocators/scoped_scratch.hpp>
diff --git a/src/render/TextureReadback.cpp b/src/render/TextureReadback.cpp
index f4bad54a..5bf4359b 100644
--- a/src/render/TextureReadback.cpp
+++ b/src/render/TextureReadback.cpp
@@ -1,8 +1,8 @@
 #include "TextureReadback.hpp"
 
-#include "../gfx/VkUtils.hpp"
-#include "../utils/Profiler.hpp"
-#include "RenderResources.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "utils/Profiler.hpp"
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/render/TextureReadback.hpp b/src/render/TextureReadback.hpp
index da005139..c731a259 100644
--- a/src/render/TextureReadback.hpp
+++ b/src/render/TextureReadback.hpp
@@ -1,12 +1,12 @@
 #ifndef PROSPER_RENDER_TEXTURE_READBACK_HPP
 #define PROSPER_RENDER_TEXTURE_READBACK_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "../utils/Fwd.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
 #include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <glm/glm.hpp>
 #include <wheels/allocators/scoped_scratch.hpp>
diff --git a/src/render/ToneMap.cpp b/src/render/ToneMap.cpp
index 8aad976c..9eae66f7 100644
--- a/src/render/ToneMap.cpp
+++ b/src/render/ToneMap.cpp
@@ -1,10 +1,10 @@
 #include "ToneMap.hpp"
 
-#include "../gfx/VkUtils.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/Utils.hpp"
-#include "RenderResources.hpp"
-#include "Utils.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/Utils.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <fstream>
 #include <glm/glm.hpp>
diff --git a/src/render/ToneMap.hpp b/src/render/ToneMap.hpp
index 639492ee..9187379c 100644
--- a/src/render/ToneMap.hpp
+++ b/src/render/ToneMap.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_TONE_MAP_HPP
 #define PROSPER_RENDER_TONE_MAP_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../scene/Texture.hpp"
-#include "../utils/Fwd.hpp"
-#include "../utils/Utils.hpp"
-#include "ComputePass.hpp"
-#include "Fwd.hpp"
 #include "RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "scene/Texture.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/Utils.cpp b/src/render/Utils.cpp
index 60e90300..1fdde6bb 100644
--- a/src/render/Utils.cpp
+++ b/src/render/Utils.cpp
@@ -1,6 +1,6 @@
 #include "Utils.hpp"
 
-#include "../utils/Utils.hpp"
+#include "utils/Utils.hpp"
 
 vk::Extent2D getExtent2D(ImageHandle image)
 {
diff --git a/src/render/dof/DepthOfField.cpp b/src/render/dof/DepthOfField.cpp
index c47181cf..e0e8a521 100644
--- a/src/render/dof/DepthOfField.cpp
+++ b/src/render/dof/DepthOfField.cpp
@@ -1,7 +1,7 @@
 #include "DepthOfField.hpp"
 
-#include "../../utils/Profiler.hpp"
-#include "../RenderResources.hpp"
+#include "render/RenderResources.hpp"
+#include "utils/Profiler.hpp"
 
 using namespace wheels;
 
diff --git a/src/render/dof/DepthOfField.hpp b/src/render/dof/DepthOfField.hpp
index fe14727b..014e8c4d 100644
--- a/src/render/dof/DepthOfField.hpp
+++ b/src/render/dof/DepthOfField.hpp
@@ -1,19 +1,19 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../../utils/Utils.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
-#include "DepthOfFieldCombine.hpp"
-#include "DepthOfFieldDilate.hpp"
-#include "DepthOfFieldFilter.hpp"
-#include "DepthOfFieldFlatten.hpp"
-#include "DepthOfFieldGather.hpp"
-#include "DepthOfFieldReduce.hpp"
-#include "DepthOfFieldSetup.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "render/dof/DepthOfFieldCombine.hpp"
+#include "render/dof/DepthOfFieldDilate.hpp"
+#include "render/dof/DepthOfFieldFilter.hpp"
+#include "render/dof/DepthOfFieldFlatten.hpp"
+#include "render/dof/DepthOfFieldGather.hpp"
+#include "render/dof/DepthOfFieldReduce.hpp"
+#include "render/dof/DepthOfFieldSetup.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/dof/DepthOfFieldCombine.cpp b/src/render/dof/DepthOfFieldCombine.cpp
index f0b5dbc7..5b6848cc 100644
--- a/src/render/dof/DepthOfFieldCombine.cpp
+++ b/src/render/dof/DepthOfFieldCombine.cpp
@@ -1,12 +1,12 @@
 #include "DepthOfFieldCombine.hpp"
 
-#include "../../gfx/VkUtils.hpp"
-#include "../../scene/Camera.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../RenderResources.hpp"
-#include "../RenderTargets.hpp"
-#include "../Utils.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/dof/DepthOfFieldCombine.hpp b/src/render/dof/DepthOfFieldCombine.hpp
index 1bfed0b1..4c6d9d4d 100644
--- a/src/render/dof/DepthOfFieldCombine.hpp
+++ b/src/render/dof/DepthOfFieldCombine.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_COMBINE_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_COMBINE_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../../utils/Utils.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/dof/DepthOfFieldDilate.cpp b/src/render/dof/DepthOfFieldDilate.cpp
index 033b4dc7..7131eba1 100644
--- a/src/render/dof/DepthOfFieldDilate.cpp
+++ b/src/render/dof/DepthOfFieldDilate.cpp
@@ -1,12 +1,12 @@
 #include "DepthOfFieldDilate.hpp"
 
-#include "../../gfx/VkUtils.hpp"
-#include "../../scene/Camera.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../RenderResources.hpp"
-#include "../Utils.hpp"
-#include "DepthOfField.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/Utils.hpp"
+#include "render/dof/DepthOfField.hpp"
+#include "scene/Camera.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <imgui.h>
diff --git a/src/render/dof/DepthOfFieldDilate.hpp b/src/render/dof/DepthOfFieldDilate.hpp
index ae5deaf5..00fe8748 100644
--- a/src/render/dof/DepthOfFieldDilate.hpp
+++ b/src/render/dof/DepthOfFieldDilate.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_DILATE_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_DILATE_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../../utils/Utils.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/dof/DepthOfFieldFilter.cpp b/src/render/dof/DepthOfFieldFilter.cpp
index a53fc088..9237f00b 100644
--- a/src/render/dof/DepthOfFieldFilter.cpp
+++ b/src/render/dof/DepthOfFieldFilter.cpp
@@ -1,9 +1,9 @@
 #include "DepthOfFieldFilter.hpp"
 
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../RenderResources.hpp"
-#include "../RenderTargets.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/render/dof/DepthOfFieldFilter.hpp b/src/render/dof/DepthOfFieldFilter.hpp
index 052e5bc3..36cb0c0f 100644
--- a/src/render/dof/DepthOfFieldFilter.hpp
+++ b/src/render/dof/DepthOfFieldFilter.hpp
@@ -1,12 +1,12 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_FILTER_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_FILTER_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../gfx/Resources.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 
diff --git a/src/render/dof/DepthOfFieldFlatten.cpp b/src/render/dof/DepthOfFieldFlatten.cpp
index 593af9b6..5008c12c 100644
--- a/src/render/dof/DepthOfFieldFlatten.cpp
+++ b/src/render/dof/DepthOfFieldFlatten.cpp
@@ -1,9 +1,9 @@
 #include "DepthOfFieldFlatten.hpp"
 
-#include "../../gfx/VkUtils.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../Utils.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/Utils.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <imgui.h>
diff --git a/src/render/dof/DepthOfFieldFlatten.hpp b/src/render/dof/DepthOfFieldFlatten.hpp
index ef5037f7..af4c13c3 100644
--- a/src/render/dof/DepthOfFieldFlatten.hpp
+++ b/src/render/dof/DepthOfFieldFlatten.hpp
@@ -1,12 +1,12 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_FLATTEN_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_FLATTEN_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../../utils/Utils.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/dof/DepthOfFieldGather.cpp b/src/render/dof/DepthOfFieldGather.cpp
index 5ce6e7b2..7237dbc9 100644
--- a/src/render/dof/DepthOfFieldGather.cpp
+++ b/src/render/dof/DepthOfFieldGather.cpp
@@ -1,12 +1,12 @@
 #include "DepthOfFieldGather.hpp"
 
-#include "../../gfx/VkUtils.hpp"
-#include "../../scene/Camera.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../RenderResources.hpp"
-#include "../RenderTargets.hpp"
-#include "../Utils.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/dof/DepthOfFieldGather.hpp b/src/render/dof/DepthOfFieldGather.hpp
index cbff5ddf..f0c56c37 100644
--- a/src/render/dof/DepthOfFieldGather.hpp
+++ b/src/render/dof/DepthOfFieldGather.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_GATHER_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_GATHER_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../../utils/Utils.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/dof/DepthOfFieldReduce.cpp b/src/render/dof/DepthOfFieldReduce.cpp
index e98942c9..9f8175f7 100644
--- a/src/render/dof/DepthOfFieldReduce.cpp
+++ b/src/render/dof/DepthOfFieldReduce.cpp
@@ -1,11 +1,11 @@
 #include "DepthOfFieldReduce.hpp"
 
-#include "../../gfx/VkUtils.hpp"
-#include "../../scene/Camera.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../RenderResources.hpp"
-#include "../RenderTargets.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "scene/Camera.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/dof/DepthOfFieldReduce.hpp b/src/render/dof/DepthOfFieldReduce.hpp
index 3bc42392..4f75fc67 100644
--- a/src/render/dof/DepthOfFieldReduce.hpp
+++ b/src/render/dof/DepthOfFieldReduce.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_REDUCE_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_REDUCE_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../gfx/Resources.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../../utils/Utils.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/dof/DepthOfFieldSetup.cpp b/src/render/dof/DepthOfFieldSetup.cpp
index fd6d177e..9f06b632 100644
--- a/src/render/dof/DepthOfFieldSetup.cpp
+++ b/src/render/dof/DepthOfFieldSetup.cpp
@@ -1,13 +1,13 @@
 #include "DepthOfFieldSetup.hpp"
 
-#include "../../gfx/VkUtils.hpp"
-#include "../../scene/Camera.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../RenderResources.hpp"
-#include "../RenderTargets.hpp"
-#include "../Utils.hpp"
-#include "DepthOfField.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "render/dof/DepthOfField.hpp"
+#include "scene/Camera.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/dof/DepthOfFieldSetup.hpp b/src/render/dof/DepthOfFieldSetup.hpp
index cafd1ce7..56b67cb8 100644
--- a/src/render/dof/DepthOfFieldSetup.hpp
+++ b/src/render/dof/DepthOfFieldSetup.hpp
@@ -1,13 +1,13 @@
 #ifndef PROSPER_RENDER_DEPTH_OF_FIELD_SETUP_HPP
 #define PROSPER_RENDER_DEPTH_OF_FIELD_SETUP_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../../utils/Utils.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/rtdi/RtDiInitialReservoirs.cpp b/src/render/rtdi/RtDiInitialReservoirs.cpp
index b9a65a03..824ed4ef 100644
--- a/src/render/rtdi/RtDiInitialReservoirs.cpp
+++ b/src/render/rtdi/RtDiInitialReservoirs.cpp
@@ -1,14 +1,14 @@
 #include "RtDiInitialReservoirs.hpp"
 
-#include "../../scene/Camera.hpp"
-#include "../../scene/Light.hpp"
-#include "../../scene/World.hpp"
-#include "../../scene/WorldRenderStructs.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../GBufferRenderer.hpp"
-#include "../RenderResources.hpp"
-#include "../Utils.hpp"
+#include "render/GBufferRenderer.hpp"
+#include "render/RenderResources.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Light.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/render/rtdi/RtDiInitialReservoirs.hpp b/src/render/rtdi/RtDiInitialReservoirs.hpp
index a5db19d4..c100b716 100644
--- a/src/render/rtdi/RtDiInitialReservoirs.hpp
+++ b/src/render/rtdi/RtDiInitialReservoirs.hpp
@@ -1,12 +1,12 @@
 #ifndef PROSPER_RENDER_RTDI_INITIAL_RESERVOIRS_HPP
 #define PROSPER_RENDER_RTDI_INITIAL_RESERVOIRS_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/rtdi/RtDiSpatialReuse.cpp b/src/render/rtdi/RtDiSpatialReuse.cpp
index f3173f9a..6ea71cf7 100644
--- a/src/render/rtdi/RtDiSpatialReuse.cpp
+++ b/src/render/rtdi/RtDiSpatialReuse.cpp
@@ -1,14 +1,14 @@
 #include "RtDiSpatialReuse.hpp"
 
-#include "../../scene/Camera.hpp"
-#include "../../scene/Light.hpp"
-#include "../../scene/World.hpp"
-#include "../../scene/WorldRenderStructs.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../GBufferRenderer.hpp"
-#include "../RenderResources.hpp"
-#include "../Utils.hpp"
+#include "render/GBufferRenderer.hpp"
+#include "render/RenderResources.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Light.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 using namespace glm;
 using namespace wheels;
diff --git a/src/render/rtdi/RtDiSpatialReuse.hpp b/src/render/rtdi/RtDiSpatialReuse.hpp
index a15b79ed..51105b08 100644
--- a/src/render/rtdi/RtDiSpatialReuse.hpp
+++ b/src/render/rtdi/RtDiSpatialReuse.hpp
@@ -1,12 +1,12 @@
 #ifndef PROSPER_RENDER_RTDI_SPATIAL_REUSE_HPP
 #define PROSPER_RENDER_RTDI_SPATIAL_REUSE_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../ComputePass.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/ComputePass.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/render/rtdi/RtDiTrace.cpp b/src/render/rtdi/RtDiTrace.cpp
index c4ba89b5..3e759aba 100644
--- a/src/render/rtdi/RtDiTrace.cpp
+++ b/src/render/rtdi/RtDiTrace.cpp
@@ -1,18 +1,18 @@
 #include "RtDiTrace.hpp"
 
-#include "../../gfx/DescriptorAllocator.hpp"
-#include "../../gfx/VkUtils.hpp"
-#include "../../scene/Camera.hpp"
-#include "../../scene/Scene.hpp"
-#include "../../scene/World.hpp"
-#include "../../scene/WorldRenderStructs.hpp"
-#include "../../utils/Logger.hpp"
-#include "../../utils/Profiler.hpp"
-#include "../../utils/Utils.hpp"
-#include "../GBufferRenderer.hpp"
-#include "../RenderResources.hpp"
-#include "../RenderTargets.hpp"
-#include "../Utils.hpp"
+#include "gfx/DescriptorAllocator.hpp"
+#include "gfx/VkUtils.hpp"
+#include "render/GBufferRenderer.hpp"
+#include "render/RenderResources.hpp"
+#include "render/RenderTargets.hpp"
+#include "render/Utils.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Scene.hpp"
+#include "scene/World.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/Utils.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/rtdi/RtDiTrace.hpp b/src/render/rtdi/RtDiTrace.hpp
index 3a0ff5ac..7840b3c5 100644
--- a/src/render/rtdi/RtDiTrace.hpp
+++ b/src/render/rtdi/RtDiTrace.hpp
@@ -1,14 +1,14 @@
 #ifndef PROSPER_RENDER_RTDI_TRACE_HPP
 #define PROSPER_RENDER_RTDI_TRACE_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../gfx/Resources.hpp"
-#include "../../gfx/ShaderReflection.hpp"
-#include "../../scene/DrawType.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "scene/DrawType.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/render/rtdi/RtDirectIllumination.cpp b/src/render/rtdi/RtDirectIllumination.cpp
index 4d055bd0..80efd049 100644
--- a/src/render/rtdi/RtDirectIllumination.cpp
+++ b/src/render/rtdi/RtDirectIllumination.cpp
@@ -1,7 +1,7 @@
 #include "RtDirectIllumination.hpp"
 
-#include "../../utils/Profiler.hpp"
-#include "../RenderResources.hpp"
+#include "render/RenderResources.hpp"
+#include "utils/Profiler.hpp"
 
 #include <imgui.h>
 
diff --git a/src/render/rtdi/RtDirectIllumination.hpp b/src/render/rtdi/RtDirectIllumination.hpp
index 524a25eb..36051810 100644
--- a/src/render/rtdi/RtDirectIllumination.hpp
+++ b/src/render/rtdi/RtDirectIllumination.hpp
@@ -1,15 +1,15 @@
 #ifndef PROSPER_RENDER_RTDI_RT_DIRECT_ILLUMINATION_HPP
 #define PROSPER_RENDER_RTDI_RT_DIRECT_ILLUMINATION_HPP
 
-#include "../../gfx/Fwd.hpp"
-#include "../../scene/DrawType.hpp"
-#include "../../scene/Fwd.hpp"
-#include "../../utils/Fwd.hpp"
-#include "../Fwd.hpp"
-#include "../RenderResourceHandle.hpp"
-#include "RtDiInitialReservoirs.hpp"
-#include "RtDiSpatialReuse.hpp"
 #include "RtDiTrace.hpp"
+#include "gfx/Fwd.hpp"
+#include "render/Fwd.hpp"
+#include "render/RenderResourceHandle.hpp"
+#include "render/rtdi/RtDiInitialReservoirs.hpp"
+#include "render/rtdi/RtDiSpatialReuse.hpp"
+#include "scene/DrawType.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <wheels/allocators/scoped_scratch.hpp>
 #include <wheels/containers/static_array.hpp>
diff --git a/src/scene/Accessors.cpp b/src/scene/Accessors.cpp
index 5ee4b7b8..2f0e7a72 100644
--- a/src/scene/Accessors.cpp
+++ b/src/scene/Accessors.cpp
@@ -1,6 +1,6 @@
 #include "Accessors.hpp"
 
-#include "../utils/Utils.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
diff --git a/src/scene/Animations.hpp b/src/scene/Animations.hpp
index c4b847d7..9eb87868 100644
--- a/src/scene/Animations.hpp
+++ b/src/scene/Animations.hpp
@@ -2,8 +2,8 @@
 #ifndef PROSPER_SCENE_ANIMATIONS_HPP
 #define PROSPER_SCENE_ANIMATIONS_HPP
 
-#include "../Allocators.hpp"
-#include "Accessors.hpp"
+#include "Allocators.hpp"
+#include "scene/Accessors.hpp"
 
 #include <cmath>
 #include <glm/glm.hpp>
diff --git a/src/scene/Camera.cpp b/src/scene/Camera.cpp
index b7018646..774c5f5a 100644
--- a/src/scene/Camera.cpp
+++ b/src/scene/Camera.cpp
@@ -1,10 +1,10 @@
 #include "Camera.hpp"
 
-#include "../gfx/DescriptorAllocator.hpp"
-#include "../gfx/Device.hpp"
-#include "../gfx/RingBuffer.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Utils.hpp"
+#include "gfx/DescriptorAllocator.hpp"
+#include "gfx/Device.hpp"
+#include "gfx/RingBuffer.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/gtc/matrix_access.hpp>
 #include <imgui.h>
diff --git a/src/scene/Camera.hpp b/src/scene/Camera.hpp
index df04c998..3ab00c2c 100644
--- a/src/scene/Camera.hpp
+++ b/src/scene/Camera.hpp
@@ -1,9 +1,9 @@
 #ifndef PROSPER_SCENE_CAMERA_HPP
 #define PROSPER_SCENE_CAMERA_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/ShaderReflection.hpp"
-#include "../utils/Utils.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/ShaderReflection.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <wheels/containers/optional.hpp>
diff --git a/src/scene/DebugGeometry.cpp b/src/scene/DebugGeometry.cpp
index 760e6b60..2f9ded13 100644
--- a/src/scene/DebugGeometry.cpp
+++ b/src/scene/DebugGeometry.cpp
@@ -1,6 +1,6 @@
 #include "DebugGeometry.hpp"
 
-#include "../utils/Utils.hpp"
+#include "utils/Utils.hpp"
 
 void DebugLines::reset() { count = 0; }
 
diff --git a/src/scene/DebugGeometry.hpp b/src/scene/DebugGeometry.hpp
index bbab02bb..906702c3 100644
--- a/src/scene/DebugGeometry.hpp
+++ b/src/scene/DebugGeometry.hpp
@@ -1,7 +1,7 @@
 #ifndef PROSPER_SCENE_DEBUG_GEOMETRY_HPP
 #define PROSPER_SCENE_DEBUG_GEOMETRY_HPP
 
-#include "../gfx/Resources.hpp"
+#include "gfx/Resources.hpp"
 
 #include <glm/glm.hpp>
 
diff --git a/src/scene/DeferredLoadingContext.cpp b/src/scene/DeferredLoadingContext.cpp
index 0d51f209..e574fbd8 100644
--- a/src/scene/DeferredLoadingContext.cpp
+++ b/src/scene/DeferredLoadingContext.cpp
@@ -1,9 +1,9 @@
 #include "DeferredLoadingContext.hpp"
 
-#include "../gfx/Device.hpp"
-#include "../gfx/VkUtils.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Utils.hpp"
+#include "gfx/Device.hpp"
+#include "gfx/VkUtils.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/gtc/packing.hpp>
 #include <meshoptimizer.h>
diff --git a/src/scene/DeferredLoadingContext.hpp b/src/scene/DeferredLoadingContext.hpp
index 7a57d923..7304e1d2 100644
--- a/src/scene/DeferredLoadingContext.hpp
+++ b/src/scene/DeferredLoadingContext.hpp
@@ -1,15 +1,15 @@
 #ifndef PROSPER_SCENE_DEFERRED_LOADING_CONTEXT
 #define PROSPER_SCENE_DEFERRED_LOADING_CONTEXT
 
-#include "../Allocators.hpp"
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "../utils/Timer.hpp"
-#include "../utils/Utils.hpp"
-#include "Fwd.hpp"
-#include "Material.hpp"
+#include "Allocators.hpp"
 #include "Mesh.hpp"
 #include "Texture.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "scene/Fwd.hpp"
+#include "scene/Material.hpp"
+#include "utils/Timer.hpp"
+#include "utils/Utils.hpp"
 
 #include <atomic>
 #include <cgltf.h>
diff --git a/src/scene/DrawType.hpp b/src/scene/DrawType.hpp
index 7cc5188d..5daa2d3b 100644
--- a/src/scene/DrawType.hpp
+++ b/src/scene/DrawType.hpp
@@ -1,7 +1,7 @@
 #ifndef PROSPER_SCENE_DRAW_TYPE_HPP
 #define PROSPER_SCENE_DRAW_TYPE_HPP
 
-#include "../utils/ForEach.hpp"
+#include "utils/ForEach.hpp"
 
 #include <wheels/containers/static_array.hpp>
 
diff --git a/src/scene/Light.cpp b/src/scene/Light.cpp
index 45a826bc..de9125e1 100644
--- a/src/scene/Light.cpp
+++ b/src/scene/Light.cpp
@@ -1,6 +1,6 @@
 #include "Light.hpp"
 
-#include "../gfx/RingBuffer.hpp"
+#include "gfx/RingBuffer.hpp"
 
 using namespace wheels;
 
diff --git a/src/scene/Light.hpp b/src/scene/Light.hpp
index 01ece2cc..978685e3 100644
--- a/src/scene/Light.hpp
+++ b/src/scene/Light.hpp
@@ -1,8 +1,8 @@
 #ifndef PROSPER_SCENE_LIGHT_HPP
 #define PROSPER_SCENE_LIGHT_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../utils/Utils.hpp"
+#include "gfx/Fwd.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/glm.hpp>
 #include <wheels/containers/inline_array.hpp>
diff --git a/src/scene/Mesh.hpp b/src/scene/Mesh.hpp
index ac29265e..75874322 100644
--- a/src/scene/Mesh.hpp
+++ b/src/scene/Mesh.hpp
@@ -1,7 +1,7 @@
 #ifndef PROSPER_SCENE_MESH_HPP
 #define PROSPER_SCENE_MESH_HPP
 
-#include "../gfx/Resources.hpp"
+#include "gfx/Resources.hpp"
 
 constexpr vk::Format sVertexPositionFormat = vk::Format::eR16G16B16A16Sfloat;
 constexpr uint32_t sVertexPositionByteSize = 8;
diff --git a/src/scene/Model.hpp b/src/scene/Model.hpp
index 151ce079..1c7be144 100644
--- a/src/scene/Model.hpp
+++ b/src/scene/Model.hpp
@@ -1,7 +1,7 @@
 #ifndef PROSPER_SCENE_MODEL_HPP
 #define PROSPER_SCENE_MODEL_HPP
 
-#include "../Allocators.hpp"
+#include "Allocators.hpp"
 
 #include <glm/glm.hpp>
 #include <wheels/allocators/allocator.hpp>
diff --git a/src/scene/Scene.hpp b/src/scene/Scene.hpp
index f9d22aeb..3551ddbd 100644
--- a/src/scene/Scene.hpp
+++ b/src/scene/Scene.hpp
@@ -1,10 +1,10 @@
 #ifndef PROSPER_SCENE_HPP
 #define PROSPER_SCENE_HPP
 
-#include "../Allocators.hpp"
-#include "../gfx/Resources.hpp"
-#include "Light.hpp"
-#include "Model.hpp"
+#include "Allocators.hpp"
+#include "gfx/Resources.hpp"
+#include "scene/Light.hpp"
+#include "scene/Model.hpp"
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
diff --git a/src/scene/Texture.cpp b/src/scene/Texture.cpp
index d44ba15f..b78e4330 100644
--- a/src/scene/Texture.cpp
+++ b/src/scene/Texture.cpp
@@ -1,10 +1,10 @@
 #include "Texture.hpp"
 
-#include "../gfx/Device.hpp"
-#include "../utils/Dds.hpp"
-#include "../utils/Ktx.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Utils.hpp"
+#include "gfx/Device.hpp"
+#include "utils/Dds.hpp"
+#include "utils/Ktx.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
 
 #include <cmath>
 #include <fstream>
diff --git a/src/scene/Texture.hpp b/src/scene/Texture.hpp
index 32564e2b..50e3b6a0 100644
--- a/src/scene/Texture.hpp
+++ b/src/scene/Texture.hpp
@@ -1,9 +1,9 @@
 #ifndef PROSPER_SCENE_TEXTURE_HPP
 #define PROSPER_SCENE_TEXTURE_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "../utils/Fwd.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "utils/Fwd.hpp"
 
 #include <filesystem>
 #include <wheels/allocators/scoped_scratch.hpp>
diff --git a/src/scene/World.cpp b/src/scene/World.cpp
index a74b3561..1e89953b 100644
--- a/src/scene/World.cpp
+++ b/src/scene/World.cpp
@@ -1,19 +1,19 @@
 #include "World.hpp"
 
-#include "../gfx/Device.hpp"
-#include "../gfx/RingBuffer.hpp"
-#include "../utils/Logger.hpp"
-#include "../utils/Profiler.hpp"
-#include "../utils/SceneStats.hpp"
-#include "../utils/Ui.hpp"
-#include "../utils/Utils.hpp"
-#include "Animations.hpp"
-#include "Camera.hpp"
-#include "Material.hpp"
-#include "Mesh.hpp"
-#include "Model.hpp"
 #include "Scene.hpp"
 #include "WorldData.hpp"
+#include "gfx/Device.hpp"
+#include "gfx/RingBuffer.hpp"
+#include "scene/Animations.hpp"
+#include "scene/Camera.hpp"
+#include "scene/Material.hpp"
+#include "scene/Mesh.hpp"
+#include "scene/Model.hpp"
+#include "utils/Logger.hpp"
+#include "utils/Profiler.hpp"
+#include "utils/SceneStats.hpp"
+#include "utils/Ui.hpp"
+#include "utils/Utils.hpp"
 
 #include <glm/gtc/matrix_access.hpp>
 #include <imgui.h>
diff --git a/src/scene/World.hpp b/src/scene/World.hpp
index b8084168..4354e93a 100644
--- a/src/scene/World.hpp
+++ b/src/scene/World.hpp
@@ -1,9 +1,9 @@
 #ifndef PROSPER_SCENE_WORLD_HPP
 #define PROSPER_SCENE_WORLD_HPP
 
-#include "../gfx/Fwd.hpp"
-#include "../utils/Fwd.hpp"
-#include "Fwd.hpp"
+#include "gfx/Fwd.hpp"
+#include "scene/Fwd.hpp"
+#include "utils/Fwd.hpp"
 
 #include <filesystem>
 #include <vulkan/vulkan.hpp>
diff --git a/src/scene/WorldData.cpp b/src/scene/WorldData.cpp
index 2ed711c3..49afedd5 100644
--- a/src/scene/WorldData.cpp
+++ b/src/scene/WorldData.cpp
@@ -1,7 +1,8 @@
-#include "../gfx/Device.hpp"
-#include "../utils/Logger.hpp"
 #include "WorldData.hpp"
 
+#include "gfx/Device.hpp"
+#include "utils/Logger.hpp"
+
 #include <cstdio>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtx/matrix_decompose.hpp>
diff --git a/src/scene/WorldData.hpp b/src/scene/WorldData.hpp
index c0efd150..cacd50a4 100644
--- a/src/scene/WorldData.hpp
+++ b/src/scene/WorldData.hpp
@@ -1,19 +1,19 @@
 #ifndef PROSPER_SCENE_WORLD_DATA_HPP
 #define PROSPER_SCENE_WORLD_DATA_HPP
 
-#include "../Allocators.hpp"
-#include "../gfx/DescriptorAllocator.hpp"
-#include "../gfx/Fwd.hpp"
-#include "../gfx/RingBuffer.hpp"
-#include "../utils/Profiler.hpp"
-#include "Animations.hpp"
-#include "Camera.hpp"
-#include "DeferredLoadingContext.hpp"
-#include "Material.hpp"
-#include "Mesh.hpp"
-#include "Model.hpp"
-#include "Scene.hpp"
-#include "WorldRenderStructs.hpp"
+#include "Allocators.hpp"
+#include "gfx/DescriptorAllocator.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/RingBuffer.hpp"
+#include "scene/Animations.hpp"
+#include "scene/Camera.hpp"
+#include "scene/DeferredLoadingContext.hpp"
+#include "scene/Material.hpp"
+#include "scene/Mesh.hpp"
+#include "scene/Model.hpp"
+#include "scene/Scene.hpp"
+#include "scene/WorldRenderStructs.hpp"
+#include "utils/Profiler.hpp"
 
 #include <cstdint>
 #include <wheels/allocators/allocator.hpp>
diff --git a/src/scene/WorldRenderStructs.hpp b/src/scene/WorldRenderStructs.hpp
index 08adc9e5..d6df8975 100644
--- a/src/scene/WorldRenderStructs.hpp
+++ b/src/scene/WorldRenderStructs.hpp
@@ -1,8 +1,8 @@
 #ifndef PROSPER_SCENE_WORLD_RENDER_STRUCTS_HPP
 #define PROSPER_SCENE_WORLD_RENDER_STRUCTS_HPP
 
-#include "../gfx/Resources.hpp"
-#include "Texture.hpp"
+#include "gfx/Resources.hpp"
+#include "scene/Texture.hpp"
 
 #include <cstdint>
 #include <vulkan/vulkan.hpp>
diff --git a/src/utils/InputHandler.cpp b/src/utils/InputHandler.cpp
index 86d1acc8..12f3a09f 100644
--- a/src/utils/InputHandler.cpp
+++ b/src/utils/InputHandler.cpp
@@ -1,6 +1,6 @@
 #include "InputHandler.hpp"
 
-#include "../Window.hpp"
+#include "Window.hpp"
 
 #include <GLFW/glfw3.h>
 
diff --git a/src/utils/Profiler.cpp b/src/utils/Profiler.cpp
index 3b577dfa..afd01a3b 100644
--- a/src/utils/Profiler.cpp
+++ b/src/utils/Profiler.cpp
@@ -1,7 +1,7 @@
 #include "Profiler.hpp"
 
-#include "../gfx/Device.hpp"
-#include "Utils.hpp"
+#include "gfx/Device.hpp"
+#include "utils/Utils.hpp"
 
 using namespace wheels;
 
diff --git a/src/utils/Profiler.hpp b/src/utils/Profiler.hpp
index 70d95c8a..7a02aba7 100644
--- a/src/utils/Profiler.hpp
+++ b/src/utils/Profiler.hpp
@@ -1,10 +1,10 @@
 #ifndef PROSPER_UTILS_PROFILER_HPP
 #define PROSPER_UTILS_PROFILER_HPP
 
-#include "../Allocators.hpp"
-#include "../gfx/Fwd.hpp"
-#include "../gfx/Resources.hpp"
-#include "../utils/Utils.hpp"
+#include "Allocators.hpp"
+#include "gfx/Fwd.hpp"
+#include "gfx/Resources.hpp"
+#include "utils/Utils.hpp"
 
 #include <chrono>
 #include <wheels/assert.hpp>