diff --git a/include/Nazara/VulkanRenderer/Utils.hpp b/include/Nazara/VulkanRenderer/Utils.hpp
index eb195b16c..cd856a49c 100644
--- a/include/Nazara/VulkanRenderer/Utils.hpp
+++ b/include/Nazara/VulkanRenderer/Utils.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/String.hpp>
-#include <Nazara/VulkanRenderer/VkLoader.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 
 namespace Nz
 {
diff --git a/include/Nazara/VulkanRenderer/VkRenderTarget.hpp b/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
index 51aa97d4a..52e7b034d 100644
--- a/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
+++ b/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
@@ -10,9 +10,9 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/Signal.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/VkFrameBuffer.hpp>
-#include <Nazara/VulkanRenderer/VkRenderPass.hpp>
-#include <Nazara/VulkanRenderer/VkSemaphore.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/FrameBuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Semaphore.hpp>
 #include <unordered_map>
 #include <vulkan/vulkan.h>
 
diff --git a/include/Nazara/VulkanRenderer/VkRenderWindow.hpp b/include/Nazara/VulkanRenderer/VkRenderWindow.hpp
index 348fb84c1..7a3246984 100644
--- a/include/Nazara/VulkanRenderer/VkRenderWindow.hpp
+++ b/include/Nazara/VulkanRenderer/VkRenderWindow.hpp
@@ -13,15 +13,15 @@
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Renderer/RenderWindowImpl.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/VkCommandBuffer.hpp>
-#include <Nazara/VulkanRenderer/VkCommandPool.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceMemory.hpp>
-#include <Nazara/VulkanRenderer/VkFramebuffer.hpp>
-#include <Nazara/VulkanRenderer/VkImage.hpp>
 #include <Nazara/VulkanRenderer/VkRenderTarget.hpp>
-#include <Nazara/VulkanRenderer/VkSurface.hpp>
-#include <Nazara/VulkanRenderer/VkSwapchain.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Image.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Surface.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Swapchain.hpp>
 #include <vector>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/Vulkan.hpp b/include/Nazara/VulkanRenderer/Vulkan.hpp
index bd0e38560..04f62637b 100644
--- a/include/Nazara/VulkanRenderer/Vulkan.hpp
+++ b/include/Nazara/VulkanRenderer/Vulkan.hpp
@@ -11,10 +11,10 @@
 #include <Nazara/Core/Initializer.hpp>
 #include <Nazara/Core/ParameterList.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
-#include <Nazara/VulkanRenderer/VkPhysicalDevice.hpp>
-#include <Nazara/VulkanRenderer/VkSurface.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Surface.hpp>
 #include <list>
 #include <vector>
 
diff --git a/include/Nazara/VulkanRenderer/VulkanRenderer.hpp b/include/Nazara/VulkanRenderer/VulkanRenderer.hpp
index aeb3d19e6..38dc8540f 100644
--- a/include/Nazara/VulkanRenderer/VulkanRenderer.hpp
+++ b/include/Nazara/VulkanRenderer/VulkanRenderer.hpp
@@ -10,10 +10,10 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Renderer/RendererImpl.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
-#include <Nazara/VulkanRenderer/VkPhysicalDevice.hpp>
-#include <Nazara/VulkanRenderer/VkSurface.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Surface.hpp>
 #include <list>
 #include <vector>
 
diff --git a/include/Nazara/VulkanRenderer/VkBuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp
similarity index 92%
rename from include/Nazara/VulkanRenderer/VkBuffer.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp
index 9f280f655..2daf3d302 100644
--- a/include/Nazara/VulkanRenderer/VkBuffer.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKBUFFER_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -41,6 +41,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkBuffer.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Buffer.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKBUFFER_HPP
diff --git a/include/Nazara/VulkanRenderer/VkBuffer.inl b/include/Nazara/VulkanRenderer/Wrapper/Buffer.inl
similarity index 97%
rename from include/Nazara/VulkanRenderer/VkBuffer.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Buffer.inl
index 2ac598738..73ad69566 100644
--- a/include/Nazara/VulkanRenderer/VkBuffer.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Buffer.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkBuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Buffer.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkCommandBuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp
similarity index 98%
rename from include/Nazara/VulkanRenderer/VkCommandBuffer.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp
index dc88f13da..c1d2b9e54 100644
--- a/include/Nazara/VulkanRenderer/VkCommandBuffer.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Math/Rect.hpp>
-#include <Nazara/VulkanRenderer/VkCommandPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
 #include <vulkan/vulkan.h>
 
 namespace Nz 
@@ -95,6 +95,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkCommandBuffer.inl>
+#include <Nazara/VulkanRenderer/Wrapper/CommandBuffer.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKCOMMANDBUFFER_HPP
diff --git a/include/Nazara/VulkanRenderer/VkCommandBuffer.inl b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.inl
similarity index 99%
rename from include/Nazara/VulkanRenderer/VkCommandBuffer.inl
rename to include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.inl
index 7721a7a74..c020d284f 100644
--- a/include/Nazara/VulkanRenderer/VkCommandBuffer.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.inl
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkCommandBuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkCommandPool.hpp b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkCommandPool.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp
index 178ec1fec..1c1e2674a 100644
--- a/include/Nazara/VulkanRenderer/VkCommandPool.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/HandledObject.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -48,6 +48,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkCommandPool.inl>
+#include <Nazara/VulkanRenderer/Wrapper/CommandPool.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKCOMMANDPOOL_HPP
diff --git a/include/Nazara/VulkanRenderer/VkCommandPool.inl b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.inl
similarity index 92%
rename from include/Nazara/VulkanRenderer/VkCommandPool.inl
rename to include/Nazara/VulkanRenderer/Wrapper/CommandPool.inl
index cba47f66b..90c952654 100644
--- a/include/Nazara/VulkanRenderer/VkCommandPool.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.inl
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkCommandPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkDescriptorPool.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp
similarity index 94%
rename from include/Nazara/VulkanRenderer/VkDescriptorPool.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp
index b5c862ffe..f9fad39d3 100644
--- a/include/Nazara/VulkanRenderer/VkDescriptorPool.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/HandledObject.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -47,6 +47,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkDescriptorPool.inl>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKDESCRIPTORPOOL_HPP
diff --git a/include/Nazara/VulkanRenderer/VkDescriptorPool.inl b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.inl
similarity index 97%
rename from include/Nazara/VulkanRenderer/VkDescriptorPool.inl
rename to include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.inl
index dc41a2ce8..cd81effcc 100644
--- a/include/Nazara/VulkanRenderer/VkDescriptorPool.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkDescriptorPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkDescriptorSet.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp
similarity index 94%
rename from include/Nazara/VulkanRenderer/VkDescriptorSet.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp
index 3a4fba9dc..0c08a52f8 100644
--- a/include/Nazara/VulkanRenderer/VkDescriptorSet.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Math/Rect.hpp>
-#include <Nazara/VulkanRenderer/VkDescriptorPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp>
 #include <vulkan/vulkan.h>
 
 namespace Nz 
@@ -54,6 +54,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkDescriptorSet.inl>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorSet.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKDESCRIPTORSET_HPP
diff --git a/include/Nazara/VulkanRenderer/VkDescriptorSet.inl b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.inl
similarity index 97%
rename from include/Nazara/VulkanRenderer/VkDescriptorSet.inl
rename to include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.inl
index bc011005c..c94c48806 100644
--- a/include/Nazara/VulkanRenderer/VkDescriptorSet.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.inl
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkDescriptorSet.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkDescriptorSetLayout.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkDescriptorSetLayout.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp
index 6aff14fbe..fc95be3db 100644
--- a/include/Nazara/VulkanRenderer/VkDescriptorSetLayout.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -38,6 +38,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkDescriptorSetLayout.inl>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP
diff --git a/include/Nazara/VulkanRenderer/VkDescriptorSetLayout.inl b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.inl
similarity index 96%
rename from include/Nazara/VulkanRenderer/VkDescriptorSetLayout.inl
rename to include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.inl
index a53956b64..707d6ccdd 100644
--- a/include/Nazara/VulkanRenderer/VkDescriptorSetLayout.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkDescriptorSetLayout.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkDevice.hpp b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp
similarity index 99%
rename from include/Nazara/VulkanRenderer/VkDevice.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Device.hpp
index 32928338c..227e8f512 100644
--- a/include/Nazara/VulkanRenderer/VkDevice.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/HandledObject.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/VkLoader.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <vulkan/vulkan.h>
 #include <unordered_set>
 
@@ -227,6 +227,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkDevice.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Device.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKDEVICE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkDevice.inl b/include/Nazara/VulkanRenderer/Wrapper/Device.inl
similarity index 94%
rename from include/Nazara/VulkanRenderer/VkDevice.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Device.inl
index b5574958b..f7e76a2f0 100644
--- a/include/Nazara/VulkanRenderer/VkDevice.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Device.inl
@@ -2,11 +2,11 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
-#include <Nazara/VulkanRenderer/VkQueue.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Queue.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkDeviceMemory.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkDeviceMemory.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp
index 7e6755dba..1613ea019 100644
--- a/include/Nazara/VulkanRenderer/VkDeviceMemory.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -46,6 +46,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkDeviceMemory.inl>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP
diff --git a/include/Nazara/VulkanRenderer/VkDeviceMemory.inl b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl
similarity index 96%
rename from include/Nazara/VulkanRenderer/VkDeviceMemory.inl
rename to include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl
index 2b66fc1c5..64e2f7618 100644
--- a/include/Nazara/VulkanRenderer/VkDeviceMemory.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkDeviceMemory.hpp>
-#include <Nazara/VulkanRenderer/VkPhysicalDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/VulkanRenderer/Vulkan.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
diff --git a/include/Nazara/VulkanRenderer/VkDeviceObject.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp
similarity index 92%
rename from include/Nazara/VulkanRenderer/VkDeviceObject.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp
index 5a61bf2ee..2c09fe638 100644
--- a/include/Nazara/VulkanRenderer/VkDeviceObject.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <vulkan/vulkan.h>
 
 namespace Nz 
@@ -46,6 +46,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkDeviceObject.inl>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP
diff --git a/include/Nazara/VulkanRenderer/VkDeviceObject.inl b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.inl
similarity index 94%
rename from include/Nazara/VulkanRenderer/VkDeviceObject.inl
rename to include/Nazara/VulkanRenderer/Wrapper/DeviceObject.inl
index f46cfd256..a68e7a469 100644
--- a/include/Nazara/VulkanRenderer/VkDeviceObject.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.inl
@@ -2,11 +2,11 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
-#include <Nazara/VulkanRenderer/VkCommandPool.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkFramebuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp
similarity index 90%
rename from include/Nazara/VulkanRenderer/VkFramebuffer.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp
index 606042371..99f168be5 100644
--- a/include/Nazara/VulkanRenderer/VkFramebuffer.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -34,6 +34,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkFramebuffer.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Framebuffer.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP
diff --git a/include/Nazara/VulkanRenderer/VkFramebuffer.inl b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.inl
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkFramebuffer.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Framebuffer.inl
index 961f3e0c6..1062a1d63 100644
--- a/include/Nazara/VulkanRenderer/VkFramebuffer.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkFramebuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkImage.hpp b/include/Nazara/VulkanRenderer/Wrapper/Image.hpp
similarity index 91%
rename from include/Nazara/VulkanRenderer/VkImage.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Image.hpp
index 578662600..eea75ee4d 100644
--- a/include/Nazara/VulkanRenderer/VkImage.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Image.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKIMAGE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -38,6 +38,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkImage.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Image.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKIMAGE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkImage.inl b/include/Nazara/VulkanRenderer/Wrapper/Image.inl
similarity index 96%
rename from include/Nazara/VulkanRenderer/VkImage.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Image.inl
index e7a675f26..ffc8ed2f9 100644
--- a/include/Nazara/VulkanRenderer/VkImage.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Image.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkImage.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Image.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
diff --git a/include/Nazara/VulkanRenderer/VkImageView.hpp b/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp
similarity index 90%
rename from include/Nazara/VulkanRenderer/VkImageView.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp
index 8362859cc..373cf18b6 100644
--- a/include/Nazara/VulkanRenderer/VkImageView.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -34,6 +34,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkImageView.inl>
+#include <Nazara/VulkanRenderer/Wrapper/ImageView.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP
diff --git a/include/Nazara/VulkanRenderer/VkImageView.inl b/include/Nazara/VulkanRenderer/Wrapper/ImageView.inl
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkImageView.inl
rename to include/Nazara/VulkanRenderer/Wrapper/ImageView.inl
index 8bf522c9e..0c2219703 100644
--- a/include/Nazara/VulkanRenderer/VkImageView.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/ImageView.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkImageView.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/ImageView.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkInstance.hpp b/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp
similarity index 98%
rename from include/Nazara/VulkanRenderer/VkInstance.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Instance.hpp
index 03e52e86a..c8fafd9d3 100644
--- a/include/Nazara/VulkanRenderer/VkInstance.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/String.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/VkLoader.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <vulkan/vulkan.h>
 #include <unordered_set>
 
@@ -137,6 +137,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkInstance.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKINSTANCE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkInstance.inl b/include/Nazara/VulkanRenderer/Wrapper/Instance.inl
similarity index 98%
rename from include/Nazara/VulkanRenderer/VkInstance.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Instance.inl
index db3a485af..a750763c9 100644
--- a/include/Nazara/VulkanRenderer/VkInstance.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Instance.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
diff --git a/include/Nazara/VulkanRenderer/VkLoader.hpp b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
similarity index 96%
rename from include/Nazara/VulkanRenderer/VkLoader.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
index a83eb58e1..a1c4d4ed6 100644
--- a/include/Nazara/VulkanRenderer/VkLoader.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
@@ -47,6 +47,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkLoader.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKLOADER_HPP
diff --git a/include/Nazara/VulkanRenderer/VkLoader.inl b/include/Nazara/VulkanRenderer/Wrapper/Loader.inl
similarity index 89%
rename from include/Nazara/VulkanRenderer/VkLoader.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Loader.inl
index caad2bab3..1ff9dfd01 100644
--- a/include/Nazara/VulkanRenderer/VkLoader.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Loader.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkLoader.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkPhysicalDevice.hpp b/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp
similarity index 100%
rename from include/Nazara/VulkanRenderer/VkPhysicalDevice.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp
diff --git a/include/Nazara/VulkanRenderer/VkPipeline.hpp b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp
similarity index 92%
rename from include/Nazara/VulkanRenderer/VkPipeline.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp
index ec18dd416..ead741a30 100644
--- a/include/Nazara/VulkanRenderer/VkPipeline.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKPIPELINE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -45,6 +45,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkPipeline.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Pipeline.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKPIPELINE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkPipeline.inl b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.inl
similarity index 97%
rename from include/Nazara/VulkanRenderer/VkPipeline.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Pipeline.inl
index 936a003a7..d55eb95d6 100644
--- a/include/Nazara/VulkanRenderer/VkPipeline.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkPipeline.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Pipeline.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
diff --git a/include/Nazara/VulkanRenderer/VkPipelineCache.hpp b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp
similarity index 90%
rename from include/Nazara/VulkanRenderer/VkPipelineCache.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp
index cb60321b9..405fee3c2 100644
--- a/include/Nazara/VulkanRenderer/VkPipelineCache.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -34,6 +34,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkPipelineCache.inl>
+#include <Nazara/VulkanRenderer/Wrapper/PipelineCache.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkPipelineCache.inl b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.inl
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkPipelineCache.inl
rename to include/Nazara/VulkanRenderer/Wrapper/PipelineCache.inl
index d37f5c8c0..fde28390c 100644
--- a/include/Nazara/VulkanRenderer/VkPipelineCache.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkPipelineCache.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkPipelineLayout.hpp b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp
similarity index 90%
rename from include/Nazara/VulkanRenderer/VkPipelineLayout.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp
index 4abb54e0a..fe5300127 100644
--- a/include/Nazara/VulkanRenderer/VkPipelineLayout.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -34,6 +34,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkPipelineLayout.inl>
+#include <Nazara/VulkanRenderer/Wrapper/PipelineLayout.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP
diff --git a/include/Nazara/VulkanRenderer/VkPipelineLayout.inl b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.inl
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkPipelineLayout.inl
rename to include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.inl
index 22ceb988b..a7a1bc444 100644
--- a/include/Nazara/VulkanRenderer/VkPipelineLayout.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkPipelineLayout.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkQueue.hpp b/include/Nazara/VulkanRenderer/Wrapper/Queue.hpp
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkQueue.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Queue.hpp
index 59cf74e17..f8502ab87 100644
--- a/include/Nazara/VulkanRenderer/VkQueue.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Queue.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKQUEUE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <vulkan/vulkan.h>
 
 namespace Nz 
@@ -48,6 +48,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkQueue.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Queue.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKQUEUE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkQueue.inl b/include/Nazara/VulkanRenderer/Wrapper/Queue.inl
similarity index 96%
rename from include/Nazara/VulkanRenderer/VkQueue.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Queue.inl
index c1d06ec4e..51966d94d 100644
--- a/include/Nazara/VulkanRenderer/VkQueue.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Queue.inl
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkQueue.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Queue.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkRenderPass.hpp b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp
similarity index 90%
rename from include/Nazara/VulkanRenderer/VkRenderPass.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp
index 2ea70a316..71c1d75e9 100644
--- a/include/Nazara/VulkanRenderer/VkRenderPass.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKRENDERPASS_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -34,6 +34,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkRenderPass.inl>
+#include <Nazara/VulkanRenderer/Wrapper/RenderPass.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKRENDERPASS_HPP
diff --git a/include/Nazara/VulkanRenderer/VkRenderPass.inl b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.inl
similarity index 93%
rename from include/Nazara/VulkanRenderer/VkRenderPass.inl
rename to include/Nazara/VulkanRenderer/Wrapper/RenderPass.inl
index 7fde52a75..4052fb100 100644
--- a/include/Nazara/VulkanRenderer/VkRenderPass.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkRenderPass.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkSemaphore.hpp b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp
similarity index 91%
rename from include/Nazara/VulkanRenderer/VkSemaphore.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp
index 0f5e09d59..baffe1171 100644
--- a/include/Nazara/VulkanRenderer/VkSemaphore.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -37,6 +37,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkSemaphore.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Semaphore.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkSemaphore.inl b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.inl
similarity index 95%
rename from include/Nazara/VulkanRenderer/VkSemaphore.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Semaphore.inl
index 7220cfeb9..605a59c03 100644
--- a/include/Nazara/VulkanRenderer/VkSemaphore.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkSemaphore.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Semaphore.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkShaderModule.hpp b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp
similarity index 92%
rename from include/Nazara/VulkanRenderer/VkShaderModule.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp
index e8b5f8fd1..65ee75ddc 100644
--- a/include/Nazara/VulkanRenderer/VkShaderModule.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
 
 namespace Nz 
 {
@@ -37,6 +37,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkShaderModule.inl>
+#include <Nazara/VulkanRenderer/Wrapper/ShaderModule.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkShaderModule.inl b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.inl
similarity index 95%
rename from include/Nazara/VulkanRenderer/VkShaderModule.inl
rename to include/Nazara/VulkanRenderer/Wrapper/ShaderModule.inl
index 81f5177fc..fa9781226 100644
--- a/include/Nazara/VulkanRenderer/VkShaderModule.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkShaderModule.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkSurface.hpp b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
similarity index 97%
rename from include/Nazara/VulkanRenderer/VkSurface.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
index 1f4db956f..765848962 100644
--- a/include/Nazara/VulkanRenderer/VkSurface.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/VkLoader.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <vulkan/vulkan.h>
 
 namespace Nz 
@@ -89,6 +89,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkSurface.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Surface.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKSURFACE_HPP
diff --git a/include/Nazara/VulkanRenderer/VkSurface.inl b/include/Nazara/VulkanRenderer/Wrapper/Surface.inl
similarity index 98%
rename from include/Nazara/VulkanRenderer/VkSurface.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Surface.inl
index 8b5ea7369..bfc5f4824 100644
--- a/include/Nazara/VulkanRenderer/VkSurface.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Surface.inl
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkSurface.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Surface.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/VkSwapchain.hpp b/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp
similarity index 91%
rename from include/Nazara/VulkanRenderer/VkSwapchain.hpp
rename to include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp
index b896c6c58..5df920ba0 100644
--- a/include/Nazara/VulkanRenderer/VkSwapchain.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
-#include <Nazara/VulkanRenderer/VkImageView.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/ImageView.hpp>
 
 namespace Nz 
 {
@@ -55,6 +55,6 @@ namespace Nz
 	}
 }
 
-#include <Nazara/VulkanRenderer/VkSwapchain.inl>
+#include <Nazara/VulkanRenderer/Wrapper/Swapchain.inl>
 
 #endif // NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP
diff --git a/include/Nazara/VulkanRenderer/VkSwapchain.inl b/include/Nazara/VulkanRenderer/Wrapper/Swapchain.inl
similarity index 97%
rename from include/Nazara/VulkanRenderer/VkSwapchain.inl
rename to include/Nazara/VulkanRenderer/Wrapper/Swapchain.inl
index 363807859..5561ac3f0 100644
--- a/include/Nazara/VulkanRenderer/VkSwapchain.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Swapchain.inl
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkSwapchain.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Swapchain.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/VulkanRenderer/VulkanRenderer.cpp b/src/Nazara/VulkanRenderer/VulkanRenderer.cpp
index e647645a6..861557507 100644
--- a/src/Nazara/VulkanRenderer/VulkanRenderer.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanRenderer.cpp
@@ -4,8 +4,8 @@
 
 #include <Nazara/VulkanRenderer/VulkanRenderer.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/VulkanRenderer/VkLoader.hpp>
 #include <Nazara/VulkanRenderer/VkRenderWindow.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/VulkanRenderer/VkCommandPool.cpp b/src/Nazara/VulkanRenderer/Wrapper/CommandPool.cpp
similarity index 92%
rename from src/Nazara/VulkanRenderer/VkCommandPool.cpp
rename to src/Nazara/VulkanRenderer/Wrapper/CommandPool.cpp
index a1f2ea629..ab9cf5ccc 100644
--- a/src/Nazara/VulkanRenderer/VkCommandPool.cpp
+++ b/src/Nazara/VulkanRenderer/Wrapper/CommandPool.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkCommandPool.hpp>
-#include <Nazara/VulkanRenderer/VkCommandBuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/VulkanRenderer/VkDescriptorPool.cpp b/src/Nazara/VulkanRenderer/Wrapper/DescriptorPool.cpp
similarity index 94%
rename from src/Nazara/VulkanRenderer/VkDescriptorPool.cpp
rename to src/Nazara/VulkanRenderer/Wrapper/DescriptorPool.cpp
index f84b9dc20..5cea20758 100644
--- a/src/Nazara/VulkanRenderer/VkDescriptorPool.cpp
+++ b/src/Nazara/VulkanRenderer/Wrapper/DescriptorPool.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkDescriptorPool.hpp>
-#include <Nazara/VulkanRenderer/VkDescriptorSet.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/VulkanRenderer/VkDevice.cpp b/src/Nazara/VulkanRenderer/Wrapper/Device.cpp
similarity index 99%
rename from src/Nazara/VulkanRenderer/VkDevice.cpp
rename to src/Nazara/VulkanRenderer/Wrapper/Device.cpp
index a62c65e26..b5f6d8890 100644
--- a/src/Nazara/VulkanRenderer/VkDevice.cpp
+++ b/src/Nazara/VulkanRenderer/Wrapper/Device.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
diff --git a/src/Nazara/VulkanRenderer/VkInstance.cpp b/src/Nazara/VulkanRenderer/Wrapper/Instance.cpp
similarity index 99%
rename from src/Nazara/VulkanRenderer/VkInstance.cpp
rename to src/Nazara/VulkanRenderer/Wrapper/Instance.cpp
index 7daced8f1..4ec965725 100644
--- a/src/Nazara/VulkanRenderer/VkInstance.cpp
+++ b/src/Nazara/VulkanRenderer/Wrapper/Instance.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
diff --git a/src/Nazara/VulkanRenderer/VkLoader.cpp b/src/Nazara/VulkanRenderer/Wrapper/Loader.cpp
similarity index 98%
rename from src/Nazara/VulkanRenderer/VkLoader.cpp
rename to src/Nazara/VulkanRenderer/Wrapper/Loader.cpp
index 8bc2bd05b..c1d62f715 100644
--- a/src/Nazara/VulkanRenderer/VkLoader.cpp
+++ b/src/Nazara/VulkanRenderer/Wrapper/Loader.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Vulkan Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/VkLoader.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>