diff --git a/src/editor/src/components/ModelComponent.cpp b/src/editor/src/components/ModelComponent.cpp
index c56fe13..cbbac72 100644
--- a/src/editor/src/components/ModelComponent.cpp
+++ b/src/editor/src/components/ModelComponent.cpp
@@ -5,7 +5,7 @@
 #include "engine/gameobjects/components/ModelComponent.hpp"
 
 #include "engine/gameobjects/components/drawers.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "gui/safe_include.hpp"
 
 namespace fgl::engine
diff --git a/src/editor/src/gui/FileBrowser.cpp b/src/editor/src/gui/FileBrowser.cpp
index e789b67..488f75d 100644
--- a/src/editor/src/gui/FileBrowser.cpp
+++ b/src/editor/src/gui/FileBrowser.cpp
@@ -7,10 +7,10 @@
 #include <cmath>
 
 #include "engine/assets/stores.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/filesystem/scanner/FileScanner.hpp"
 #include "engine/filesystem/types.hpp"
-#include "engine/image/ImageView.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/assets/image/ImageView.hpp"
 #include "engine/texture/Texture.hpp"
 #include "safe_include.hpp"
 
diff --git a/src/editor/src/gui/core.cpp b/src/editor/src/gui/core.cpp
index a0bb398..21c7c3b 100644
--- a/src/editor/src/gui/core.cpp
+++ b/src/editor/src/gui/core.cpp
@@ -17,7 +17,7 @@
 #include "FileBrowser.hpp"
 #include "engine/debug/DEBUG_NAMES.hpp"
 #include "engine/descriptors/DescriptorPool.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "engine/rendering/Renderer.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 #include "gui_window_names.hpp"
diff --git a/src/editor/src/gui/drawStats.cpp b/src/editor/src/gui/drawStats.cpp
index 6da54cc..46cd583 100644
--- a/src/editor/src/gui/drawStats.cpp
+++ b/src/editor/src/gui/drawStats.cpp
@@ -2,9 +2,9 @@
 #include <vulkan/vulkan.hpp>
 
 #include "core.hpp"
-#include "engine/buffers/Buffer.hpp"
-#include "engine/literals/size.hpp"
-#include "engine/profiling/counters.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
+#include "engine/math/literals/size.hpp"
+#include "engine/debug/profiling/counters.hpp"
 #include "safe_include.hpp"
 
 namespace fgl::engine::gui
diff --git a/src/editor/src/gui/preview.cpp b/src/editor/src/gui/preview.cpp
index ef9ab51..3fd1e7b 100644
--- a/src/editor/src/gui/preview.cpp
+++ b/src/editor/src/gui/preview.cpp
@@ -10,8 +10,8 @@
 #include "engine/filesystem/scanner/FileScanner.hpp"
 #include "engine/filesystem/types.hpp"
 #include "engine/gameobjects/components/ModelComponent.hpp"
-#include "engine/model/Model.hpp"
-#include "engine/model/builders/SceneBuilder.hpp"
+#include "engine/assets/model/Model.hpp"
+#include "engine/assets/model/builders/SceneBuilder.hpp"
 #include "engine/rendering/SwapChain.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 #include "safe_include.hpp"
diff --git a/src/engine/EngineContext.cpp b/src/engine/EngineContext.cpp
index b1d27be..8679d1f 100644
--- a/src/engine/EngineContext.cpp
+++ b/src/engine/EngineContext.cpp
@@ -16,8 +16,8 @@
 #include "camera/CameraManager.hpp"
 #include "engine/Average.hpp"
 #include "engine/assets/TransferManager.hpp"
-#include "engine/literals/size.hpp"
-#include "model/builders/SceneBuilder.hpp"
+#include "engine/assets/model/builders/SceneBuilder.hpp"
+#include "engine/math/literals/size.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/EngineContext.hpp b/src/engine/EngineContext.hpp
index 893eddf..8b19273 100644
--- a/src/engine/EngineContext.hpp
+++ b/src/engine/EngineContext.hpp
@@ -6,7 +6,7 @@
 
 #include "Window.hpp"
 #include "clock.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/math/literals/size.hpp"
 #include "engine/rendering/Renderer.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 #include "systems/GuiSystem.hpp"
diff --git a/src/engine/assets/TransferData.cpp b/src/engine/assets/TransferData.cpp
index 97eff22..6343f0c 100644
--- a/src/engine/assets/TransferData.cpp
+++ b/src/engine/assets/TransferData.cpp
@@ -4,11 +4,11 @@
 
 #include "TransferData.hpp"
 
-#include "engine/buffers/exceptions.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
-#include "engine/image/ImageHandle.hpp"
-#include "engine/literals/size.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/memory/buffers/exceptions.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
+#include "engine/assets/image/ImageHandle.hpp"
+#include "engine/math/literals/size.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/utils.hpp"
 
 namespace fgl::engine::memory
diff --git a/src/engine/assets/TransferManager.cpp b/src/engine/assets/TransferManager.cpp
index 0e55884..e32f484 100644
--- a/src/engine/assets/TransferManager.cpp
+++ b/src/engine/assets/TransferManager.cpp
@@ -4,12 +4,12 @@
 
 #include "TransferManager.hpp"
 
-#include "engine/buffers/Buffer.hpp"
-#include "engine/buffers/BufferSuballocation.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
-#include "engine/image/Image.hpp"
-#include "engine/image/ImageHandle.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
+#include "engine/assets/image/Image.hpp"
+#include "engine/assets/image/ImageHandle.hpp"
+#include "engine/math/literals/size.hpp"
 #include "engine/texture/Texture.hpp"
 
 namespace fgl::engine::memory
