diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36b1c8f..ffebf97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ add_executable(openVulkanoCpp openVulkanoCpp/main.cpp)
 
 file(GLOB_RECURSE sources CONFIGURE_DEPENDS "openVulkanoCpp/*.cpp")
 target_sources(openVulkanoCpp PRIVATE ${sources})
+target_include_directories(openVulkanoCpp PUBLIC openVulkanoCpp)
 
 #Setup Vulkan
 find_package(Vulkan REQUIRED)
diff --git a/openVulkanoCpp/Base/Render/IRenderer.hpp b/openVulkanoCpp/Base/Render/IRenderer.hpp
index 4512dfb..c37ab53 100644
--- a/openVulkanoCpp/Base/Render/IRenderer.hpp
+++ b/openVulkanoCpp/Base/Render/IRenderer.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include <string>
-#include "../ITickable.hpp"
-#include "../ICloseable.hpp"
-#include "../../Scene/Scene.hpp"
+#include "Base/ITickable.hpp"
+#include "Base/ICloseable.hpp"
+#include "Scene/Scene.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Base/UI/IWindow.hpp b/openVulkanoCpp/Base/UI/IWindow.hpp
index 0f8d172..b9ce2bd 100644
--- a/openVulkanoCpp/Base/UI/IWindow.hpp
+++ b/openVulkanoCpp/Base/UI/IWindow.hpp
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include "../../Math/Math.hpp"
-#include "../PlatformEnums.hpp"
-#include "../ICloseable.hpp"
+#include "Math/Math.hpp"
+#include "Base/PlatformEnums.hpp"
+#include "Base/ICloseable.hpp"
 #include <string>
 #include <stdexcept>
 
diff --git a/openVulkanoCpp/Base/Utils.hpp b/openVulkanoCpp/Base/Utils.hpp
index 774e9c7..eec8634 100644
--- a/openVulkanoCpp/Base/Utils.hpp
+++ b/openVulkanoCpp/Base/Utils.hpp
@@ -55,7 +55,7 @@ namespace openVulkanoCpp
 			return static_cast<typename std::underlying_type<Enumeration>::type>(value);
 		}
 
-		static inline size_t Align(size_t size, size_t alignment)
+		static inline constexpr size_t Align(size_t size, size_t alignment)
 		{
 			return (size + alignment - 1) & ~(alignment - 1);
 		}
diff --git a/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp b/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp
index a9146ae..c0aa813 100644
--- a/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp
+++ b/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp
@@ -5,11 +5,11 @@
  */
 
 #include "CubesExampleApp.hpp"
-#include "../Scene/Scene.hpp"
-#include "../Scene/Shader.hpp"
-#include "../Input/InputManager.hpp"
-#include "../Host/GraphicsAppManager.hpp"
-#include "../Math/Math.hpp"
+#include "Scene/Scene.hpp"
+#include "Scene/Shader.hpp"
+#include "Input/InputManager.hpp"
+#include "Host/GraphicsAppManager.hpp"
+#include "Math/Math.hpp"
 
 #pragma clang diagnostic push
 #pragma ide diagnostic ignored "cert-msc50-cpp"
diff --git a/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp b/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp
index 893e196..1934a6a 100644
--- a/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp
+++ b/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../Base/IGraphicsApp.hpp"
+#include "Base/IGraphicsApp.hpp"
 #include <memory>
 
 class CubesExampleApp : public openVulkanoCpp::IGraphicsApp
