diff --git a/docs/Compute.md b/docs/Compute.md
index a7928d3..d4f82e6 100644
--- a/docs/Compute.md
+++ b/docs/Compute.md
@@ -202,7 +202,7 @@ Benefits:
 - Integrated barrier management with other passes.
 - Per-frame synchronization tracking.
 
-Reference: `src/render/vk_renderpass_background.cpp`.
+Reference: `src/render/passes/background.cpp`.
 
 ### Synchronization
 
@@ -279,9 +279,9 @@ src/core/
 └── vk_resource.h/cpp           # immediate_submit() for GPU-blocking
 
 src/render/
-├── vk_renderpass_background.cpp  # Example: gradient/sky compute passes
-├── rg_types.h                    # RGPassType::Compute, RGImageUsage::ComputeWrite
-└── rg_graph.h                    # Render graph integration
+├── passes/background.cpp         # Example: gradient/sky compute passes
+├── graph/types.h                 # RGPassType::Compute, RGImageUsage::ComputeWrite
+└── graph/graph.h                 # Render graph integration
 
 shaders/
 ├── gradient_color.comp     # Example: gradient background
diff --git a/docs/RenderGraph.md b/docs/RenderGraph.md
index 70bf6cf..9362a3b 100644
--- a/docs/RenderGraph.md
+++ b/docs/RenderGraph.md
@@ -21,15 +21,15 @@ Lightweight render graph that builds a per‑frame DAG from pass declarations, c
 - `RenderGraph::add_pass(name, RGPassType type, BuildCallback build, RecordCallback record)`
   - Declare image/buffer accesses and attachments inside `build` using `RGPassBuilder`.
   - Do your actual rendering/copies in `record` using resolved Vulkan objects from `RGPassResources`.
-  - See: `src/render/rg_graph.h:36`, `src/render/rg_graph.cpp:51`.
+  - See: `src/render/graph/graph.h:36`, `src/render/graph/graph.cpp:51`.
 
-- `RenderGraph::compile()` → builds ordering and per‑pass `Vk*MemoryBarrier2` lists. See `src/render/rg_graph.cpp:83`.
+- `RenderGraph::compile()` → builds ordering and per‑pass `Vk*MemoryBarrier2` lists. See `src/render/graph/graph.cpp:83`.
 
-- `RenderGraph::execute(cmd)` → emits barriers and dynamic rendering begin/end. See `src/render/rg_graph.cpp:592`.
+- `RenderGraph::execute(cmd)` → emits barriers and dynamic rendering begin/end. See `src/render/graph/graph.cpp:592`.
 
-- Import helpers for engine images: `import_draw_image()`, `import_depth_image()`, `import_gbuffer_*()`, `import_swapchain_image(index)`. See `src/render/rg_graph.cpp:740`.
+- Import helpers for engine images: `import_draw_image()`, `import_depth_image()`, `import_gbuffer_*()`, `import_swapchain_image(index)`. See `src/render/graph/graph.cpp:740`.
 
-- Present chain: `add_present_chain(draw, swapchain, appendExtra)` inserts Copy→Present passes and lets you inject extra passes (e.g., ImGui) in between. See `src/render/rg_graph.cpp:705`.
+- Present chain: `add_present_chain(draw, swapchain, appendExtra)` inserts Copy→Present passes and lets you inject extra passes (e.g., ImGui) in between. See `src/render/graph/graph.cpp:705`.
 
 ### Declaring a Pass
 