diff --git a/src/engine/assets/TransferManager.hpp b/src/engine/assets/TransferManager.hpp
index 9410705..56fdf3a 100644
--- a/src/engine/assets/TransferManager.hpp
+++ b/src/engine/assets/TransferManager.hpp
@@ -10,7 +10,7 @@
 
 #include "TransferData.hpp"
 #include "engine/FGL_DEFINES.hpp"
-#include "engine/buffers/vector/concepts.hpp"
+#include "engine/memory/buffers/vector/concepts.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/image/Image.cpp b/src/engine/assets/image/Image.cpp
similarity index 100%
rename from src/engine/image/Image.cpp
rename to src/engine/assets/image/Image.cpp
diff --git a/src/engine/image/Image.hpp b/src/engine/assets/image/Image.hpp
similarity index 96%
rename from src/engine/image/Image.hpp
rename to src/engine/assets/image/Image.hpp
index 933536a..cfb9a44 100644
--- a/src/engine/image/Image.hpp
+++ b/src/engine/assets/image/Image.hpp
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "engine/image/ImageHandle.hpp"
+#include "engine/assets/image/ImageHandle.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/image/ImageHandle.cpp b/src/engine/assets/image/ImageHandle.cpp
similarity index 100%
rename from src/engine/image/ImageHandle.cpp
rename to src/engine/assets/image/ImageHandle.cpp
diff --git a/src/engine/image/ImageHandle.hpp b/src/engine/assets/image/ImageHandle.hpp
similarity index 98%
rename from src/engine/image/ImageHandle.hpp
rename to src/engine/assets/image/ImageHandle.hpp
index b579c2d..7fe4c9e 100644
--- a/src/engine/image/ImageHandle.hpp
+++ b/src/engine/assets/image/ImageHandle.hpp
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/rendering/devices/Device.hpp"
 #include "vma/vma_impl.hpp"
 #include "vulkan/vulkan.hpp"
diff --git a/src/engine/image/ImageView.cpp b/src/engine/assets/image/ImageView.cpp
similarity index 100%
rename from src/engine/image/ImageView.cpp
rename to src/engine/assets/image/ImageView.cpp
diff --git a/src/engine/image/ImageView.hpp b/src/engine/assets/image/ImageView.hpp
similarity index 100%
rename from src/engine/image/ImageView.hpp
rename to src/engine/assets/image/ImageView.hpp
diff --git a/src/engine/image/Sampler.cpp b/src/engine/assets/image/Sampler.cpp
similarity index 100%
rename from src/engine/image/Sampler.cpp
rename to src/engine/assets/image/Sampler.cpp
diff --git a/src/engine/image/Sampler.hpp b/src/engine/assets/image/Sampler.hpp
similarity index 97%
rename from src/engine/image/Sampler.hpp
rename to src/engine/assets/image/Sampler.hpp
index 7c72375..eafb37c 100644
--- a/src/engine/image/Sampler.hpp
+++ b/src/engine/assets/image/Sampler.hpp
@@ -8,7 +8,7 @@
 #include <vulkan/vulkan_raii.hpp>
 
 #include "engine/FGL_DEFINES.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/model/Model.cpp b/src/engine/assets/model/Model.cpp
similarity index 97%
rename from src/engine/model/Model.cpp
rename to src/engine/assets/model/Model.cpp
index 23e06fb..95befb5 100644
--- a/src/engine/model/Model.cpp
+++ b/src/engine/assets/model/Model.cpp
@@ -9,8 +9,8 @@
 
 #include "builders/ModelBuilder.hpp"
 #include "builders/SceneBuilder.hpp"
-#include "engine/buffers/Buffer.hpp"
-#include "engine/image/ImageView.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
+#include "engine/assets/image/ImageView.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/model/Model.hpp b/src/engine/assets/model/Model.hpp
similarity index 100%
rename from src/engine/model/Model.hpp
rename to src/engine/assets/model/Model.hpp
diff --git a/src/engine/model/ModelVertex.cpp b/src/engine/assets/model/ModelVertex.cpp
similarity index 100%
rename from src/engine/model/ModelVertex.cpp
rename to src/engine/assets/model/ModelVertex.cpp
diff --git a/src/engine/model/ModelVertex.hpp b/src/engine/assets/model/ModelVertex.hpp
similarity index 100%
rename from src/engine/model/ModelVertex.hpp
rename to src/engine/assets/model/ModelVertex.hpp
diff --git a/src/engine/model/Primitive.cpp b/src/engine/assets/model/Primitive.cpp
similarity index 100%
rename from src/engine/model/Primitive.cpp
rename to src/engine/assets/model/Primitive.cpp
diff --git a/src/engine/model/Primitive.hpp b/src/engine/assets/model/Primitive.hpp
similarity index 98%
rename from src/engine/model/Primitive.hpp
rename to src/engine/assets/model/Primitive.hpp
index cd424d5..9ede366 100644
--- a/src/engine/model/Primitive.hpp
+++ b/src/engine/assets/model/Primitive.hpp
@@ -7,7 +7,7 @@
 #include <cstdint>
 
 #include "ModelVertex.hpp"
-#include "engine/buffers/vector/DeviceVector.hpp"
+#include "engine/memory/buffers/vector/DeviceVector.hpp"
 #include "engine/primitives/CoordinateSpace.hpp"
 #include "engine/primitives/boxes/OrientedBoundingBox.hpp"
 #include "engine/texture/Texture.hpp"