diff --git a/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.hpp b/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.hpp
index f931e07..d3ec59f 100644
--- a/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.hpp
+++ b/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.hpp
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include "../../Base/ITickable.hpp"
-#include "../../Input/InputDeviceKeyboard.hpp"
-#include "../../Input/InputDeviceMouse.hpp"
-#include "../../Input/InputDeviceController.hpp"
+#include "Base/ITickable.hpp"
+#include "Input/InputDeviceKeyboard.hpp"
+#include "Input/InputDeviceMouse.hpp"
+#include "Input/InputDeviceController.hpp"
 
 namespace openVulkanoCpp::GLFW
 {
diff --git a/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp b/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp
index c6dcca8..2122560 100644
--- a/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp
+++ b/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../../Input/InputKey.hpp"
+#include "Input/InputKey.hpp"
 #include <GLFW/glfw3.h>
 
 namespace openVulkanoCpp::GLFW
diff --git a/openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp b/openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp
index 815fd8d..0a59e57 100644
--- a/openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp
+++ b/openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp
@@ -6,7 +6,7 @@
 
 #include "InputProviderGLFW.hpp"
 #include "InputMappingGLFW.hpp"
-#include "../../Input/InputManager.hpp"
+#include "Input/InputManager.hpp"
 #include <GLFW/glfw3.h>
 
 static_assert(GLFW_JOYSTICK_LAST == 15); // if this fails, please update it and resize the controllers array accordingly as GLFW_JOYSTICK_LAST + 1
diff --git a/openVulkanoCpp/Host/GLFW/InputProviderGLFW.hpp b/openVulkanoCpp/Host/GLFW/InputProviderGLFW.hpp
index 2ee9dfd..56c4f80 100644
--- a/openVulkanoCpp/Host/GLFW/InputProviderGLFW.hpp
+++ b/openVulkanoCpp/Host/GLFW/InputProviderGLFW.hpp
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include "../../Base/IInitable.hpp"
-#include "../../Base/ITickable.hpp"
-#include "../../Base/ICloseable.hpp"
-#include "../../Base/IPlatform.hpp"
+#include "Base/IInitable.hpp"
+#include "Base/ITickable.hpp"
+#include "Base/ICloseable.hpp"
+#include "Base/IPlatform.hpp"
 #include "InputDeviceGLFW.hpp"
 #include <array>
 
diff --git a/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp b/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp
index 3102568..9a61c26 100644
--- a/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp
+++ b/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../../Base/IPlatform.hpp"
+#include "Base/IPlatform.hpp"
 #include "InputProviderGLFW.hpp"
 
 namespace openVulkanoCpp
diff --git a/openVulkanoCpp/Host/GLFW/WindowGLFW.cpp b/openVulkanoCpp/Host/GLFW/WindowGLFW.cpp
index a4efc63..8bf0ba4 100644
--- a/openVulkanoCpp/Host/GLFW/WindowGLFW.cpp
+++ b/openVulkanoCpp/Host/GLFW/WindowGLFW.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "WindowGLFW.hpp"
+#include "Base/Logger.hpp"
 #include <GLFW/glfw3.h>
-#include "../../Base/Logger.hpp"
 
 namespace openVulkanoCpp::GLFW
 {
diff --git a/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp b/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp
index 0a4c924..20f5a18 100644
--- a/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp
+++ b/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include "../../Base/UI/BaseWindow.hpp"
-#include "../../Base/UI/IVulkanWindow.hpp"
-#include "../../Base/UI/IOpenGlWindow.hpp"
-#include "../../Base/IPlatform.hpp"
+#include "Base/UI/BaseWindow.hpp"
+#include "Base/UI/IVulkanWindow.hpp"
+#include "Base/UI/IOpenGlWindow.hpp"
+#include "Base/IPlatform.hpp"
 #include "InputProviderGLFW.hpp"
 
 struct GLFWmonitor;
diff --git a/openVulkanoCpp/Host/GraphicsAppManager.cpp b/openVulkanoCpp/Host/GraphicsAppManager.cpp
index 98bc5d7..017284c 100644
--- a/openVulkanoCpp/Host/GraphicsAppManager.cpp
+++ b/openVulkanoCpp/Host/GraphicsAppManager.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "GraphicsAppManager.hpp"
-#include "../Base/IPlatform.hpp"
-#include "../Base/Logger.hpp"
+#include "Base/IPlatform.hpp"
+#include "Base/Logger.hpp"
 #include "PlatformProducer.hpp"
 #include <chrono>
 #include <thread>
diff --git a/openVulkanoCpp/Host/GraphicsAppManager.hpp b/openVulkanoCpp/Host/GraphicsAppManager.hpp
index bc69410..f66cbcf 100644
--- a/openVulkanoCpp/Host/GraphicsAppManager.hpp
+++ b/openVulkanoCpp/Host/GraphicsAppManager.hpp
@@ -6,12 +6,12 @@
 
 #pragma once
 
-#include "../Base/IGraphicsAppManager.hpp"
-#include "../Base/IGraphicsApp.hpp"
-#include "../Base/Render/IRenderer.hpp"
-#include "../Base/UI/IWindow.hpp"
-#include "../Base/PlatformEnums.hpp"
-#include "../Base/Timer.hpp"
+#include "Base/IGraphicsAppManager.hpp"
+#include "Base/IGraphicsApp.hpp"
+#include "Base/Render/IRenderer.hpp"
+#include "Base/UI/IWindow.hpp"
+#include "Base/PlatformEnums.hpp"
+#include "Base/Timer.hpp"
 #include <string>
 #include <memory>
 
diff --git a/openVulkanoCpp/Host/PlatformProducer.cpp b/openVulkanoCpp/Host/PlatformProducer.cpp
index e7771a1..d5fc829 100644
--- a/openVulkanoCpp/Host/PlatformProducer.cpp
+++ b/openVulkanoCpp/Host/PlatformProducer.cpp
@@ -5,10 +5,10 @@
  */
 
 #include "PlatformProducer.hpp"
-#include <stdexcept>
-#include "../Base/Logger.hpp"
-#include "../Vulkan/Renderer.hpp"
 #include "GLFW/PlatformGLFW.hpp"
+#include "Base/Logger.hpp"
+#include "Vulkan/Renderer.hpp"
+#include <stdexcept>
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Host/PlatformProducer.hpp b/openVulkanoCpp/Host/PlatformProducer.hpp
index 272f179..8547ba6 100644
--- a/openVulkanoCpp/Host/PlatformProducer.hpp
+++ b/openVulkanoCpp/Host/PlatformProducer.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../Base/PlatformEnums.hpp"
+#include "Base/PlatformEnums.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Input/InputDevice.hpp b/openVulkanoCpp/Input/InputDevice.hpp
index 045a441..136d2fc 100644
--- a/openVulkanoCpp/Input/InputDevice.hpp
+++ b/openVulkanoCpp/Input/InputDevice.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../Base/ICloseable.hpp"
+#include "Base/ICloseable.hpp"
 #include "InputKey.hpp"
 
 namespace openVulkanoCpp
diff --git a/openVulkanoCpp/Input/InputDeviceController.hpp b/openVulkanoCpp/Input/InputDeviceController.hpp
index e0495d2..5439049 100644
--- a/openVulkanoCpp/Input/InputDeviceController.hpp
+++ b/openVulkanoCpp/Input/InputDeviceController.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../Base/Logger.hpp"
+#include "Base/Logger.hpp"
 #include "InputDevice.hpp"
 #include <cstring>
 
diff --git a/openVulkanoCpp/Input/InputDeviceMouse.cpp b/openVulkanoCpp/Input/InputDeviceMouse.cpp
index 4457bec..dfa38a7 100644
--- a/openVulkanoCpp/Input/InputDeviceMouse.cpp
+++ b/openVulkanoCpp/Input/InputDeviceMouse.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "InputDeviceMouse.hpp"
-#include "../Base/Logger.hpp"
+#include "Base/Logger.hpp"
 
 namespace openVulkanoCpp::Input
 {
diff --git a/openVulkanoCpp/Input/InputDeviceMouse.hpp b/openVulkanoCpp/Input/InputDeviceMouse.hpp
index 8515fdd..eae8fe4 100644
--- a/openVulkanoCpp/Input/InputDeviceMouse.hpp
+++ b/openVulkanoCpp/Input/InputDeviceMouse.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "InputDevice.hpp"
-#include "../Math/Math.hpp"
+#include "Math/Math.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Input/InputManager.hpp b/openVulkanoCpp/Input/InputManager.hpp
index 8bf08ba..5414681 100644
--- a/openVulkanoCpp/Input/InputManager.hpp
+++ b/openVulkanoCpp/Input/InputManager.hpp
@@ -2,7 +2,7 @@
 
 #include "InputKey.hpp"
 #include "InputDevice.hpp"
-#include "../Base/Utils.hpp"
+#include "Base/Utils.hpp"
 
 #include <functional>
 #include <unordered_map>
diff --git a/openVulkanoCpp/Scene/AABB.hpp b/openVulkanoCpp/Scene/AABB.hpp
index 18f8c2f..20966ea 100644
--- a/openVulkanoCpp/Scene/AABB.hpp
+++ b/openVulkanoCpp/Scene/AABB.hpp
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "../Math/Math.hpp"
-#include "../Base/IInitable.hpp"
+#include "Math/Math.hpp"
+#include "Base/IInitable.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Scene/Camera.hpp b/openVulkanoCpp/Scene/Camera.hpp
index a0a17b0..acaf663 100644
--- a/openVulkanoCpp/Scene/Camera.hpp
+++ b/openVulkanoCpp/Scene/Camera.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "Node.hpp"
-#include "../Math/Math.hpp"
+#include "Math/Math.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Scene/Drawable.hpp b/openVulkanoCpp/Scene/Drawable.hpp
index cff58bf..f9d40c5 100644
--- a/openVulkanoCpp/Scene/Drawable.hpp
+++ b/openVulkanoCpp/Scene/Drawable.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <vector>
-#include "../Base/ICloseable.hpp"
+#include "Base/ICloseable.hpp"
 #include "Geometry.hpp"
 #include "Material.hpp"
 
diff --git a/openVulkanoCpp/Scene/Geometry.hpp b/openVulkanoCpp/Scene/Geometry.hpp
index 70eecce..cb44411 100644
--- a/openVulkanoCpp/Scene/Geometry.hpp
+++ b/openVulkanoCpp/Scene/Geometry.hpp
@@ -5,9 +5,9 @@
 #include <assimp/mesh.h>
 #include <assimp/postprocess.h>
 #include "Vertex.hpp"
-#include "../Base/Logger.hpp"
-#include "../Base/Utils.hpp"
-#include "../Base/ICloseable.hpp"
+#include "Base/Logger.hpp"
+#include "Base/Utils.hpp"
+#include "Base/ICloseable.hpp"
 #include "AABB.hpp"
 
 namespace openVulkanoCpp
diff --git a/openVulkanoCpp/Scene/Node.cpp b/openVulkanoCpp/Scene/Node.cpp
index cce71be..d879bca 100644
--- a/openVulkanoCpp/Scene/Node.cpp
+++ b/openVulkanoCpp/Scene/Node.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "Node.hpp"
-#include "../Base/Utils.hpp"
+#include "Base/Utils.hpp"
 #include <stdexcept>
 
 namespace openVulkanoCpp::Scene
diff --git a/openVulkanoCpp/Scene/Node.hpp b/openVulkanoCpp/Scene/Node.hpp
index 3279921..3a8882a 100644
--- a/openVulkanoCpp/Scene/Node.hpp
+++ b/openVulkanoCpp/Scene/Node.hpp
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <vector>
-#include "../Base/ICloseable.hpp"
-#include "../Math/Math.hpp"
+#include "Base/ICloseable.hpp"
+#include "Math/Math.hpp"
 #include "Drawable.hpp"
+#include <vector>
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Scene/Shader.hpp b/openVulkanoCpp/Scene/Shader.hpp
index e3e57e3..d28069e 100644
--- a/openVulkanoCpp/Scene/Shader.hpp
+++ b/openVulkanoCpp/Scene/Shader.hpp
@@ -1,7 +1,8 @@
 #pragma once
+
+#include "Base/ICloseable.hpp"
 #include <string>
 #include <stdexcept>
-#include "../Base/ICloseable.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Scene/Vertex.hpp b/openVulkanoCpp/Scene/Vertex.hpp
index 2ee4480..ed3e3c9 100644
--- a/openVulkanoCpp/Scene/Vertex.hpp
+++ b/openVulkanoCpp/Scene/Vertex.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "../Math/Math.hpp"
+#include "Math/Math.hpp"
 #include <assimp/vector2.h>
 #include <assimp/vector3.h>
 #include <assimp/color4.h>
diff --git a/openVulkanoCpp/Vulkan/Buffer.hpp b/openVulkanoCpp/Vulkan/Buffer.hpp
index 0a90248..c98dfbc 100644
--- a/openVulkanoCpp/Vulkan/Buffer.hpp
+++ b/openVulkanoCpp/Vulkan/Buffer.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Base/ICloseable.hpp"
+#include "Base/ICloseable.hpp"
 #include "Device.hpp"
 
 namespace openVulkanoCpp
diff --git a/openVulkanoCpp/Vulkan/CommandHelper.hpp b/openVulkanoCpp/Vulkan/CommandHelper.hpp
index eafda84..46098a6 100644
--- a/openVulkanoCpp/Vulkan/CommandHelper.hpp
+++ b/openVulkanoCpp/Vulkan/CommandHelper.hpp
@@ -1,6 +1,13 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 #pragma once
+
+#include "Base/ICloseable.hpp"
 #include <vulkan/vulkan.hpp>
-#include "../Base/ICloseable.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Vulkan/Context.cpp b/openVulkanoCpp/Vulkan/Context.cpp
index 8506841..21ff1fc 100644
--- a/openVulkanoCpp/Vulkan/Context.cpp
+++ b/openVulkanoCpp/Vulkan/Context.cpp
@@ -5,12 +5,12 @@
  */
 
 #include "Context.hpp"
-#include "../Base/Utils.hpp"
-#include "../Base/Logger.hpp"
-#include "../Base/IGraphicsApp.hpp"
-#include "../Base/IGraphicsAppManager.hpp"
-#include "../Base/EngineConstants.hpp"
-#include "../Base/UI/IVulkanWindow.hpp"
+#include "Base/Utils.hpp"
+#include "Base/Logger.hpp"
+#include "Base/IGraphicsApp.hpp"
+#include "Base/IGraphicsAppManager.hpp"
+#include "Base/EngineConstants.hpp"
+#include "Base/UI/IVulkanWindow.hpp"
 #include "Debuging/ValidationLayer.hpp"
 
 namespace openVulkanoCpp::Vulkan
diff --git a/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp b/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp
index 90343dd..ca97eae 100644
--- a/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp
+++ b/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "ValidationLayer.hpp"
-#include "../../Base/Logger.hpp"
+#include "Base/Logger.hpp"
 #include <list>
 
 #define RENDER_DOC
diff --git a/openVulkanoCpp/Vulkan/Device.hpp b/openVulkanoCpp/Vulkan/Device.hpp
index 4bb8011..e12f62b 100644
--- a/openVulkanoCpp/Vulkan/Device.hpp
+++ b/openVulkanoCpp/Vulkan/Device.hpp
@@ -10,7 +10,7 @@
 #include <set>
 #include <functional>
 #include <fstream>
-#include "../Base/ICloseable.hpp"
+#include "Base/ICloseable.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Vulkan/DeviceManager.hpp b/openVulkanoCpp/Vulkan/DeviceManager.hpp
index 65a2125..2532dfc 100644
--- a/openVulkanoCpp/Vulkan/DeviceManager.hpp
+++ b/openVulkanoCpp/Vulkan/DeviceManager.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <stdexcept>
 #include <vector>
-#include "../Base/ICloseable.hpp"
+#include "Base/ICloseable.hpp"
 #include "Device.hpp"
 
 namespace openVulkanoCpp
diff --git a/openVulkanoCpp/Vulkan/FrameBuffer.hpp b/openVulkanoCpp/Vulkan/FrameBuffer.hpp
index ac31323..a467823 100644
--- a/openVulkanoCpp/Vulkan/FrameBuffer.hpp
+++ b/openVulkanoCpp/Vulkan/FrameBuffer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
 #include <vulkan/vulkan.hpp>
-#include "../Base/ICloseable.hpp"
+#include "Base/ICloseable.hpp"
 #include "Image.hpp"
 #include "Device.hpp"
 
diff --git a/openVulkanoCpp/Vulkan/Pipeline.hpp b/openVulkanoCpp/Vulkan/Pipeline.hpp
index 94933f2..aa1dcd7 100644
--- a/openVulkanoCpp/Vulkan/Pipeline.hpp
+++ b/openVulkanoCpp/Vulkan/Pipeline.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <vulkan/vulkan.hpp>
-#include "../Base/ICloseable.hpp"
+#include "Base/ICloseable.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Vulkan/Renderer.hpp b/openVulkanoCpp/Vulkan/Renderer.hpp
index f219f23..6c720f1 100644
--- a/openVulkanoCpp/Vulkan/Renderer.hpp
+++ b/openVulkanoCpp/Vulkan/Renderer.hpp
@@ -6,14 +6,14 @@
 
 #pragma once
 
-#include "../Base/Render/IRenderer.hpp"
-#include "../Base/UI/IWindow.hpp"
-#include "../Base/Logger.hpp"
+#include "Base/Render/IRenderer.hpp"
+#include "Base/UI/IWindow.hpp"
+#include "Base/Logger.hpp"
 #include "Context.hpp"
 #include "Resources/ResourceManager.hpp"
-#include "../Data/ReadOnlyAtomicArrayQueue.hpp"
+#include "Data/ReadOnlyAtomicArrayQueue.hpp"
 #include "CommandHelper.hpp"
-#include "../Base/EngineConfiguration.hpp"
+#include "Base/EngineConfiguration.hpp"
 
 namespace openVulkanoCpp::Vulkan
 {
diff --git a/openVulkanoCpp/Vulkan/Resources/IShaderOwner.hpp b/openVulkanoCpp/Vulkan/Resources/IShaderOwner.hpp
index 3760603..434f043 100644
--- a/openVulkanoCpp/Vulkan/Resources/IShaderOwner.hpp
+++ b/openVulkanoCpp/Vulkan/Resources/IShaderOwner.hpp
@@ -1,5 +1,12 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 #pragma once
-#include "../Scene/VulkanShader.hpp"
+
+#include "Vulkan/Scene/VulkanShader.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Vulkan/Resources/ManagedResource.cpp b/openVulkanoCpp/Vulkan/Resources/ManagedResource.cpp
index 916f36b..3c2dc5a 100644
--- a/openVulkanoCpp/Vulkan/Resources/ManagedResource.cpp
+++ b/openVulkanoCpp/Vulkan/Resources/ManagedResource.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "ManagedResource.hpp"
-#include "../../Base/Logger.hpp"
+#include "Base/Logger.hpp"
 
 namespace openVulkanoCpp::Vulkan
 {
diff --git a/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp b/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp
index 939fa9c..fa1ec6b 100644
--- a/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp
+++ b/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp
@@ -5,10 +5,10 @@
  */
 
 #include "ResourceManager.hpp"
-#include "../Context.hpp"
-#include "../Scene/VulkanShader.hpp"
-#include "../Scene/VulkanGeometry.hpp"
-#include "../Scene/VulkanNode.hpp"
+#include "Vulkan/Context.hpp"
+#include "Vulkan/Scene/VulkanShader.hpp"
+#include "Vulkan/Scene/VulkanGeometry.hpp"
+#include "Vulkan/Scene/VulkanNode.hpp"
 
 namespace openVulkanoCpp::Vulkan
 {
diff --git a/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp b/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp
index f8b4425..b802ad8 100644
--- a/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp
+++ b/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "vulkan/vulkan.hpp"
-#include "../../Base/ICloseable.hpp"
+#include "Base/ICloseable.hpp"
 #include "IShaderOwner.hpp"
 #include "ManagedResource.hpp"
 #include <mutex>
diff --git a/openVulkanoCpp/Vulkan/Resources/UniformBuffer.hpp b/openVulkanoCpp/Vulkan/Resources/UniformBuffer.hpp
index da762e0..3d2b6b5 100644
--- a/openVulkanoCpp/Vulkan/Resources/UniformBuffer.hpp
+++ b/openVulkanoCpp/Vulkan/Resources/UniformBuffer.hpp
@@ -1,6 +1,13 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 #pragma once
-#include "../../Base/ICloseable.hpp"
-#include "../Scene/IRecordable.hpp"
+
+#include "Base/ICloseable.hpp"
+#include "Vulkan/Scene/IRecordable.hpp"
 #include "ManagedResource.hpp"
 
 namespace openVulkanoCpp
diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp
index 7e13b41..1dde553 100644
--- a/openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp
+++ b/openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp
@@ -1,6 +1,13 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 #pragma once
+
 #include "IRecordable.hpp"
-#include "../../Scene/Scene.hpp"
+#include "Scene/Scene.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanNode.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanNode.hpp
index 9840265..7e7d8b8 100644
--- a/openVulkanoCpp/Vulkan/Scene/VulkanNode.hpp
+++ b/openVulkanoCpp/Vulkan/Scene/VulkanNode.hpp
@@ -1,8 +1,15 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 #pragma once
-#include "../../Base/ICloseable.hpp"
+
+#include "Base/ICloseable.hpp"
 #include "IRecordable.hpp"
-#include "../../Scene/Camera.hpp"
-#include "../Resources/UniformBuffer.hpp"
+#include "Scene/Camera.hpp"
+#include "Vulkan/Resources/UniformBuffer.hpp"
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp b/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp
index 60d9407..b25dc85 100644
--- a/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp
+++ b/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp
@@ -5,10 +5,10 @@
  */
 
 #include "VulkanShader.hpp"
-#include "../Context.hpp"
-#include "../../Scene/Vertex.hpp"
-#include "../../Scene/Shader.hpp"
-#include "../Resources/IShaderOwner.hpp"
+#include "Vulkan/Context.hpp"
+#include "Scene/Vertex.hpp"
+#include "Scene/Shader.hpp"
+#include "Vulkan/Resources/IShaderOwner.hpp"
 
 namespace openVulkanoCpp::Vulkan
 {
diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp
index 100954b..6d0254c 100644
--- a/openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp
+++ b/openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <vulkan/vulkan.hpp>
-#include "../../Base/ICloseable.hpp"
 #include "IRecordable.hpp"
+#include "Base/ICloseable.hpp"
+#include <vulkan/vulkan.hpp>
 
 namespace openVulkanoCpp
 {
diff --git a/openVulkanoCpp/Vulkan/SwapChain.cpp b/openVulkanoCpp/Vulkan/SwapChain.cpp
index 1733066..f13daa1 100644
--- a/openVulkanoCpp/Vulkan/SwapChain.cpp
+++ b/openVulkanoCpp/Vulkan/SwapChain.cpp
@@ -5,9 +5,9 @@
  */
 
 #include "SwapChain.hpp"
-#include "../Base/Logger.hpp"
-#include "../Base/Utils.hpp"
-#include "../Base/UI/IVulkanWindow.hpp"
+#include "Base/Logger.hpp"
+#include "Base/Utils.hpp"
+#include "Base/UI/IVulkanWindow.hpp"
 #include <algorithm>
 
 namespace openVulkanoCpp::Vulkan
diff --git a/openVulkanoCpp/Vulkan/SwapChain.hpp b/openVulkanoCpp/Vulkan/SwapChain.hpp
index c7d3f29..ef6d8de 100644
--- a/openVulkanoCpp/Vulkan/SwapChain.hpp
+++ b/openVulkanoCpp/Vulkan/SwapChain.hpp
@@ -6,11 +6,11 @@
 
 #pragma once
 
-#include <vulkan/vulkan.hpp>
 #include "Device.hpp"
 #include "Image.hpp"
 #include "FrameBuffer.hpp"
-#include "../Base/UI/IWindow.hpp"
+#include "Base/UI/IWindow.hpp"
+#include <vulkan/vulkan.hpp>
 
 namespace openVulkanoCpp
 {