diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1f5b68ce5..e54ab01e07 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -605,6 +605,7 @@ file( GLOB HEADER_FILES
 	common/rendering/vulkan/samplers/*.h
 	common/rendering/vulkan/shaders/*.h
 	common/rendering/vulkan/textures/*.h
+	common/rendering/vulkan/accelstructs/*.h
 	common/scripting/core/*h
 	common/scripting/vm/*h
 	common/scripting/jit/*h
@@ -740,24 +741,24 @@ set( FASTMATH_SOURCES
 set (VULKAN_SOURCES
 	common/rendering/vulkan/vk_renderdevice.cpp
 	common/rendering/vulkan/vk_renderstate.cpp
-	common/rendering/vulkan/vk_streambuffer.cpp
 	common/rendering/vulkan/vk_postprocess.cpp
 	common/rendering/vulkan/vk_pprenderstate.cpp
-	common/rendering/vulkan/vk_raytrace.cpp
 	common/rendering/vulkan/commands/vk_commandbuffer.cpp
+	common/rendering/vulkan/buffers/vk_streambuffer.cpp
 	common/rendering/vulkan/buffers/vk_hwbuffer.cpp
 	common/rendering/vulkan/buffers/vk_buffer.cpp	
-	common/rendering/vulkan/pipelines/vk_renderpass.cpp
+	common/rendering/vulkan/samplers/vk_samplers.cpp
 	common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp
+	common/rendering/vulkan/pipelines/vk_renderpass.cpp
 	common/rendering/vulkan/shaders/vk_shader.cpp
 	common/rendering/vulkan/shaders/vk_ppshader.cpp
-	common/rendering/vulkan/samplers/vk_samplers.cpp
 	common/rendering/vulkan/textures/vk_hwtexture.cpp
 	common/rendering/vulkan/textures/vk_pptexture.cpp
 	common/rendering/vulkan/textures/vk_imagetransition.cpp
 	common/rendering/vulkan/textures/vk_renderbuffers.cpp
 	common/rendering/vulkan/textures/vk_texture.cpp
 	common/rendering/vulkan/framebuffers/vk_framebuffer.cpp
+	common/rendering/vulkan/accelstructs/vk_raytrace.cpp
 )
 
 if (HAVE_VULKAN)
@@ -1458,6 +1459,7 @@ source_group("Common\\Rendering\\Vulkan Renderer\\Pipelines" REGULAR_EXPRESSION
 source_group("Common\\Rendering\\Vulkan Renderer\\Samplers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/samplers/.+")
 source_group("Common\\Rendering\\Vulkan Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/shaders/.+")
 source_group("Common\\Rendering\\Vulkan Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/textures/.+")
+source_group("Common\\Rendering\\Vulkan Renderer\\Accelstructs" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/accelstructs/.+")
 source_group("Common\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/models/.+")
 source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+")
 source_group("Common\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/.+")
diff --git a/src/common/rendering/vulkan/vk_raytrace.cpp b/src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp
similarity index 100%
rename from src/common/rendering/vulkan/vk_raytrace.cpp
rename to src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp
diff --git a/src/common/rendering/vulkan/vk_raytrace.h b/src/common/rendering/vulkan/accelstructs/vk_raytrace.h
similarity index 100%
rename from src/common/rendering/vulkan/vk_raytrace.h
rename to src/common/rendering/vulkan/accelstructs/vk_raytrace.h
diff --git a/src/common/rendering/vulkan/buffers/vk_buffer.cpp b/src/common/rendering/vulkan/buffers/vk_buffer.cpp
index 547eee4bce..f9e94ee3fc 100644
--- a/src/common/rendering/vulkan/buffers/vk_buffer.cpp
+++ b/src/common/rendering/vulkan/buffers/vk_buffer.cpp
@@ -22,7 +22,7 @@
 
 #include "vk_buffer.h"
 #include "vk_hwbuffer.h"
-#include "vulkan/vk_streambuffer.h"
+#include "vk_streambuffer.h"
 #include "hwrenderer/data/shaderuniforms.h"
 
 VkBufferManager::VkBufferManager(VulkanRenderDevice* fb) : fb(fb)
diff --git a/src/common/rendering/vulkan/vk_streambuffer.cpp b/src/common/rendering/vulkan/buffers/vk_streambuffer.cpp
similarity index 98%
rename from src/common/rendering/vulkan/vk_streambuffer.cpp
rename to src/common/rendering/vulkan/buffers/vk_streambuffer.cpp
index 99753d9ab0..5432786aeb 100644
--- a/src/common/rendering/vulkan/vk_streambuffer.cpp
+++ b/src/common/rendering/vulkan/buffers/vk_streambuffer.cpp
@@ -20,9 +20,9 @@
 **
 */
 
-#include "vk_renderstate.h"
+#include "vk_streambuffer.h"
+#include "vulkan/vk_renderstate.h"
 #include "vulkan/vk_renderdevice.h"
-#include "vulkan/vk_streambuffer.h"
 #include "vulkan/buffers/vk_buffer.h"
 #include <zvulkan/vulkanbuilders.h>
 
diff --git a/src/common/rendering/vulkan/vk_streambuffer.h b/src/common/rendering/vulkan/buffers/vk_streambuffer.h
similarity index 100%
rename from src/common/rendering/vulkan/vk_streambuffer.h
rename to src/common/rendering/vulkan/buffers/vk_streambuffer.h
diff --git a/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp
index 09a96e4ba3..e4e6963486 100644
--- a/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp
+++ b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp
@@ -21,9 +21,8 @@
 */
 
 #include "vk_descriptorset.h"
-#include "vulkan/vk_streambuffer.h"
-#include "vulkan/vk_raytrace.h"
 #include "vulkan/vk_renderdevice.h"
+#include "vulkan/accelstructs/vk_raytrace.h"
 #include "vulkan/shaders/vk_shader.h"
 #include "vulkan/samplers/vk_samplers.h"
 #include "vulkan/textures/vk_renderbuffers.h"
@@ -31,6 +30,7 @@
 #include "vulkan/textures/vk_texture.h"
 #include "vulkan/buffers/vk_hwbuffer.h"
 #include "vulkan/buffers/vk_buffer.h"
+#include "vulkan/buffers/vk_streambuffer.h"
 #include "vulkan/commands/vk_commandbuffer.h"
 #include <zvulkan/vulkanbuilders.h>
 #include "flatvertices.h"
diff --git a/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp b/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp
index a0d11ac77b..3bf13fe12b 100644
--- a/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp
+++ b/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp
@@ -22,8 +22,8 @@
 
 #include "vk_renderpass.h"
 #include "vulkan/vk_renderstate.h"
-#include "vulkan/vk_raytrace.h"
 #include "vulkan/vk_renderdevice.h"
+#include "vulkan/accelstructs/vk_raytrace.h"
 #include "vulkan/descriptorsets/vk_descriptorset.h"
 #include "vulkan/textures/vk_renderbuffers.h"
 #include "vulkan/samplers/vk_samplers.h"
diff --git a/src/common/rendering/vulkan/vk_renderdevice.cpp b/src/common/rendering/vulkan/vk_renderdevice.cpp
index cdc1e955be..216ad1f1a8 100644
--- a/src/common/rendering/vulkan/vk_renderdevice.cpp
+++ b/src/common/rendering/vulkan/vk_renderdevice.cpp
@@ -45,9 +45,8 @@
 
 #include "vk_renderdevice.h"
 #include "vulkan/vk_renderstate.h"
-#include "vulkan/vk_streambuffer.h"
 #include "vulkan/vk_postprocess.h"
-#include "vulkan/vk_raytrace.h"
+#include "vulkan/accelstructs/vk_raytrace.h"
 #include "vulkan/pipelines/vk_renderpass.h"
 #include "vulkan/descriptorsets/vk_descriptorset.h"
 #include "vulkan/shaders/vk_shader.h"
@@ -59,6 +58,7 @@
 #include "vulkan/commands/vk_commandbuffer.h"
 #include "vulkan/buffers/vk_hwbuffer.h"
 #include "vulkan/buffers/vk_buffer.h"
+#include "vulkan/buffers/vk_streambuffer.h"
 #include <zvulkan/vulkanswapchain.h>
 #include <zvulkan/vulkanbuilders.h>
 #include <zvulkan/vulkansurface.h>
diff --git a/src/common/rendering/vulkan/vk_renderstate.h b/src/common/rendering/vulkan/vk_renderstate.h
index 770a4e2a23..9a45c604d6 100644
--- a/src/common/rendering/vulkan/vk_renderstate.h
+++ b/src/common/rendering/vulkan/vk_renderstate.h
@@ -2,9 +2,9 @@
 #pragma once
 
 #include "vulkan/buffers/vk_hwbuffer.h"
+#include "vulkan/buffers/vk_streambuffer.h"
 #include "vulkan/shaders/vk_shader.h"
 #include "vulkan/pipelines/vk_renderpass.h"
-#include "vk_streambuffer.h"
 
 #include "name.h"