diff --git a/src/engine/model/SimpleVertex.cpp b/src/engine/assets/model/SimpleVertex.cpp
similarity index 100%
rename from src/engine/model/SimpleVertex.cpp
rename to src/engine/assets/model/SimpleVertex.cpp
diff --git a/src/engine/model/SimpleVertex.hpp b/src/engine/assets/model/SimpleVertex.hpp
similarity index 100%
rename from src/engine/model/SimpleVertex.hpp
rename to src/engine/assets/model/SimpleVertex.hpp
diff --git a/src/engine/model/builders/ModelBuilder.cpp b/src/engine/assets/model/builders/ModelBuilder.cpp
similarity index 94%
rename from src/engine/model/builders/ModelBuilder.cpp
rename to src/engine/assets/model/builders/ModelBuilder.cpp
index b51dfbe..c607ad7 100644
--- a/src/engine/model/builders/ModelBuilder.cpp
+++ b/src/engine/assets/model/builders/ModelBuilder.cpp
@@ -4,7 +4,7 @@
 
 #include "ModelBuilder.hpp"
 
-#include "engine/model/Primitive.hpp"
+#include "engine/assets/model/Primitive.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/model/builders/ModelBuilder.hpp b/src/engine/assets/model/builders/ModelBuilder.hpp
similarity index 100%
rename from src/engine/model/builders/ModelBuilder.hpp
rename to src/engine/assets/model/builders/ModelBuilder.hpp
diff --git a/src/engine/model/builders/SceneBuilder.cpp b/src/engine/assets/model/builders/SceneBuilder.cpp
similarity index 99%
rename from src/engine/model/builders/SceneBuilder.cpp
rename to src/engine/assets/model/builders/SceneBuilder.cpp
index c8a29ce..59a771b 100644
--- a/src/engine/model/builders/SceneBuilder.cpp
+++ b/src/engine/assets/model/builders/SceneBuilder.cpp
@@ -4,7 +4,7 @@
 
 #include "SceneBuilder.hpp"
 
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
@@ -12,13 +12,12 @@
 #include "objectloaders/tiny_gltf.h"
 #pragma GCC diagnostic pop
 
-#include <engine/logging/logging.hpp>
-
 #include "engine/assets/stores.hpp"
 #include "engine/camera/Camera.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/descriptors/DescriptorSet.hpp"
 #include "engine/gameobjects/GameObject.hpp"
-#include "engine/image/ImageView.hpp"
+#include "engine/assets/image/ImageView.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/model/builders/SceneBuilder.hpp b/src/engine/assets/model/builders/SceneBuilder.hpp
similarity index 100%
rename from src/engine/model/builders/SceneBuilder.hpp
rename to src/engine/assets/model/builders/SceneBuilder.hpp
diff --git a/src/engine/model/builders/loadObj.cpp b/src/engine/assets/model/builders/loadObj.cpp
similarity index 97%
rename from src/engine/model/builders/loadObj.cpp
rename to src/engine/assets/model/builders/loadObj.cpp
index 5f30af8..d6a4f81 100644
--- a/src/engine/model/builders/loadObj.cpp
+++ b/src/engine/assets/model/builders/loadObj.cpp
@@ -12,8 +12,8 @@
 #include <unordered_map>
 
 #include "ModelBuilder.hpp"
-#include "engine/model/ModelVertex.hpp"
-#include "engine/model/Primitive.hpp"
+#include "engine/assets/model/ModelVertex.hpp"
+#include "engine/assets/model/Primitive.hpp"
 #include "engine/primitives/boxes/OrientedBoundingBox.hpp"
 
 namespace fgl::engine
diff --git a/src/engine/model/prebuilt/terrainModel.cpp b/src/engine/assets/model/prebuilt/terrainModel.cpp
similarity index 96%
rename from src/engine/model/prebuilt/terrainModel.cpp
rename to src/engine/assets/model/prebuilt/terrainModel.cpp
index 185d04a..2d234ea 100644
--- a/src/engine/model/prebuilt/terrainModel.cpp
+++ b/src/engine/assets/model/prebuilt/terrainModel.cpp
@@ -4,7 +4,7 @@
 
 #include "terrainModel.hpp"
 
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/model/prebuilt/terrainModel.hpp b/src/engine/assets/model/prebuilt/terrainModel.hpp
similarity index 100%
rename from src/engine/model/prebuilt/terrainModel.hpp
rename to src/engine/assets/model/prebuilt/terrainModel.hpp
diff --git a/src/engine/camera/Camera.hpp b/src/engine/camera/Camera.hpp
index e266549..d24e3a1 100644
--- a/src/engine/camera/Camera.hpp
+++ b/src/engine/camera/Camera.hpp
@@ -12,8 +12,8 @@
 #include <glm/gtx/string_cast.hpp>
 #pragma GCC diagnostic pop
 
-#include "engine/buffers/HostSingleT.hpp"
-#include "engine/buffers/UniqueFrameSuballocation.hpp"
+#include "engine/memory/buffers/HostSingleT.hpp"
+#include "engine/memory/buffers/UniqueFrameSuballocation.hpp"
 #include "engine/descriptors/DescriptorSet.hpp"
 #include "engine/primitives/Frustum.hpp"
 #include "engine/primitives/Rotation.hpp"
