diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d6678ec690..c8b5c050aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -647,13 +647,8 @@ file( GLOB HEADER_FILES
 	rendering/polyrenderer/math/*.h
 	rendering/polyrenderer/drawers/*.h
 	rendering/polyrenderer/backend/*.h
-	rendering/hwrenderer/data/*.h
-	rendering/hwrenderer/dynlights/*.h
-	rendering/hwrenderer/models/*.h
-	rendering/hwrenderer/postprocessing/*.h
+	rendering/hwrenderer/*.h
 	rendering/hwrenderer/scene/*.h
-	rendering/hwrenderer/textures/*.h
-	rendering/hwrenderer/utility/*.h
 	rendering/vulkan/*.h
 	rendering/vulkan/system/*.h
 	rendering/vulkan/renderer/*.h
@@ -763,7 +758,7 @@ set( FASTMATH_SOURCES
 	common/textures/hires/xbr/xbrz.cpp
 	common/textures/hires/xbr/xbrz_old.cpp
 	common/rendering/gl_load/gl_load.c
-	rendering/hwrenderer/dynlights/hw_dynlightdata.cpp
+	rendering/hwrenderer/hw_dynlightdata.cpp
 	rendering/hwrenderer/scene/hw_bsp.cpp
 	rendering/hwrenderer/scene/hw_fakeflat.cpp
 	rendering/hwrenderer/scene/hw_decal.cpp
@@ -783,7 +778,7 @@ set( FASTMATH_SOURCES
 	common/utility/matrix.cpp
 )
 	
-#Vulkan stuff must go into a separate list later because it needs to be disabled for some platforms
+#Vulkan stuff must go into a separate list because it needs to be disabled for some platforms
 set (VULKAN_SOURCES
 	rendering/vulkan/system/vk_device.cpp
 	rendering/vulkan/system/vk_swapchain.cpp
@@ -933,15 +928,15 @@ set (PCH_SOURCES
 	rendering/2d/f_wipe.cpp
 	rendering/2d/v_blend.cpp
 	rendering/hwrenderer/hw_entrypoint.cpp
-	rendering/hwrenderer/data/hw_vertexbuilder.cpp
-	rendering/hwrenderer/dynlights/doom_aabbtree.cpp
-	rendering/hwrenderer/models/hw_models.cpp
+	rendering/hwrenderer/hw_vertexbuilder.cpp
+	rendering/hwrenderer/doom_aabbtree.cpp
+	rendering/hwrenderer/hw_models.cpp
+	rendering/hwrenderer/hw_postprocessshader.cpp
+	rendering/hwrenderer/hw_precache.cpp
+	rendering/hwrenderer/hw_draw2d.cpp
+	rendering/hwrenderer/scene/hw_lighting.cpp
 	rendering/hwrenderer/scene/hw_drawlistadd.cpp
-	rendering/hwrenderer/scene/hw_renderstate.cpp
-	rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp
-	rendering/hwrenderer/textures/hw_precache.cpp
-	rendering/hwrenderer/utility/hw_draw2d.cpp
-	rendering/hwrenderer/utility/hw_lighting.cpp
+	rendering/hwrenderer/scene/hw_setcolor.cpp
 	maploader/edata.cpp
 	maploader/specials.cpp
 	maploader/maploader.cpp
@@ -1273,6 +1268,7 @@ include_directories( .
 	gamedata/textures
 	gamedata/fonts
 	rendering
+	rendering/hwrenderer
 	rendering/2d
 	r_data
 	sound
@@ -1400,16 +1396,7 @@ source_group("Playsim\\Map Thinkers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE
 source_group("Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/.+")
 source_group("Rendering\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/2d/.+")
 source_group("Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/.+")
-source_group("Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/data/.+")
-source_group("Rendering\\Hardware Renderer\\Dynamic Lights" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/dynlights/.+")
-source_group("Rendering\\Hardware Renderer\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/models/.+")
-source_group("Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/postprocessing/.+")
-source_group("Rendering\\Hardware Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/renderer/.+")
 source_group("Rendering\\Hardware Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/scene/.+")
-source_group("Rendering\\Hardware Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/shaders/.+")
-source_group("Rendering\\Hardware Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/system/.+")
-source_group("Rendering\\Hardware Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/textures/.+")
-source_group("Rendering\\Hardware Renderer\\Utilities" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/hwrenderer/utility/.+")
 source_group("Rendering\\Vulkan Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/system/.+")
 source_group("Rendering\\Vulkan Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/renderer/.+")
 source_group("Rendering\\Vulkan Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/shaders/.+")
diff --git a/src/common/rendering/gl/gl_framebuffer.cpp b/src/common/rendering/gl/gl_framebuffer.cpp
index 26d1cc58c1..5487db3bc2 100644
--- a/src/common/rendering/gl/gl_framebuffer.cpp
+++ b/src/common/rendering/gl/gl_framebuffer.cpp
@@ -46,10 +46,8 @@
 #include "gl_samplers.h"
 #include "hw_clock.h"
 #include "hw_vrmodes.h"
-#include "hwrenderer/models/hw_models.h"
 #include "hw_skydome.h"
-#include "hwrenderer/scene/hw_fakeflat.h"
-#include "hwrenderer/data/hw_viewpointbuffer.h"
+#include "hw_viewpointbuffer.h"
 #include "hw_lightbuffer.h"
 #include "gl_shaderprogram.h"
 #include "gl_debug.h"
diff --git a/src/g_levellocals.h b/src/g_levellocals.h
index 576cdd6060..40dc85c203 100644
--- a/src/g_levellocals.h
+++ b/src/g_levellocals.h
@@ -54,7 +54,7 @@
 #include "r_data/r_sections.h"
 #include "r_data/r_canvastexture.h"
 #include "r_data/r_interpolate.h"
-#include "hwrenderer/dynlights/doom_aabbtree.h"
+#include "doom_aabbtree.h"
 
 //============================================================================
 //
diff --git a/src/maploader/maploader.cpp b/src/maploader/maploader.cpp
index bf560e1ac9..2342455569 100644
--- a/src/maploader/maploader.cpp
+++ b/src/maploader/maploader.cpp
@@ -81,7 +81,7 @@
 #include "xlat/xlat.h"
 #include "vm.h"
 #include "texturemanager.h"
-#include "hwrenderer/data/hw_vertexbuilder.h"
+#include "hw_vertexbuilder.h"
 
 enum
 {
diff --git a/src/rendering/hwrenderer/dynlights/doom_aabbtree.cpp b/src/rendering/hwrenderer/doom_aabbtree.cpp
similarity index 100%
rename from src/rendering/hwrenderer/dynlights/doom_aabbtree.cpp
rename to src/rendering/hwrenderer/doom_aabbtree.cpp
diff --git a/src/rendering/hwrenderer/dynlights/doom_aabbtree.h b/src/rendering/hwrenderer/doom_aabbtree.h
similarity index 100%
rename from src/rendering/hwrenderer/dynlights/doom_aabbtree.h
rename to src/rendering/hwrenderer/doom_aabbtree.h
diff --git a/src/rendering/hwrenderer/utility/hw_draw2d.cpp b/src/rendering/hwrenderer/hw_draw2d.cpp
similarity index 100%
rename from src/rendering/hwrenderer/utility/hw_draw2d.cpp
rename to src/rendering/hwrenderer/hw_draw2d.cpp
diff --git a/src/rendering/hwrenderer/dynlights/hw_dynlightdata.cpp b/src/rendering/hwrenderer/hw_dynlightdata.cpp
similarity index 100%
rename from src/rendering/hwrenderer/dynlights/hw_dynlightdata.cpp
rename to src/rendering/hwrenderer/hw_dynlightdata.cpp
diff --git a/src/rendering/hwrenderer/models/hw_models.cpp b/src/rendering/hwrenderer/hw_models.cpp
similarity index 100%
rename from src/rendering/hwrenderer/models/hw_models.cpp
rename to src/rendering/hwrenderer/hw_models.cpp
diff --git a/src/rendering/hwrenderer/models/hw_models.h b/src/rendering/hwrenderer/hw_models.h
similarity index 100%
rename from src/rendering/hwrenderer/models/hw_models.h
rename to src/rendering/hwrenderer/hw_models.h
diff --git a/src/rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp b/src/rendering/hwrenderer/hw_postprocessshader.cpp
similarity index 100%
rename from src/rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp
rename to src/rendering/hwrenderer/hw_postprocessshader.cpp
diff --git a/src/rendering/hwrenderer/textures/hw_precache.cpp b/src/rendering/hwrenderer/hw_precache.cpp
similarity index 99%
rename from src/rendering/hwrenderer/textures/hw_precache.cpp
rename to src/rendering/hwrenderer/hw_precache.cpp
index 1260ae77b5..ca5f37f727 100644
--- a/src/rendering/hwrenderer/textures/hw_precache.cpp
+++ b/src/rendering/hwrenderer/hw_precache.cpp
@@ -38,7 +38,7 @@
 #include "v_font.h"
 #include "texturemanager.h"
 #include "modelrenderer.h"
-#include "hwrenderer/models/hw_models.h"
+#include "hw_models.h"
 #include "d_main.h"
 
 EXTERN_CVAR(Bool, gl_precache)
diff --git a/src/rendering/hwrenderer/data/hw_vertexbuilder.cpp b/src/rendering/hwrenderer/hw_vertexbuilder.cpp
similarity index 100%
rename from src/rendering/hwrenderer/data/hw_vertexbuilder.cpp
rename to src/rendering/hwrenderer/hw_vertexbuilder.cpp
diff --git a/src/rendering/hwrenderer/data/hw_vertexbuilder.h b/src/rendering/hwrenderer/hw_vertexbuilder.h
similarity index 100%
rename from src/rendering/hwrenderer/data/hw_vertexbuilder.h
rename to src/rendering/hwrenderer/hw_vertexbuilder.h
diff --git a/src/rendering/hwrenderer/scene/hw_bsp.cpp b/src/rendering/hwrenderer/scene/hw_bsp.cpp
index a2b79eecdc..7006e0592f 100644
--- a/src/rendering/hwrenderer/scene/hw_bsp.cpp
+++ b/src/rendering/hwrenderer/scene/hw_bsp.cpp
@@ -41,7 +41,7 @@
 #include "hwrenderer/scene/hw_portal.h"
 #include "hw_clock.h"
 #include "flatvertices.h"
-#include "hwrenderer/data/hw_vertexbuilder.h"
+#include "hw_vertexbuilder.h"
 
 #ifdef ARCH_IA32
 #include <immintrin.h>
diff --git a/src/rendering/hwrenderer/scene/hw_decal.cpp b/src/rendering/hwrenderer/scene/hw_decal.cpp
index 6dae20c569..88c78ceda5 100644
--- a/src/rendering/hwrenderer/scene/hw_decal.cpp
+++ b/src/rendering/hwrenderer/scene/hw_decal.cpp
@@ -33,7 +33,7 @@
 #include "hw_cvars.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
-#include "hwrenderer/utility/hw_lighting.h"
+#include "hw_lighting.h"
 #include "hw_clock.h"
 #include "flatvertices.h"
 #include "hw_renderstate.h"
diff --git a/src/rendering/hwrenderer/scene/hw_flats.cpp b/src/rendering/hwrenderer/scene/hw_flats.cpp
index dfc73b55c5..77ad936494 100644
--- a/src/rendering/hwrenderer/scene/hw_flats.cpp
+++ b/src/rendering/hwrenderer/scene/hw_flats.cpp
@@ -39,7 +39,7 @@
 #include "hw_dynlightdata.h"
 #include "hw_cvars.h"
 #include "hw_clock.h"
-#include "hwrenderer/utility/hw_lighting.h"
+#include "hw_lighting.h"
 #include "hw_material.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "flatvertices.h"
diff --git a/src/rendering/hwrenderer/utility/hw_lighting.cpp b/src/rendering/hwrenderer/scene/hw_lighting.cpp
similarity index 100%
rename from src/rendering/hwrenderer/utility/hw_lighting.cpp
rename to src/rendering/hwrenderer/scene/hw_lighting.cpp
diff --git a/src/rendering/hwrenderer/utility/hw_lighting.h b/src/rendering/hwrenderer/scene/hw_lighting.h
similarity index 100%
rename from src/rendering/hwrenderer/utility/hw_lighting.h
rename to src/rendering/hwrenderer/scene/hw_lighting.h
diff --git a/src/rendering/hwrenderer/scene/hw_portal.cpp b/src/rendering/hwrenderer/scene/hw_portal.cpp
index 711e811089..76e49d6d61 100644
--- a/src/rendering/hwrenderer/scene/hw_portal.cpp
+++ b/src/rendering/hwrenderer/scene/hw_portal.cpp
@@ -35,7 +35,7 @@
 #include "hw_renderstate.h"
 #include "flatvertices.h"
 #include "hw_clock.h"
-#include "hwrenderer/utility/hw_lighting.h"
+#include "hw_lighting.h"
 #include "texturemanager.h"
 
 EXTERN_CVAR(Int, r_mirror_recursions)
diff --git a/src/rendering/hwrenderer/scene/hw_renderstate.cpp b/src/rendering/hwrenderer/scene/hw_setcolor.cpp
similarity index 99%
rename from src/rendering/hwrenderer/scene/hw_renderstate.cpp
rename to src/rendering/hwrenderer/scene/hw_setcolor.cpp
index b0d892b615..a81db3a1c6 100644
--- a/src/rendering/hwrenderer/scene/hw_renderstate.cpp
+++ b/src/rendering/hwrenderer/scene/hw_setcolor.cpp
@@ -29,7 +29,7 @@
 #include "hw_renderstate.h"
 #include "hw_drawstructs.h"
 #include "hw_portal.h"
-#include "hwrenderer/utility/hw_lighting.h"
+#include "hw_lighting.h"
 #include "hw_cvars.h"
 
 
diff --git a/src/rendering/hwrenderer/scene/hw_sky.cpp b/src/rendering/hwrenderer/scene/hw_sky.cpp
index 5a0c4f139d..5e4fc02ef8 100644
--- a/src/rendering/hwrenderer/scene/hw_sky.cpp
+++ b/src/rendering/hwrenderer/scene/hw_sky.cpp
@@ -31,7 +31,7 @@
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_portal.h"
-#include "hwrenderer/utility/hw_lighting.h"
+#include "hw_lighting.h"
 #include "hw_material.h"
 
 CVAR(Bool,gl_noskyboxes, false, 0)
diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp
index 5ee5470ef8..3e77ea06db 100644
--- a/src/rendering/hwrenderer/scene/hw_sprites.cpp
+++ b/src/rendering/hwrenderer/scene/hw_sprites.cpp
@@ -44,7 +44,7 @@
 #include "texturemanager.h"
 #include "basics.h"
 
-#include "hwrenderer/models/hw_models.h"
+#include "hw_models.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
@@ -52,7 +52,7 @@
 #include "flatvertices.h"
 #include "hw_cvars.h"
 #include "hw_clock.h"
-#include "hwrenderer/utility/hw_lighting.h"
+#include "hw_lighting.h"
 #include "hw_material.h"
 #include "hw_dynlightdata.h"
 #include "hw_lightbuffer.h"
diff --git a/src/rendering/hwrenderer/scene/hw_walls.cpp b/src/rendering/hwrenderer/scene/hw_walls.cpp
index 93de62a881..4a2d0ab927 100644
--- a/src/rendering/hwrenderer/scene/hw_walls.cpp
+++ b/src/rendering/hwrenderer/scene/hw_walls.cpp
@@ -36,7 +36,7 @@
 #include "hw_material.h"
 #include "hw_cvars.h"
 #include "hw_clock.h"
-#include "hwrenderer/utility/hw_lighting.h"
+#include "hw_lighting.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_portal.h"
diff --git a/src/rendering/hwrenderer/scene/hw_weapon.cpp b/src/rendering/hwrenderer/scene/hw_weapon.cpp
index 49e4728a4f..99702923bf 100644
--- a/src/rendering/hwrenderer/scene/hw_weapon.cpp
+++ b/src/rendering/hwrenderer/scene/hw_weapon.cpp
@@ -36,10 +36,10 @@
 #include "hw_fakeflat.h"
 #include "texturemanager.h"
 
-#include "hwrenderer/models/hw_models.h"
+#include "hw_models.h"
 #include "hw_dynlightdata.h"
 #include "hw_material.h"
-#include "hwrenderer/utility/hw_lighting.h"
+#include "hw_lighting.h"
 #include "hw_cvars.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"
diff --git a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
index d059db3211..4d41fb0da4 100644
--- a/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
+++ b/src/rendering/polyrenderer/backend/poly_framebuffer.cpp
@@ -33,7 +33,7 @@
 #include "hw_clock.h"
 #include "hw_vrmodes.h"
 #include "hw_cvars.h"
-#include "hwrenderer/models/hw_models.h"
+#include "hw_models.h"
 #include "hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
diff --git a/src/rendering/vulkan/system/vk_framebuffer.cpp b/src/rendering/vulkan/system/vk_framebuffer.cpp
index 7eca202c75..b7117175f1 100644
--- a/src/rendering/vulkan/system/vk_framebuffer.cpp
+++ b/src/rendering/vulkan/system/vk_framebuffer.cpp
@@ -36,7 +36,7 @@
 #include "hw_clock.h"
 #include "hw_vrmodes.h"
 #include "hw_cvars.h"
-#include "hwrenderer/models/hw_models.h"
+#include "hw_models.h"
 #include "hw_skydome.h"
 #include "hwrenderer/scene/hw_fakeflat.h"
 #include "hwrenderer/scene/hw_drawinfo.h"