diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 1d7ea993..9a331c5a 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -430,6 +430,7 @@ add_library(XCEngine STATIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderContext.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderCameraData.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/CameraRenderRequest.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/VisibleRenderItem.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/VisibleRenderObject.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassContract.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderSceneUtility.h
diff --git a/engine/include/XCEngine/Rendering/RenderMaterialUtility.h b/engine/include/XCEngine/Rendering/RenderMaterialUtility.h
index d85a59d3..55579ab9 100644
--- a/engine/include/XCEngine/Rendering/RenderMaterialUtility.h
+++ b/engine/include/XCEngine/Rendering/RenderMaterialUtility.h
@@ -6,7 +6,7 @@
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Rendering/BuiltinPassContract.h>
-#include <XCEngine/Rendering/VisibleRenderObject.h>
+#include <XCEngine/Rendering/VisibleRenderItem.h>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/engine/include/XCEngine/Rendering/RenderSceneExtractor.h b/engine/include/XCEngine/Rendering/RenderSceneExtractor.h
index 620c21df..71bf7409 100644
--- a/engine/include/XCEngine/Rendering/RenderSceneExtractor.h
+++ b/engine/include/XCEngine/Rendering/RenderSceneExtractor.h
@@ -3,7 +3,7 @@
 #include <XCEngine/Core/Math/Vector4.h>
 #include <XCEngine/Core/Math/Vector3.h>
 #include <XCEngine/Rendering/RenderCameraData.h>
-#include <XCEngine/Rendering/VisibleRenderObject.h>
+#include <XCEngine/Rendering/VisibleRenderItem.h>
 
 #include <array>
 #include <cstdint>
diff --git a/engine/include/XCEngine/Rendering/RenderSceneUtility.h b/engine/include/XCEngine/Rendering/RenderSceneUtility.h
index ac9a90b7..ad7020dd 100644
--- a/engine/include/XCEngine/Rendering/RenderSceneUtility.h
+++ b/engine/include/XCEngine/Rendering/RenderSceneUtility.h
@@ -2,7 +2,7 @@
 
 #include <XCEngine/Core/Math/Vector3.h>
 #include <XCEngine/Rendering/RenderCameraData.h>
-#include <XCEngine/Rendering/VisibleRenderObject.h>
+#include <XCEngine/Rendering/VisibleRenderItem.h>
 
 #include <cstdint>
 #include <vector>
diff --git a/engine/include/XCEngine/Rendering/VisibleRenderItem.h b/engine/include/XCEngine/Rendering/VisibleRenderItem.h
new file mode 100644
index 00000000..2e9528a8
--- /dev/null
+++ b/engine/include/XCEngine/Rendering/VisibleRenderItem.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <XCEngine/Core/Math/Matrix4.h>
+#include <XCEngine/Core/Types.h>
+#include <XCEngine/Resources/Mesh/Mesh.h>
+
+namespace XCEngine {
+namespace Components {
+class GameObject;
+class MeshFilterComponent;
+class MeshRendererComponent;
+} // namespace Components
+
+namespace Rendering {
+
+struct VisibleRenderItem {
+    Components::GameObject* gameObject = nullptr;
+    Components::MeshFilterComponent* meshFilter = nullptr;
+    Components::MeshRendererComponent* meshRenderer = nullptr;
+    Resources::Mesh* mesh = nullptr;
+    const Resources::Material* material = nullptr;
+    Core::uint32 materialIndex = 0;
+    Core::uint32 sectionIndex = 0;
+    bool hasSection = false;
+    Core::int32 renderQueue = 0;
+    float cameraDistanceSq = 0.0f;
+    Math::Matrix4x4 localToWorld = Math::Matrix4x4::Identity();
+};
+
+using VisibleRenderObject = VisibleRenderItem;
+
+} // namespace Rendering
+} // namespace XCEngine
diff --git a/engine/include/XCEngine/Rendering/VisibleRenderObject.h b/engine/include/XCEngine/Rendering/VisibleRenderObject.h
index 2e9528a8..66a0c1f9 100644
--- a/engine/include/XCEngine/Rendering/VisibleRenderObject.h
+++ b/engine/include/XCEngine/Rendering/VisibleRenderObject.h
@@ -1,33 +1,3 @@
 #pragma once
 
-#include <XCEngine/Core/Math/Matrix4.h>
-#include <XCEngine/Core/Types.h>
-#include <XCEngine/Resources/Mesh/Mesh.h>
-
-namespace XCEngine {
-namespace Components {
-class GameObject;
-class MeshFilterComponent;
-class MeshRendererComponent;
-} // namespace Components
-
-namespace Rendering {
-
-struct VisibleRenderItem {
-    Components::GameObject* gameObject = nullptr;
-    Components::MeshFilterComponent* meshFilter = nullptr;
-    Components::MeshRendererComponent* meshRenderer = nullptr;
-    Resources::Mesh* mesh = nullptr;
-    const Resources::Material* material = nullptr;
-    Core::uint32 materialIndex = 0;
-    Core::uint32 sectionIndex = 0;
-    bool hasSection = false;
-    Core::int32 renderQueue = 0;
-    float cameraDistanceSq = 0.0f;
-    Math::Matrix4x4 localToWorld = Math::Matrix4x4::Identity();
-};
-
-using VisibleRenderObject = VisibleRenderItem;
-
-} // namespace Rendering
-} // namespace XCEngine
+#include <XCEngine/Rendering/VisibleRenderItem.h>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 843f74fc..ee75a547 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -43,7 +43,9 @@ add_subdirectory(RHI)
 add_subdirectory(Resources)
 add_subdirectory(Input)
 add_subdirectory(Editor)
-add_subdirectory(NewEditor)
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/NewEditor")
+    add_subdirectory(NewEditor)
+endif()
 
 if(WIN32)
     find_program(XCENGINE_POWERSHELL_EXECUTABLE NAMES powershell pwsh REQUIRED)