diff --git a/src/engine/camera/CameraManager.cpp b/src/engine/camera/CameraManager.cpp
index 2fb6bdb..0d72318 100644
--- a/src/engine/camera/CameraManager.cpp
+++ b/src/engine/camera/CameraManager.cpp
@@ -6,7 +6,7 @@
 
 #include "Camera.hpp"
 #include "engine/debug/DEBUG_NAMES.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/math/literals/size.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/camera/CameraManager.hpp b/src/engine/camera/CameraManager.hpp
index 89769af..03486e6 100644
--- a/src/engine/camera/CameraManager.hpp
+++ b/src/engine/camera/CameraManager.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "Camera.hpp"
-#include "engine/buffers/Buffer.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/camera/CameraSwapchain.hpp b/src/engine/camera/CameraSwapchain.hpp
index 0a65f03..6e6caf2 100644
--- a/src/engine/camera/CameraSwapchain.hpp
+++ b/src/engine/camera/CameraSwapchain.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "../rendering/pipelines/Attachment.hpp"
+#include "engine/rendering/pipelines/Attachment.hpp"
 #include "engine/descriptors/DescriptorSet.hpp"
 #include "engine/rendering/SwapChain.hpp"
 
diff --git a/src/engine/concepts/is_attachment.hpp b/src/engine/concepts/is_attachment.hpp
index e307d6a..cc17270 100644
--- a/src/engine/concepts/is_attachment.hpp
+++ b/src/engine/concepts/is_attachment.hpp
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "../rendering/pipelines/Attachment.hpp"
+#include "engine/rendering/pipelines/Attachment.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/logging/formatters/filesystem.cpp b/src/engine/debug/logging/formatters/filesystem.cpp
similarity index 100%
rename from src/engine/logging/formatters/filesystem.cpp
rename to src/engine/debug/logging/formatters/filesystem.cpp
diff --git a/src/engine/logging/formatters/filesystem.hpp b/src/engine/debug/logging/formatters/filesystem.hpp
similarity index 100%
rename from src/engine/logging/formatters/filesystem.hpp
rename to src/engine/debug/logging/formatters/filesystem.hpp
diff --git a/src/engine/logging/logging.hpp b/src/engine/debug/logging/logging.hpp
similarity index 100%
rename from src/engine/logging/logging.hpp
rename to src/engine/debug/logging/logging.hpp
diff --git a/src/engine/profiling/counters.cpp b/src/engine/debug/profiling/counters.cpp
similarity index 100%
rename from src/engine/profiling/counters.cpp
rename to src/engine/debug/profiling/counters.cpp
diff --git a/src/engine/profiling/counters.hpp b/src/engine/debug/profiling/counters.hpp
similarity index 100%
rename from src/engine/profiling/counters.hpp
rename to src/engine/debug/profiling/counters.hpp
diff --git a/src/engine/descriptors/Descriptor.hpp b/src/engine/descriptors/Descriptor.hpp
index 6a8b156..954e9c7 100644
--- a/src/engine/descriptors/Descriptor.hpp
+++ b/src/engine/descriptors/Descriptor.hpp
@@ -6,7 +6,7 @@
 
 #include <cstdint>
 
-#include "engine/buffers/Buffer.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
 #include "engine/concepts/is_descriptor.hpp"
 
 namespace fgl::engine::descriptors
diff --git a/src/engine/descriptors/DescriptorSet.cpp b/src/engine/descriptors/DescriptorSet.cpp
index 4b0b807..77b9fc1 100644
--- a/src/engine/descriptors/DescriptorSet.cpp
+++ b/src/engine/descriptors/DescriptorSet.cpp
@@ -10,8 +10,8 @@
 #include <queue>
 
 #include "DescriptorPool.hpp"
-#include "engine/buffers/BufferSuballocation.hpp"
-#include "engine/image/ImageView.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
+#include "engine/assets/image/ImageView.hpp"
 #include "engine/rendering/SwapChain.hpp"
 #include "engine/texture/Texture.hpp"
 
diff --git a/src/engine/descriptors/DescriptorSet.hpp b/src/engine/descriptors/DescriptorSet.hpp
index 548d73d..b319968 100644
--- a/src/engine/descriptors/DescriptorSet.hpp
+++ b/src/engine/descriptors/DescriptorSet.hpp
@@ -8,7 +8,7 @@
 
 #include <variant>
 
-#include "engine/buffers/BufferSuballocation.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
 #include "engine/rendering/types.hpp"
 
 namespace fgl::engine
diff --git a/src/engine/filesystem/scanner/FileScanner.cpp b/src/engine/filesystem/scanner/FileScanner.cpp
index 2b22419..ffeb6b6 100644
--- a/src/engine/filesystem/scanner/FileScanner.cpp
+++ b/src/engine/filesystem/scanner/FileScanner.cpp
@@ -8,8 +8,10 @@
 
 #include "FileScanner.hpp"
 
