diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 74caa0a7..8902ce4a 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -428,10 +428,10 @@ add_library(XCEngine STATIC
 
     # Rendering
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderContext.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassTypes.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassMetadataUtils.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassLayoutUtils.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassContract.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Builtin/BuiltinPassTypes.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Builtin/BuiltinPassMetadataUtils.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Builtin/BuiltinPassLayoutUtils.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Builtin/BuiltinPassContract.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Execution/CameraRenderer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Execution/SceneRenderer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/FrameData/RenderCameraData.h
diff --git a/engine/include/XCEngine/Rendering/Builtin/BuiltinPassContract.h b/engine/include/XCEngine/Rendering/Builtin/BuiltinPassContract.h
new file mode 100644
index 00000000..242740d5
--- /dev/null
+++ b/engine/include/XCEngine/Rendering/Builtin/BuiltinPassContract.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <XCEngine/Rendering/Builtin/BuiltinPassLayoutUtils.h>
diff --git a/engine/include/XCEngine/Rendering/BuiltinPassLayoutUtils.h b/engine/include/XCEngine/Rendering/Builtin/BuiltinPassLayoutUtils.h
similarity index 99%
rename from engine/include/XCEngine/Rendering/BuiltinPassLayoutUtils.h
rename to engine/include/XCEngine/Rendering/Builtin/BuiltinPassLayoutUtils.h
index 6e870349..93435cb1 100644
--- a/engine/include/XCEngine/Rendering/BuiltinPassLayoutUtils.h
+++ b/engine/include/XCEngine/Rendering/Builtin/BuiltinPassLayoutUtils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <XCEngine/Rendering/BuiltinPassMetadataUtils.h>
+#include <XCEngine/Rendering/Builtin/BuiltinPassMetadataUtils.h>
 
 #include <algorithm>
 
diff --git a/engine/include/XCEngine/Rendering/BuiltinPassMetadataUtils.h b/engine/include/XCEngine/Rendering/Builtin/BuiltinPassMetadataUtils.h
similarity index 99%
rename from engine/include/XCEngine/Rendering/BuiltinPassMetadataUtils.h
rename to engine/include/XCEngine/Rendering/Builtin/BuiltinPassMetadataUtils.h
index 3648baf4..5fb68578 100644
--- a/engine/include/XCEngine/Rendering/BuiltinPassMetadataUtils.h
+++ b/engine/include/XCEngine/Rendering/Builtin/BuiltinPassMetadataUtils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <XCEngine/Rendering/BuiltinPassTypes.h>
+#include <XCEngine/Rendering/Builtin/BuiltinPassTypes.h>
 
 #include <string>
 
diff --git a/engine/include/XCEngine/Rendering/BuiltinPassTypes.h b/engine/include/XCEngine/Rendering/Builtin/BuiltinPassTypes.h
similarity index 100%
rename from engine/include/XCEngine/Rendering/BuiltinPassTypes.h
rename to engine/include/XCEngine/Rendering/Builtin/BuiltinPassTypes.h
diff --git a/engine/include/XCEngine/Rendering/BuiltinPassContract.h b/engine/include/XCEngine/Rendering/BuiltinPassContract.h
deleted file mode 100644
index 4ad30ebb..00000000
--- a/engine/include/XCEngine/Rendering/BuiltinPassContract.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include <XCEngine/Rendering/BuiltinPassLayoutUtils.h>
diff --git a/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h b/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h
index f86c1681..4369b940 100644
--- a/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h
+++ b/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h
@@ -2,7 +2,7 @@
 
 #include <XCEngine/Core/Asset/ResourceHandle.h>
 #include <XCEngine/Core/Math/Matrix4.h>
-#include <XCEngine/Rendering/BuiltinPassTypes.h>
+#include <XCEngine/Rendering/Builtin/BuiltinPassTypes.h>
 #include <XCEngine/Rendering/RenderPass.h>
 #include <XCEngine/Rendering/RenderMaterialStateUtils.h>
 #include <XCEngine/Rendering/RenderResourceCache.h>
diff --git a/engine/include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h b/engine/include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h
index ccb9eeab..33c781f2 100644
--- a/engine/include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h
+++ b/engine/include/XCEngine/Rendering/Passes/BuiltinObjectIdPass.h
@@ -2,7 +2,7 @@
 
 #include <XCEngine/Core/Asset/ResourceManager.h>
 #include <XCEngine/Core/Math/Matrix4.h>
-#include <XCEngine/Rendering/BuiltinPassTypes.h>
+#include <XCEngine/Rendering/Builtin/BuiltinPassTypes.h>
 #include <XCEngine/Rendering/Picking/ObjectIdCodec.h>
 #include <XCEngine/Rendering/RenderPass.h>
 #include <XCEngine/Rendering/RenderResourceCache.h>
diff --git a/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h b/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h
index 3ae6da65..75c42e1f 100644
--- a/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h
+++ b/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <XCEngine/Rendering/BuiltinPassTypes.h>
+#include <XCEngine/Rendering/Builtin/BuiltinPassTypes.h>
 #include <XCEngine/Rendering/RenderMaterialResolve.h>
 #include <XCEngine/Rendering/RenderMaterialStateUtils.h>
 #include <XCEngine/Rendering/RenderPass.h>
diff --git a/engine/include/XCEngine/Rendering/RenderMaterialResolve.h b/engine/include/XCEngine/Rendering/RenderMaterialResolve.h
index 18360311..c05be303 100644
--- a/engine/include/XCEngine/Rendering/RenderMaterialResolve.h
+++ b/engine/include/XCEngine/Rendering/RenderMaterialResolve.h
@@ -4,7 +4,7 @@
 #include <XCEngine/Core/Types.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
-#include <XCEngine/Rendering/BuiltinPassMetadataUtils.h>
+#include <XCEngine/Rendering/Builtin/BuiltinPassMetadataUtils.h>
 #include <XCEngine/Rendering/FrameData/VisibleRenderItem.h>
 
 #include <cstddef>
diff --git a/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp b/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp
index 25ee3af0..f9c0dfe2 100644
--- a/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp
+++ b/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp
@@ -4,7 +4,7 @@
 #include "Core/Asset/ResourceManager.h"
 #include "Debug/Logger.h"
 #include "RHI/RHICommandList.h"
-#include "Rendering/BuiltinPassLayoutUtils.h"
+#include "Rendering/Builtin/BuiltinPassLayoutUtils.h"
 #include "Rendering/Detail/ShaderVariantUtils.h"
 #include "Rendering/RenderMaterialResolve.h"
 #include "Rendering/Extraction/RenderSceneExtractor.h"
diff --git a/engine/src/Rendering/Passes/BuiltinObjectIdPassResources.cpp b/engine/src/Rendering/Passes/BuiltinObjectIdPassResources.cpp
index c051fe13..c2c64f20 100644
--- a/engine/src/Rendering/Passes/BuiltinObjectIdPassResources.cpp
+++ b/engine/src/Rendering/Passes/BuiltinObjectIdPassResources.cpp
@@ -6,7 +6,7 @@
 #include "RHI/RHICommandList.h"
 #include "RHI/RHIPipelineLayout.h"
 #include "RHI/RHIPipelineState.h"
-#include "Rendering/BuiltinPassLayoutUtils.h"
+#include "Rendering/Builtin/BuiltinPassLayoutUtils.h"
 #include "Rendering/Detail/ShaderVariantUtils.h"
 #include "Rendering/Extraction/RenderSceneExtractor.h"
 #include "Rendering/RenderSurface.h"
diff --git a/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp b/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp
index 7ca501c5..9d4ff36a 100644
--- a/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp
+++ b/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp
@@ -4,7 +4,7 @@
 #include "Debug/Logger.h"
 #include "RHI/RHICommandList.h"
 #include "RHI/RHIDevice.h"
-#include "Rendering/BuiltinPassLayoutUtils.h"
+#include "Rendering/Builtin/BuiltinPassLayoutUtils.h"
 #include "Rendering/Detail/ShaderVariantUtils.h"
 #include "Rendering/RenderMaterialResolve.h"
 #include "Rendering/RenderMaterialStateUtils.h"
diff --git a/tests/Rendering/unit/test_builtin_forward_pipeline.cpp b/tests/Rendering/unit/test_builtin_forward_pipeline.cpp
index b5283e5c..8361a861 100644
--- a/tests/Rendering/unit/test_builtin_forward_pipeline.cpp
+++ b/tests/Rendering/unit/test_builtin_forward_pipeline.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <XCEngine/Rendering/BuiltinPassLayoutUtils.h>
+#include <XCEngine/Rendering/Builtin/BuiltinPassLayoutUtils.h>
 #include <XCEngine/Rendering/Passes/BuiltinDepthOnlyPass.h>
 #include <XCEngine/Rendering/Passes/BuiltinObjectIdPass.h>
 #include <XCEngine/Rendering/Passes/BuiltinShadowCasterPass.h>
diff --git a/tests/Rendering/unit/test_render_scene_extractor.cpp b/tests/Rendering/unit/test_render_scene_extractor.cpp
index 32762210..e78efd8b 100644
--- a/tests/Rendering/unit/test_render_scene_extractor.cpp
+++ b/tests/Rendering/unit/test_render_scene_extractor.cpp
@@ -9,7 +9,7 @@
 #include <XCEngine/Core/Math/Color.h>
 #include <XCEngine/Core/Math/Quaternion.h>
 #include <XCEngine/Core/Math/Vector3.h>
-#include <XCEngine/Rendering/BuiltinPassContract.h>
+#include <XCEngine/Rendering/Builtin/BuiltinPassContract.h>
 #include <XCEngine/Rendering/RenderMaterialResolve.h>
 #include <XCEngine/Rendering/RenderMaterialStateUtils.h>
 #include <XCEngine/Rendering/Extraction/RenderSceneExtractor.h>