@@ -75,14 +75,14 @@ void MyPass::register_graph(RenderGraph* graph,
   - `read_buffer(RGBufferHandle, RGBufferUsage)` / `write_buffer(RGBufferHandle, RGBufferUsage)`.
   - Convenience import: `read_buffer(VkBuffer, RGBufferUsage, size, name)` and `write_buffer(VkBuffer, ...)` dedup by raw handle.
 
-See `src/render/rg_builder.h:39` and impl in `src/render/rg_builder.cpp:20`.
+See `src/render/graph/builder.h:39` and impl in `src/render/graph/builder.cpp:20`.
 
 ### Resource Model (`RGResourceRegistry`)
 
 - Imported vs transient resources are tracked uniformly with lifetime indices (`firstUse/lastUse`).
 - Imports are deduplicated by `VkImage`/`VkBuffer` and keep initial layout/stage/access as the starting state.
 - Transients are created via `ResourceManager` and auto‑destroyed at end of frame using the frame deletion queue.
-- See `src/render/rg_resources.h:11` and `src/render/rg_resources.cpp:1`.
+- See `src/render/graph/resources.h:11` and `src/render/graph/resources.cpp:1`.
 
 ### Synchronization and Layouts
 
diff --git a/docs/Scene.md b/docs/Scene.md
index 4113583..9026098 100644
--- a/docs/Scene.md
+++ b/docs/Scene.md
@@ -28,9 +28,9 @@ Thin scene layer that produces `RenderObject`s for the renderer. It gathers opaq
 
 ### Sorting / Culling
 
-- Opaque (geometry): stable sort by `material` then `indexBuffer` (see `src/render/vk_renderpass_geometry.cpp`).
-- Transparent: sort by camera‑space depth far→near (see `src/render/vk_renderpass_transparent.cpp`).
-- An example frustum test exists in `vk_renderpass_geometry.cpp` (`is_visible`) and can be enabled to cull meshes.
+- Opaque (geometry): stable sort by `material` then `indexBuffer` (see `src/render/passes/geometry.cpp`).
+- Transparent: sort by camera‑space depth far→near (see `src/render/passes/transparent.cpp`).
+- An example frustum test exists in `passes/geometry.cpp` (`is_visible`) and can be enabled to cull meshes.
 
 ### Dynamic Instances
 
diff --git a/docs/TextureLoading.md b/docs/TextureLoading.md
index 37cb65d..97255bd 100644
--- a/docs/TextureLoading.md
+++ b/docs/TextureLoading.md
@@ -7,7 +7,7 @@ Overview
   - Materials: layouts use `UPDATE_AFTER_BIND`; descriptors can be rewritten after bind.
   - glTF loader: `src/scene/vk_loader.cpp` builds keys, requests handles, and registers descriptor patches with the cache.
   - Primitives/adhoc: `src/core/asset_manager.cpp` builds materials and registers texture watches.
-  - Visibility: `src/render/vk_renderpass_geometry.cpp` and `src/render/vk_renderpass_transparent.cpp` call `TextureCache::markSetUsed(...)` for sets that are actually drawn.
+  - Visibility: `src/render/passes/geometry.cpp` and `src/render/passes/transparent.cpp` call `TextureCache::markSetUsed(...)` for sets that are actually drawn.
 - IBL: high‑dynamic‑range environment textures are typically loaded directly as `.ktx2` via `IBLManager` instead of the generic streaming cache. See “Image‑Based Lighting (IBL)” below.
 
 Data Flow
@@ -114,6 +114,6 @@ Image‑Based Lighting (IBL) Textures
     - binding 1: `COMBINED_IMAGE_SAMPLER` — BRDF LUT 2D.
     - binding 2: `UNIFORM_BUFFER` — SH coefficients (`vec4 sh[9]`, RGB in `.xyz`).
   - Render passes that use IBL fetch this layout from `EngineContext::ibl` and allocate per‑frame sets:
-    - `vk_renderpass_lighting.cpp`: deferred lighting (set=3).
-    - `vk_renderpass_transparent.cpp`: forward/transparent PBR materials (set=3).
-    - `vk_renderpass_background.cpp`: environment background (set=3; only binding 0 is used in the shader).
+    - `passes/lighting.cpp`: deferred lighting (set=3).
+    - `passes/transparent.cpp`: forward/transparent PBR materials (set=3).
+    - `passes/background.cpp`: environment background (set=3; only binding 0 is used in the shader).
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a23dfec..29e8060 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,35 +45,36 @@ add_executable (vulkan_engine
   core/ibl_manager.h
   core/ibl_manager.cpp
   # render
-  render/vk_pipelines.h
-  render/vk_pipelines.cpp
-  render/vk_renderpass.h
-  render/vk_renderpass.cpp
-  render/vk_renderpass_background.h
-  render/vk_renderpass_background.cpp
-  render/vk_renderpass_geometry.h
-  render/vk_renderpass_geometry.cpp
-  render/vk_renderpass_lighting.h
-  render/vk_renderpass_lighting.cpp
-  render/vk_renderpass_shadow.h
-  render/vk_renderpass_shadow.cpp
-  render/vk_renderpass_transparent.h
-  render/vk_renderpass_transparent.cpp
-  render/vk_renderpass_imgui.h
-  render/vk_renderpass_imgui.cpp
-  render/vk_renderpass_tonemap.h
-  render/vk_renderpass_tonemap.cpp
-  # render graph (initial skeleton)
-  render/rg_types.h
-  render/rg_graph.h
-  render/rg_graph.cpp
-  render/rg_builder.h
-  render/rg_builder.cpp
-  render/rg_resources.h
-  render/rg_resources.cpp
-  render/vk_materials.h
-  render/vk_materials.cpp
+  render/pipelines.h
+  render/pipelines.cpp
+  render/renderpass.h
+  render/renderpass.cpp
+  render/materials.h
+  render/materials.cpp
   render/primitives.h
+  # render passes
+  render/passes/background.h
+  render/passes/background.cpp
+  render/passes/geometry.h
+  render/passes/geometry.cpp
+  render/passes/lighting.h
+  render/passes/lighting.cpp
+  render/passes/shadow.h
+  render/passes/shadow.cpp
+  render/passes/transparent.h
+  render/passes/transparent.cpp
+  render/passes/imgui_pass.h
+  render/passes/imgui_pass.cpp
+  render/passes/tonemap.h
+  render/passes/tonemap.cpp
+  # render graph
+  render/graph/types.h
+  render/graph/graph.h
+  render/graph/graph.cpp
+  render/graph/builder.h
+  render/graph/builder.cpp
+  render/graph/resources.h
+  render/graph/resources.cpp
   # scene
   scene/vk_scene.h
   scene/vk_scene.cpp
@@ -93,10 +94,12 @@ add_executable (vulkan_engine
 
 set_property(TARGET vulkan_engine PROPERTY CXX_STANDARD 20)
 target_compile_definitions(vulkan_engine PUBLIC GLM_FORCE_DEPTH_ZERO_TO_ONE)
-target_include_directories(vulkan_engine PUBLIC 
+target_include_directories(vulkan_engine PUBLIC
   "${CMAKE_CURRENT_SOURCE_DIR}"
   "${CMAKE_CURRENT_SOURCE_DIR}/core"
   "${CMAKE_CURRENT_SOURCE_DIR}/render"
+  "${CMAKE_CURRENT_SOURCE_DIR}/render/passes"
+  "${CMAKE_CURRENT_SOURCE_DIR}/render/graph"
   "${CMAKE_CURRENT_SOURCE_DIR}/scene"
   "${CMAKE_CURRENT_SOURCE_DIR}/compute"
 )
diff --git a/src/compute/vk_compute.cpp b/src/compute/vk_compute.cpp
index 8e4d118..d9f9508 100644
--- a/src/compute/vk_compute.cpp
+++ b/src/compute/vk_compute.cpp
@@ -1,6 +1,6 @@
 #include <compute/vk_compute.h>
 #include <core/engine_context.h>
-#include <render/vk_pipelines.h>
+#include <render/pipelines.h>
 #include <core/vk_initializers.h>
 #include <iostream>
 
diff --git a/src/core/asset_manager.cpp b/src/core/asset_manager.cpp
index ac177f6..ca38413 100644
--- a/src/core/asset_manager.cpp
+++ b/src/core/asset_manager.cpp
@@ -5,7 +5,7 @@
 
 #include <core/vk_engine.h>
 #include <core/vk_resource.h>
-#include <render/vk_materials.h>
+#include <render/materials.h>
 #include <render/primitives.h>
 #include <scene/tangent_space.h>
 #include <scene/mesh_bvh.h>
diff --git a/src/core/asset_manager.h b/src/core/asset_manager.h
index d6c2b73..a1f39d2 100644
--- a/src/core/asset_manager.h
+++ b/src/core/asset_manager.h
@@ -12,7 +12,7 @@
 #include <scene/vk_loader.h>
 #include <core/vk_types.h>
 
-#include "vk_materials.h"
+#include "materials.h"
 #include "asset_locator.h"
 
 class VulkanEngine;
diff --git a/src/core/vk_engine.cpp b/src/core/vk_engine.cpp
index 325230a..78c36ad 100644
--- a/src/core/vk_engine.cpp
+++ b/src/core/vk_engine.cpp
@@ -37,12 +37,12 @@
 #include "imgui.h"
 #include "imgui_impl_sdl2.h"
 #include "imgui_impl_vulkan.h"
-#include "render/vk_renderpass_geometry.h"
-#include "render/vk_renderpass_imgui.h"
-#include "render/vk_renderpass_lighting.h"
-#include "render/vk_renderpass_transparent.h"
-#include "render/vk_renderpass_tonemap.h"
-#include "render/vk_renderpass_shadow.h"
+#include "render/passes/geometry.h"
+#include "render/passes/imgui_pass.h"
+#include "render/passes/lighting.h"
+#include "render/passes/transparent.h"
+#include "render/passes/tonemap.h"
+#include "render/passes/shadow.h"
 #include "vk_resource.h"
 #include "engine_context.h"
 #include "core/vk_pipeline_manager.h"
diff --git a/src/core/vk_engine.h b/src/core/vk_engine.h
index bf17f4b..6d3ca3b 100644
--- a/src/core/vk_engine.h
+++ b/src/core/vk_engine.h
@@ -16,12 +16,12 @@
 #include <scene/camera.h>
 
 #include "vk_device.h"
-#include "render/vk_renderpass.h"
-#include "render/vk_renderpass_background.h"
+#include "render/renderpass.h"
+#include "render/passes/background.h"
 #include "vk_resource.h"
 #include "vk_swapchain.h"
 #include "scene/vk_scene.h"
-#include "render/vk_materials.h"
+#include "render/materials.h"
 
 #include "frame_resources.h"
 #include "vk_descriptor_manager.h"
@@ -29,7 +29,7 @@
 #include "core/engine_context.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 #include "core/vk_raytracing.h"
 #include "core/texture_cache.h"
 #include "core/ibl_manager.h"
diff --git a/src/core/vk_engine_ui.cpp b/src/core/vk_engine_ui.cpp
index c326f7d..8ad0a54 100644
--- a/src/core/vk_engine_ui.cpp
+++ b/src/core/vk_engine_ui.cpp
@@ -11,11 +11,11 @@
 
 #include "render/primitives.h"
 #include "vk_mem_alloc.h"
-#include "render/vk_renderpass_tonemap.h"
-#include "render/vk_renderpass_background.h"
+#include "render/passes/tonemap.h"
+#include "render/passes/background.h"
 #include <glm/gtx/euler_angles.hpp>
 #include <glm/gtc/matrix_transform.hpp>
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/texture_cache.h"
 #include "core/ibl_manager.h"
diff --git a/src/core/vk_pipeline_manager.cpp b/src/core/vk_pipeline_manager.cpp
index b0d4d9a..1e06b2a 100644
--- a/src/core/vk_pipeline_manager.cpp
+++ b/src/core/vk_pipeline_manager.cpp
@@ -3,7 +3,7 @@
 #include <core/engine_context.h>
 #include <core/vk_initializers.h>
 
-#include <render/vk_pipelines.h>
+#include <render/pipelines.h>
 #include <vk_device.h>
 
 #include <filesystem>
diff --git a/src/core/vk_pipeline_manager.h b/src/core/vk_pipeline_manager.h
index cca2dcf..83b4dc7 100644
--- a/src/core/vk_pipeline_manager.h
+++ b/src/core/vk_pipeline_manager.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <core/vk_types.h>
-#include <render/vk_pipelines.h>
+#include <render/pipelines.h>
 #include <compute/vk_compute.h>
 
 #include <functional>
diff --git a/src/core/vk_resource.cpp b/src/core/vk_resource.cpp
index 9ada319..5ee002b 100644
--- a/src/core/vk_resource.cpp
+++ b/src/core/vk_resource.cpp
@@ -4,9 +4,9 @@
 #include "vk_initializers.h"
 
 #include "vk_mem_alloc.h"
-#include <render/rg_graph.h>
-#include <render/rg_builder.h>
-#include <render/rg_resources.h>
+#include <render/graph/graph.h>
+#include <render/graph/builder.h>
+#include <render/graph/resources.h>
 
 #include "frame_resources.h"
 
diff --git a/src/render/rg_builder.cpp b/src/render/graph/builder.cpp
similarity index 97%
rename from src/render/rg_builder.cpp
rename to src/render/graph/builder.cpp
index c0e1a61..ac67fcb 100644
--- a/src/render/rg_builder.cpp
+++ b/src/render/graph/builder.cpp
@@ -1,5 +1,5 @@
-#include <render/rg_builder.h>
-#include <render/rg_resources.h>
+#include "builder.h"
+#include "resources.h"
 
 // ---- RGPassResources ----
 VkImage RGPassResources::image(RGImageHandle h) const
diff --git a/src/render/rg_builder.h b/src/render/graph/builder.h
similarity index 98%
rename from src/render/rg_builder.h
rename to src/render/graph/builder.h
index 8e18fb1..2acb936 100644
--- a/src/render/rg_builder.h
+++ b/src/render/graph/builder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <render/rg_types.h>
+#include <render/graph/types.h>
 #include <vector>
 
 class RGResourceRegistry;
diff --git a/src/render/rg_graph.cpp b/src/render/graph/graph.cpp
similarity index 99%
rename from src/render/rg_graph.cpp
rename to src/render/graph/graph.cpp
index 62f89e1..32d3766 100644
--- a/src/render/rg_graph.cpp
+++ b/src/render/graph/graph.cpp
@@ -1,4 +1,4 @@
-#include <render/rg_graph.h>
+#include "graph.h"
 #include <core/engine_context.h>
 #include <core/vk_images.h>
 #include <core/vk_initializers.h>
diff --git a/src/render/rg_graph.h b/src/render/graph/graph.h
similarity index 98%
rename from src/render/rg_graph.h
rename to src/render/graph/graph.h
index d57e3ab..1fb0a06 100644
--- a/src/render/rg_graph.h
+++ b/src/render/graph/graph.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <core/vk_types.h>
-#include <render/rg_types.h>
-#include <render/rg_resources.h>
-#include <render/rg_builder.h>
+#include <render/graph/types.h>
+#include <render/graph/resources.h>
+#include <render/graph/builder.h>
 
 #include <functional>
 #include <string>
diff --git a/src/render/rg_resources.cpp b/src/render/graph/resources.cpp
similarity index 99%
rename from src/render/rg_resources.cpp
rename to src/render/graph/resources.cpp
index d432642..e4bff14 100644
--- a/src/render/rg_resources.cpp
+++ b/src/render/graph/resources.cpp
@@ -1,4 +1,4 @@
-#include <render/rg_resources.h>
+#include "resources.h"
 #include <core/engine_context.h>
 #include <core/vk_resource.h>
 #include <vk_mem_alloc.h>
diff --git a/src/render/rg_resources.h b/src/render/graph/resources.h
similarity index 98%
rename from src/render/rg_resources.h
rename to src/render/graph/resources.h
index 61d4389..de3a65a 100644
--- a/src/render/rg_resources.h
+++ b/src/render/graph/resources.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <core/vk_types.h>
-#include <render/rg_types.h>
+#include <render/graph/types.h>
 #include <string>
 #include <vector>
 #include <unordered_map>
diff --git a/src/render/rg_types.h b/src/render/graph/types.h
similarity index 100%
rename from src/render/rg_types.h
rename to src/render/graph/types.h
diff --git a/src/render/vk_materials.cpp b/src/render/materials.cpp
similarity index 99%
rename from src/render/vk_materials.cpp
rename to src/render/materials.cpp
index 42a3164..3db2bf9 100644
--- a/src/render/vk_materials.cpp
+++ b/src/render/materials.cpp
@@ -1,7 +1,7 @@
-#include "vk_materials.h"
+#include "materials.h"
 
 #include "core/vk_engine.h"
-#include "render/vk_pipelines.h"
+#include "render/pipelines.h"
 #include "core/vk_initializers.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
diff --git a/src/render/vk_materials.h b/src/render/materials.h
similarity index 100%
rename from src/render/vk_materials.h
rename to src/render/materials.h
diff --git a/src/render/vk_renderpass_background.cpp b/src/render/passes/background.cpp
similarity index 99%
rename from src/render/vk_renderpass_background.cpp
rename to src/render/passes/background.cpp
index eab8abf..b600051 100644
--- a/src/render/vk_renderpass_background.cpp
+++ b/src/render/passes/background.cpp
@@ -1,4 +1,4 @@
-#include "vk_renderpass_background.h"
+#include "background.h"
 #include <string_view>
 
 #include "vk_swapchain.h"
@@ -6,7 +6,7 @@
 #include "core/vk_resource.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 #include <cstring>
 
 #include "frame_resources.h"
diff --git a/src/render/vk_renderpass_background.h b/src/render/passes/background.h
similarity index 94%
rename from src/render/vk_renderpass_background.h
rename to src/render/passes/background.h
index 10e7aa6..a926c0e 100644
--- a/src/render/vk_renderpass_background.h
+++ b/src/render/passes/background.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "vk_renderpass.h"
+#include "render/renderpass.h"
 #include "compute/vk_compute.h"
-#include "render/rg_types.h"
+#include "render/graph/types.h"
 
 class RenderGraph;
 
diff --git a/src/render/vk_renderpass_geometry.cpp b/src/render/passes/geometry.cpp
similarity index 99%
rename from src/render/vk_renderpass_geometry.cpp
rename to src/render/passes/geometry.cpp
index b4aa85f..6dd929d 100644
--- a/src/render/vk_renderpass_geometry.cpp
+++ b/src/render/passes/geometry.cpp
@@ -1,4 +1,4 @@
-#include "vk_renderpass_geometry.h"
+#include "geometry.h"
 
 #include <chrono>
 #include <unordered_set>
@@ -14,7 +14,7 @@
 #include "vk_mem_alloc.h"
 #include "vk_scene.h"
 #include "vk_swapchain.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 
 // Basic conservative frustum test against RenderObject AABB.
 // Clip space uses Vulkan Z0 (0..w). Returns true if any part of the box is inside.
diff --git a/src/render/vk_renderpass_geometry.h b/src/render/passes/geometry.h
similarity index 94%
rename from src/render/vk_renderpass_geometry.h
rename to src/render/passes/geometry.h
index 5b6933a..c5e0b23 100644
--- a/src/render/vk_renderpass_geometry.h
+++ b/src/render/passes/geometry.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "vk_renderpass.h"
-#include <render/rg_types.h>
+#include "render/renderpass.h"
+#include <render/graph/types.h>
 
 class SwapchainManager;
 class RenderGraph;
diff --git a/src/render/vk_renderpass_imgui.cpp b/src/render/passes/imgui_pass.cpp
similarity index 98%
rename from src/render/vk_renderpass_imgui.cpp
rename to src/render/passes/imgui_pass.cpp
index 39f4828..cb3a2e1 100644
--- a/src/render/vk_renderpass_imgui.cpp
+++ b/src/render/passes/imgui_pass.cpp
@@ -1,4 +1,4 @@
-#include "vk_renderpass_imgui.h"
+#include "imgui_pass.h"
 
 #include "imgui.h"
 #include "imgui_impl_sdl2.h"
@@ -7,7 +7,7 @@
 #include "vk_swapchain.h"
 #include "core/vk_initializers.h"
 #include "core/engine_context.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 
 void ImGuiPass::init(EngineContext *context)
 {
diff --git a/src/render/vk_renderpass_imgui.h b/src/render/passes/imgui_pass.h
similarity index 91%
rename from src/render/vk_renderpass_imgui.h
rename to src/render/passes/imgui_pass.h
index 48b4a74..921ce43 100644
--- a/src/render/vk_renderpass_imgui.h
+++ b/src/render/passes/imgui_pass.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "vk_renderpass.h"
+#include "render/renderpass.h"
 #include "core/vk_types.h"
-#include <render/rg_types.h>
+#include <render/graph/types.h>
 
 class ImGuiPass : public IRenderPass
 {
diff --git a/src/render/vk_renderpass_lighting.cpp b/src/render/passes/lighting.cpp
similarity index 99%
rename from src/render/vk_renderpass_lighting.cpp
rename to src/render/passes/lighting.cpp
index 07faa03..017dbd9 100644
--- a/src/render/vk_renderpass_lighting.cpp
+++ b/src/render/passes/lighting.cpp
@@ -1,4 +1,4 @@
-#include "vk_renderpass_lighting.h"
+#include "lighting.h"
 
 #include "frame_resources.h"
 #include "vk_descriptor_manager.h"
@@ -6,7 +6,7 @@
 #include "core/engine_context.h"
 #include "core/vk_initializers.h"
 #include "core/vk_resource.h"
-#include "render/vk_pipelines.h"
+#include "render/pipelines.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
 #include "core/vk_descriptors.h"
@@ -15,7 +15,7 @@
 #include "vk_mem_alloc.h"
 #include "vk_sampler_manager.h"
 #include "vk_swapchain.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 #include <array>
 #include <cstring>
 
diff --git a/src/render/vk_renderpass_lighting.h b/src/render/passes/lighting.h
similarity index 96%
rename from src/render/vk_renderpass_lighting.h
rename to src/render/passes/lighting.h
index c944114..aa6cf7e 100644
--- a/src/render/vk_renderpass_lighting.h
+++ b/src/render/passes/lighting.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "vk_renderpass.h"
-#include <render/rg_types.h>
+#include "render/renderpass.h"
+#include <render/graph/types.h>
 #include <span>
 
 class LightingPass : public IRenderPass
diff --git a/src/render/vk_renderpass_shadow.cpp b/src/render/passes/shadow.cpp
similarity index 98%
rename from src/render/vk_renderpass_shadow.cpp
rename to src/render/passes/shadow.cpp
index 7b1d86f..7a3c3a0 100644
--- a/src/render/vk_renderpass_shadow.cpp
+++ b/src/render/passes/shadow.cpp
@@ -1,11 +1,11 @@
-#include "vk_renderpass_shadow.h"
+#include "shadow.h"
 
 #include <unordered_set>
 #include <string>
 
 #include "core/engine_context.h"
-#include "render/rg_graph.h"
-#include "render/rg_builder.h"
+#include "render/graph/graph.h"
+#include "render/graph/builder.h"
 #include "vk_swapchain.h"
 #include "vk_scene.h"
 #include "frame_resources.h"
@@ -15,7 +15,7 @@
 #include "core/vk_initializers.h"
 #include "core/vk_pipeline_manager.h"
 #include "core/asset_manager.h"
-#include "render/vk_pipelines.h"
+#include "render/pipelines.h"
 #include "core/vk_types.h"
 #include "core/config.h"
 
diff --git a/src/render/vk_renderpass_shadow.h b/src/render/passes/shadow.h
similarity index 93%
rename from src/render/vk_renderpass_shadow.h
rename to src/render/passes/shadow.h
index 6158921..9ec950e 100644
--- a/src/render/vk_renderpass_shadow.h
+++ b/src/render/passes/shadow.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "vk_renderpass.h"
-#include <render/rg_types.h>
+#include "render/renderpass.h"
+#include <render/graph/types.h>
 #include <span>
 
 class RenderGraph;
diff --git a/src/render/vk_renderpass_tonemap.cpp b/src/render/passes/tonemap.cpp
similarity index 97%
rename from src/render/vk_renderpass_tonemap.cpp
rename to src/render/passes/tonemap.cpp
index acb8c16..000e394 100644
--- a/src/render/vk_renderpass_tonemap.cpp
+++ b/src/render/passes/tonemap.cpp
@@ -1,4 +1,4 @@
-#include "vk_renderpass_tonemap.h"
+#include "tonemap.h"
 
 #include <core/engine_context.h>
 #include <core/vk_descriptors.h>
@@ -8,8 +8,8 @@
 #include <core/vk_device.h>
 #include <core/vk_resource.h>
 #include <vk_sampler_manager.h>
-#include <render/rg_graph.h>
-#include <render/rg_resources.h>
+#include <render/graph/graph.h>
+#include <render/graph/resources.h>
 
 #include "frame_resources.h"
 
diff --git a/src/render/vk_renderpass_tonemap.h b/src/render/passes/tonemap.h
similarity index 95%
rename from src/render/vk_renderpass_tonemap.h
rename to src/render/passes/tonemap.h
index 17fdc4c..e346515 100644
--- a/src/render/vk_renderpass_tonemap.h
+++ b/src/render/passes/tonemap.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <core/vk_types.h>
-#include <render/vk_renderpass.h>
-#include <render/rg_types.h>
+#include <render/renderpass.h>
+#include <render/graph/types.h>
 
 class EngineContext;
 class RenderGraph;
diff --git a/src/render/vk_renderpass_transparent.cpp b/src/render/passes/transparent.cpp
similarity index 99%
rename from src/render/vk_renderpass_transparent.cpp
rename to src/render/passes/transparent.cpp
index 6187776..ec73429 100644
--- a/src/render/vk_renderpass_transparent.cpp
+++ b/src/render/passes/transparent.cpp
@@ -1,4 +1,4 @@
-#include "vk_renderpass_transparent.h"
+#include "transparent.h"
 
 #include <algorithm>
 #include <unordered_set>
@@ -13,7 +13,7 @@
 #include "core/vk_device.h"
 #include "core/vk_descriptor_manager.h"
 #include "core/frame_resources.h"
-#include "render/rg_graph.h"
+#include "render/graph/graph.h"
 
 void TransparentPass::init(EngineContext *context)
 {
diff --git a/src/render/vk_renderpass_transparent.h b/src/render/passes/transparent.h
similarity index 93%
rename from src/render/vk_renderpass_transparent.h
rename to src/render/passes/transparent.h
index 986f36a..fd37701 100644
--- a/src/render/vk_renderpass_transparent.h
+++ b/src/render/passes/transparent.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "vk_renderpass.h"
-#include "render/rg_types.h"
+#include "render/renderpass.h"
+#include "render/graph/types.h"
 
 class TransparentPass : public IRenderPass
 {
diff --git a/src/render/vk_pipelines.cpp b/src/render/pipelines.cpp
similarity index 99%
rename from src/render/vk_pipelines.cpp
rename to src/render/pipelines.cpp
index c59c2e7..9607152 100644
--- a/src/render/vk_pipelines.cpp
+++ b/src/render/pipelines.cpp
@@ -1,4 +1,4 @@
-#include <render/vk_pipelines.h>
+#include "pipelines.h"
 #include <fstream>
 #include <core/vk_initializers.h>
 
diff --git a/src/render/vk_pipelines.h b/src/render/pipelines.h
similarity index 100%
rename from src/render/vk_pipelines.h
rename to src/render/pipelines.h
diff --git a/src/render/vk_renderpass.cpp b/src/render/renderpass.cpp
similarity index 85%
rename from src/render/vk_renderpass.cpp
rename to src/render/renderpass.cpp
index 1e98402..40bbe5c 100644
--- a/src/render/vk_renderpass.cpp
+++ b/src/render/renderpass.cpp
@@ -1,12 +1,12 @@
-#include "vk_renderpass.h"
+#include "renderpass.h"
 
-#include "vk_renderpass_background.h"
-#include "vk_renderpass_geometry.h"
-#include "vk_renderpass_imgui.h"
-#include "vk_renderpass_lighting.h"
-#include "vk_renderpass_transparent.h"
-#include "vk_renderpass_tonemap.h"
-#include "vk_renderpass_shadow.h"
+#include "passes/background.h"
+#include "passes/geometry.h"
+#include "passes/imgui_pass.h"
+#include "passes/lighting.h"
+#include "passes/transparent.h"
+#include "passes/tonemap.h"
+#include "passes/shadow.h"
 
 void RenderPassManager::init(EngineContext *context)
 {
diff --git a/src/render/vk_renderpass.h b/src/render/renderpass.h
similarity index 100%
rename from src/render/vk_renderpass.h
rename to src/render/renderpass.h
diff --git a/src/scene/vk_loader.cpp b/src/scene/vk_loader.cpp
index 210ee67..38a6536 100644
--- a/src/scene/vk_loader.cpp
+++ b/src/scene/vk_loader.cpp
@@ -6,7 +6,7 @@
 #include "core/texture_cache.h"
 
 #include "core/vk_engine.h"
-#include "render/vk_materials.h"
+#include "render/materials.h"
 #include "core/vk_initializers.h"
 #include "core/vk_types.h"
 #include "core/config.h"