+#include <unordered_map>
+
 #include "engine/FGL_DEFINES.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine::filesystem
 {
diff --git a/src/engine/literals/size.hpp b/src/engine/math/literals/size.hpp
similarity index 100%
rename from src/engine/literals/size.hpp
rename to src/engine/math/literals/size.hpp
diff --git a/src/engine/allocators/globalAllocator.cpp b/src/engine/memory/allocators/globalAllocator.cpp
similarity index 100%
rename from src/engine/allocators/globalAllocator.cpp
rename to src/engine/memory/allocators/globalAllocator.cpp
diff --git a/src/engine/buffers/Buffer.cpp b/src/engine/memory/buffers/Buffer.cpp
similarity index 99%
rename from src/engine/buffers/Buffer.cpp
rename to src/engine/memory/buffers/Buffer.cpp
index 6aa3dde..9617819 100644
--- a/src/engine/buffers/Buffer.cpp
+++ b/src/engine/memory/buffers/Buffer.cpp
@@ -6,8 +6,8 @@
 
 #include "BufferSuballocationHandle.hpp"
 #include "align.hpp"
-#include "engine/buffers/exceptions.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/memory/buffers/exceptions.hpp"
+#include "engine/math/literals/size.hpp"
 #include "engine/rendering/devices/Device.hpp"
 
 namespace fgl::engine::memory
diff --git a/src/engine/buffers/Buffer.hpp b/src/engine/memory/buffers/Buffer.hpp
similarity index 100%
rename from src/engine/buffers/Buffer.hpp
rename to src/engine/memory/buffers/Buffer.hpp
diff --git a/src/engine/buffers/BufferSuballocation.cpp b/src/engine/memory/buffers/BufferSuballocation.cpp
similarity index 98%
rename from src/engine/buffers/BufferSuballocation.cpp
rename to src/engine/memory/buffers/BufferSuballocation.cpp
index 62900e4..d4b7c09 100644
--- a/src/engine/buffers/BufferSuballocation.cpp
+++ b/src/engine/memory/buffers/BufferSuballocation.cpp
@@ -8,7 +8,7 @@
 #include "BufferSuballocationHandle.hpp"
 #include "SuballocationView.hpp"
 #include "align.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine::memory
 {
diff --git a/src/engine/buffers/BufferSuballocation.hpp b/src/engine/memory/buffers/BufferSuballocation.hpp
similarity index 100%
rename from src/engine/buffers/BufferSuballocation.hpp
rename to src/engine/memory/buffers/BufferSuballocation.hpp
diff --git a/src/engine/buffers/BufferSuballocationHandle.cpp b/src/engine/memory/buffers/BufferSuballocationHandle.cpp
similarity index 96%
rename from src/engine/buffers/BufferSuballocationHandle.cpp
rename to src/engine/memory/buffers/BufferSuballocationHandle.cpp
index 70bd155..60c8726 100644
--- a/src/engine/buffers/BufferSuballocationHandle.cpp
+++ b/src/engine/memory/buffers/BufferSuballocationHandle.cpp
@@ -6,7 +6,7 @@
 
 #include "Buffer.hpp"
 #include "BufferSuballocation.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine::memory
 {
diff --git a/src/engine/buffers/BufferSuballocationHandle.hpp b/src/engine/memory/buffers/BufferSuballocationHandle.hpp
similarity index 100%
rename from src/engine/buffers/BufferSuballocationHandle.hpp
rename to src/engine/memory/buffers/BufferSuballocationHandle.hpp
diff --git a/src/engine/buffers/HostSingleT.hpp b/src/engine/memory/buffers/HostSingleT.hpp
similarity index 100%
rename from src/engine/buffers/HostSingleT.hpp
rename to src/engine/memory/buffers/HostSingleT.hpp
diff --git a/src/engine/buffers/SuballocationView.cpp b/src/engine/memory/buffers/SuballocationView.cpp
similarity index 100%
rename from src/engine/buffers/SuballocationView.cpp
rename to src/engine/memory/buffers/SuballocationView.cpp
diff --git a/src/engine/buffers/SuballocationView.hpp b/src/engine/memory/buffers/SuballocationView.hpp
similarity index 100%
rename from src/engine/buffers/SuballocationView.hpp
rename to src/engine/memory/buffers/SuballocationView.hpp
diff --git a/src/engine/buffers/UniqueFrameSuballocation.hpp b/src/engine/memory/buffers/UniqueFrameSuballocation.hpp
similarity index 100%
rename from src/engine/buffers/UniqueFrameSuballocation.hpp
rename to src/engine/memory/buffers/UniqueFrameSuballocation.hpp
diff --git a/src/engine/buffers/align.hpp b/src/engine/memory/buffers/align.hpp
similarity index 100%
rename from src/engine/buffers/align.hpp
rename to src/engine/memory/buffers/align.hpp
diff --git a/src/engine/buffers/exceptions.hpp b/src/engine/memory/buffers/exceptions.hpp
similarity index 100%
rename from src/engine/buffers/exceptions.hpp
rename to src/engine/memory/buffers/exceptions.hpp
diff --git a/src/engine/buffers/vector/BufferVector.cpp b/src/engine/memory/buffers/vector/BufferVector.cpp
similarity index 97%
rename from src/engine/buffers/vector/BufferVector.cpp
rename to src/engine/memory/buffers/vector/BufferVector.cpp
index 046d772..10bc220 100644
--- a/src/engine/buffers/vector/BufferVector.cpp
+++ b/src/engine/memory/buffers/vector/BufferVector.cpp
@@ -5,7 +5,7 @@
 #include "BufferVector.hpp"
 
 #include "engine/assets/TransferManager.hpp"
-#include "engine/buffers/Buffer.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
 
 namespace fgl::engine::memory
 {
diff --git a/src/engine/buffers/vector/BufferVector.hpp b/src/engine/memory/buffers/vector/BufferVector.hpp
similarity index 95%
rename from src/engine/buffers/vector/BufferVector.hpp
rename to src/engine/memory/buffers/vector/BufferVector.hpp
index 0ac5cc3..22f0cb0 100644
--- a/src/engine/buffers/vector/BufferVector.hpp
+++ b/src/engine/memory/buffers/vector/BufferVector.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "engine/buffers/BufferSuballocation.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
 
 namespace fgl::engine::memory
 {
diff --git a/src/engine/buffers/vector/DeviceVector.hpp b/src/engine/memory/buffers/vector/DeviceVector.hpp
similarity index 93%
rename from src/engine/buffers/vector/DeviceVector.hpp
rename to src/engine/memory/buffers/vector/DeviceVector.hpp
index 9e1370d..01d464e 100644
--- a/src/engine/buffers/vector/DeviceVector.hpp
+++ b/src/engine/memory/buffers/vector/DeviceVector.hpp
@@ -7,8 +7,8 @@
 #include "BufferVector.hpp"
 #include "concepts.hpp"
 #include "engine/assets/TransferManager.hpp"
-#include "engine/literals/size.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/math/literals/size.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/buffers/vector/HostVector.hpp b/src/engine/memory/buffers/vector/HostVector.hpp
similarity index 100%
rename from src/engine/buffers/vector/HostVector.hpp
rename to src/engine/memory/buffers/vector/HostVector.hpp
diff --git a/src/engine/buffers/vector/concepts.hpp b/src/engine/memory/buffers/vector/concepts.hpp
similarity index 85%
rename from src/engine/buffers/vector/concepts.hpp
rename to src/engine/memory/buffers/vector/concepts.hpp
index a607eca..8abaf17 100644
--- a/src/engine/buffers/vector/concepts.hpp
+++ b/src/engine/memory/buffers/vector/concepts.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "engine/buffers/BufferSuballocation.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
 
 namespace fgl::engine::memory
 {
diff --git a/src/engine/primitives/boxes/OrientedBoundingBox.cpp b/src/engine/primitives/boxes/OrientedBoundingBox.cpp
index 3d1d96e..dec6836 100644
--- a/src/engine/primitives/boxes/OrientedBoundingBox.cpp
+++ b/src/engine/primitives/boxes/OrientedBoundingBox.cpp
@@ -8,8 +8,8 @@
 
 #include <array>
 
-#include "engine/logging/logging.hpp"
-#include "engine/model/ModelVertex.hpp"
+#include "engine/debug/logging/logging.hpp"
+#include "engine/assets/model/ModelVertex.hpp"
 #include "engine/primitives/lines/LineSegment.hpp"
 #include "engine/primitives/points/Coordinate.hpp"
 
diff --git a/src/engine/primitives/boxes/OrientedBoundingBox.hpp b/src/engine/primitives/boxes/OrientedBoundingBox.hpp
index 1781f1e..654d1a5 100644
--- a/src/engine/primitives/boxes/OrientedBoundingBox.hpp
+++ b/src/engine/primitives/boxes/OrientedBoundingBox.hpp
@@ -9,7 +9,6 @@
 
 #include "BoundingBox.hpp"
 #include "engine/constants.hpp"
-#include "engine/logging/logging.hpp"
 #include "engine/primitives/Scale.hpp"
 #include "engine/primitives/TransformComponent.hpp"
 #include "engine/primitives/matricies/Matrix.hpp"
diff --git a/src/engine/rendering/Instance.cpp b/src/engine/rendering/Instance.cpp
index 2116122..af1c798 100644
--- a/src/engine/rendering/Instance.cpp
+++ b/src/engine/rendering/Instance.cpp
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <unordered_set>
 
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 PFN_vkCreateDebugUtilsMessengerEXT pfnVkCreateDebugUtilsMessengerEXT { nullptr };
 PFN_vkDestroyDebugUtilsMessengerEXT pfnVkDestroyDebugUtilsMessengerEXT { nullptr };
diff --git a/src/engine/rendering/devices/Device.cpp b/src/engine/rendering/devices/Device.cpp
index a87760d..ef38faf 100644
--- a/src/engine/rendering/devices/Device.cpp
+++ b/src/engine/rendering/devices/Device.cpp
@@ -10,7 +10,7 @@
 #include <set>
 #include <unordered_set>
 
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/rendering/devices/PhysicalDevice.cpp b/src/engine/rendering/devices/PhysicalDevice.cpp
index 9a633f1..eb4fca2 100644
--- a/src/engine/rendering/devices/PhysicalDevice.cpp
+++ b/src/engine/rendering/devices/PhysicalDevice.cpp
@@ -4,7 +4,7 @@
 
 #include "PhysicalDevice.hpp"
 
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/rendering/Instance.hpp"
 #include "engine/rendering/Surface.hpp"
 
diff --git a/src/engine/rendering/pipelines/Attachment.hpp b/src/engine/rendering/pipelines/Attachment.hpp
index 34b12b6..3beae16 100644
--- a/src/engine/rendering/pipelines/Attachment.hpp
+++ b/src/engine/rendering/pipelines/Attachment.hpp
@@ -11,9 +11,9 @@
 #include <cstdint>
 #include <vector>
 
-#include "../../concepts/is_attachment.hpp"
-#include "../../image/Image.hpp"
-#include "../types.hpp"
+#include "engine/assets/image/Image.hpp"
+#include "engine/concepts/is_attachment.hpp"
+#include "engine/rendering/types.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/rendering/pipelines/PipelineConfigInfo.cpp b/src/engine/rendering/pipelines/PipelineConfigInfo.cpp
index d147cf0..f177ec3 100644
--- a/src/engine/rendering/pipelines/PipelineConfigInfo.cpp
+++ b/src/engine/rendering/pipelines/PipelineConfigInfo.cpp
@@ -4,7 +4,7 @@
 
 #include "PipelineConfigInfo.hpp"
 
-#include "../../model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/rendering/pipelines/PipelineConfigInfo.hpp b/src/engine/rendering/pipelines/PipelineConfigInfo.hpp
index c6c10e3..5b1cff8 100644
--- a/src/engine/rendering/pipelines/PipelineConfigInfo.hpp
+++ b/src/engine/rendering/pipelines/PipelineConfigInfo.hpp
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "../../FGL_DEFINES.hpp"
+#include "engine/FGL_DEFINES.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/rendering/pipelines/PipelineT.hpp b/src/engine/rendering/pipelines/PipelineT.hpp
index 3f62c79..bfd6756 100644
--- a/src/engine/rendering/pipelines/PipelineT.hpp
+++ b/src/engine/rendering/pipelines/PipelineT.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "../../concepts/is_descriptor_set_collection.hpp"
-#include "../../concepts/is_empty_descriptor_set.hpp"
-#include "../../descriptors/DescriptorSet.hpp"
+#include "engine/concepts/is_descriptor_set_collection.hpp"
+#include "engine/concepts/is_empty_descriptor_set.hpp"
+#include "engine/descriptors/DescriptorSet.hpp"
 #include "Pipeline.hpp"
 #include "Shader.hpp"
 
diff --git a/src/engine/rendering/pipelines/Shader.cpp b/src/engine/rendering/pipelines/Shader.cpp
index 4ba3e53..138c606 100644
--- a/src/engine/rendering/pipelines/Shader.cpp
+++ b/src/engine/rendering/pipelines/Shader.cpp
@@ -4,6 +4,7 @@
 
 #include "Shader.hpp"
 
+#include "engine/debug/logging/logging.hpp"
 #include "engine/rendering/devices/Device.hpp"
 #include "shaders/Compiler.hpp"
 
@@ -33,7 +34,7 @@ namespace fgl::engine
 		}
 	}
 
-	vk::ShaderModuleCreateInfo ShaderHandle::createModuleInfo()
+	vk::ShaderModuleCreateInfo ShaderHandle::createModuleInfo() const
 	{
 		vk::ShaderModuleCreateInfo module_info {};
 		module_info.flags = {};
diff --git a/src/engine/rendering/pipelines/Shader.hpp b/src/engine/rendering/pipelines/Shader.hpp
index 49b6cda..f1e087d 100644
--- a/src/engine/rendering/pipelines/Shader.hpp
+++ b/src/engine/rendering/pipelines/Shader.hpp
@@ -6,10 +6,9 @@
 
 #include <vulkan/vulkan_raii.hpp>
 
+#include <filesystem>
 #include <fstream>
 
-#include "../../logging/logging.hpp"
-
 namespace fgl::engine
 {
 
@@ -39,8 +38,8 @@ namespace fgl::engine
 
 		vk::raii::ShaderModule shader_module;
 
-		std::vector< std::byte > loadData( const std::filesystem::path& );
-		vk::ShaderModuleCreateInfo createModuleInfo();
+		static std::vector< std::byte > loadData( const std::filesystem::path& );
+		vk::ShaderModuleCreateInfo createModuleInfo() const;
 
 		ShaderHandle( const std::filesystem::path& path, const vk::PipelineShaderStageCreateInfo& info );
 
diff --git a/src/engine/rendering/pipelines/shaders/Compiler.cpp b/src/engine/rendering/pipelines/shaders/Compiler.cpp
index 0f4c7de..aeee8c3 100644
--- a/src/engine/rendering/pipelines/shaders/Compiler.cpp
+++ b/src/engine/rendering/pipelines/shaders/Compiler.cpp
@@ -8,7 +8,7 @@
 #include <fstream>
 
 #include "engine/FGL_DEFINES.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/systems/DrawPair.cpp b/src/engine/systems/DrawPair.cpp
index 2516c55..107ec28 100644
--- a/src/engine/systems/DrawPair.cpp
+++ b/src/engine/systems/DrawPair.cpp
@@ -10,7 +10,7 @@
 
 #include "engine/debug/drawers.hpp"
 #include "engine/gameobjects/components/ModelComponent.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 
 namespace fgl::engine
diff --git a/src/engine/systems/EntityRendererSystem.cpp b/src/engine/systems/EntityRendererSystem.cpp
index f204d9a..3c71a1f 100644
--- a/src/engine/systems/EntityRendererSystem.cpp
+++ b/src/engine/systems/EntityRendererSystem.cpp
@@ -9,7 +9,7 @@
 
 #include "DrawPair.hpp"
 #include "engine/camera/Camera.hpp"
-#include "engine/profiling/counters.hpp"
+#include "engine/debug/profiling/counters.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 
 namespace fgl::engine
diff --git a/src/engine/systems/EntityRendererSystem.hpp b/src/engine/systems/EntityRendererSystem.hpp
index 1a9eafd..69ab3c7 100644
--- a/src/engine/systems/EntityRendererSystem.hpp
+++ b/src/engine/systems/EntityRendererSystem.hpp
@@ -6,10 +6,10 @@
 
 #include <memory>
 
-#include "../rendering/pipelines/PipelineT.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
 #include "engine/rendering/SwapChain.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
 #include "engine/systems/modelRendering/StandardPipeline.hpp"
 #include "engine/systems/modelRendering/TexturedPipeline.hpp"
 
diff --git a/src/engine/systems/GuiSystem.hpp b/src/engine/systems/GuiSystem.hpp
index be1073c..7819fd4 100644
--- a/src/engine/systems/GuiSystem.hpp
+++ b/src/engine/systems/GuiSystem.hpp
@@ -3,11 +3,11 @@
 //
 
 #pragma once
-#include "../rendering/pipelines/PipelineT.hpp"
-#include "../rendering/pipelines/Shader.hpp"
 #include "engine/FrameInfo.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
 #include "engine/descriptors/DescriptorSetLayout.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
+#include "engine/rendering/pipelines/Shader.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/systems/LineDrawer.cpp b/src/engine/systems/LineDrawer.cpp
index 58a704a..e94cf6f 100644
--- a/src/engine/systems/LineDrawer.cpp
+++ b/src/engine/systems/LineDrawer.cpp
@@ -5,10 +5,10 @@
 #include "LineDrawer.hpp"
 
 #include "engine/FrameInfo.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
 #include "engine/camera/CameraDescriptor.hpp"
-#include "engine/model/ModelVertex.hpp"
-#include "engine/model/SimpleVertex.hpp"
+#include "engine/assets/model/ModelVertex.hpp"
+#include "engine/assets/model/SimpleVertex.hpp"
 #include "engine/primitives/points/Coordinate.hpp"
 
 namespace fgl::engine
diff --git a/src/engine/systems/LineDrawer.hpp b/src/engine/systems/LineDrawer.hpp
index 6618785..af07b58 100644
--- a/src/engine/systems/LineDrawer.hpp
+++ b/src/engine/systems/LineDrawer.hpp
@@ -3,8 +3,8 @@
 //
 
 #pragma once
-#include "../rendering/pipelines/PipelineT.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
 #include "engine/camera/CameraDescriptor.hpp"
 #include "engine/descriptors/Descriptor.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
diff --git a/src/engine/systems/TerrainSystem.cpp b/src/engine/systems/TerrainSystem.cpp
index 5c1692e..afe679e 100644
--- a/src/engine/systems/TerrainSystem.cpp
+++ b/src/engine/systems/TerrainSystem.cpp
@@ -8,7 +8,7 @@
 
 #include "DrawPair.hpp"
 #include "engine/camera/Camera.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/math/literals/size.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/systems/TerrainSystem.hpp b/src/engine/systems/TerrainSystem.hpp
index 8b50f66..0cd2a9e 100644
--- a/src/engine/systems/TerrainSystem.hpp
+++ b/src/engine/systems/TerrainSystem.hpp
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "../rendering/pipelines/PipelineT.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
 #include "concepts.hpp"
 #include "engine/FrameInfo.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
 #include "engine/camera/Camera.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "engine/rendering/SwapChain.hpp"
 
 namespace fgl::engine
diff --git a/src/engine/systems/modelRendering/StandardPipeline.hpp b/src/engine/systems/modelRendering/StandardPipeline.hpp
index 98fdf56..d7eac3f 100644
--- a/src/engine/systems/modelRendering/StandardPipeline.hpp
+++ b/src/engine/systems/modelRendering/StandardPipeline.hpp
@@ -3,11 +3,11 @@
 //
 
 #pragma once
-#include "../../rendering/pipelines/PipelineT.hpp"
-#include "../../rendering/pipelines/Shader.hpp"
 #include "engine/FrameInfo.hpp"
 #include "engine/camera/CameraDescriptor.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
+#include "engine/rendering/pipelines/Shader.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/systems/modelRendering/TexturedPipeline.hpp b/src/engine/systems/modelRendering/TexturedPipeline.hpp
index 5e8bcc4..88ab47f 100644
--- a/src/engine/systems/modelRendering/TexturedPipeline.hpp
+++ b/src/engine/systems/modelRendering/TexturedPipeline.hpp
@@ -3,10 +3,10 @@
 //
 
 #pragma once
-#include "../../rendering/pipelines/PipelineT.hpp"
-#include "../../rendering/pipelines/Shader.hpp"
 #include "engine/FrameInfo.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
+#include "engine/rendering/pipelines/Shader.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/texture/Texture.cpp b/src/engine/texture/Texture.cpp
index 768ed4f..ceb57aa 100644
--- a/src/engine/texture/Texture.cpp
+++ b/src/engine/texture/Texture.cpp
@@ -9,9 +9,9 @@
 #include "engine/FrameInfo.hpp"
 #include "engine/assets/TransferManager.hpp"
 #include "engine/descriptors/DescriptorSet.hpp"
-#include "engine/image/Image.hpp"
-#include "engine/image/ImageView.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/assets/image/Image.hpp"
+#include "engine/assets/image/ImageView.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/math/noise/perlin/generator.hpp"
 
 #pragma GCC diagnostic push
diff --git a/src/engine/texture/Texture.hpp b/src/engine/texture/Texture.hpp
index bafb0da..dbc1d7f 100644
--- a/src/engine/texture/Texture.hpp
+++ b/src/engine/texture/Texture.hpp
@@ -9,8 +9,8 @@
 #include <filesystem>
 
 #include "engine/assets/AssetManager.hpp"
-#include "engine/image/ImageView.hpp"
-#include "engine/image/Sampler.hpp"
+#include "engine/assets/image/ImageView.hpp"
+#include "engine/assets/image/Sampler.hpp"
 
 namespace fgl::engine
 {
diff --git a/src/engine/tree/octtree/OctTreeNode.cpp b/src/engine/tree/octtree/OctTreeNode.cpp
index 5101554..d068940 100644
--- a/src/engine/tree/octtree/OctTreeNode.cpp
+++ b/src/engine/tree/octtree/OctTreeNode.cpp
@@ -8,7 +8,7 @@
 #include <engine/FrameInfo.hpp>
 #include <glm/gtx/string_cast.hpp>
 
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "engine/primitives/Frustum.hpp"
 
 namespace fgl::engine