diff --git a/CMCore b/CMCore
index a1d1f672..f9007c55 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit a1d1f6721c733b509243b3063f4898ef23ae0f75
+Subproject commit f9007c5564568b2596ddfb8643905e9df28cf7b8
diff --git a/ShaderLibrary/Std3D/VertexLum3D.mtl b/ShaderLibrary/Std3D/VertexLum3D.mtl
index 035bd16e..872a18cf 100644
--- a/ShaderLibrary/Std3D/VertexLum3D.mtl
+++ b/ShaderLibrary/Std3D/VertexLum3D.mtl
@@ -13,7 +13,7 @@ Code
 #Vertex
 Input
 {
-    float Luminance;
+    float Luminance
 }
 
 Output
diff --git a/example/Basic/auto_instance.cpp b/example/Basic/auto_instance.cpp
index 351fef28..01ef2589 100644
--- a/example/Basic/auto_instance.cpp
+++ b/example/Basic/auto_instance.cpp
@@ -5,7 +5,7 @@
 #include<hgl/filesystem/FileSystem.h>
 #include<hgl/graph/VKRenderablePrimitiveCreater.h>
 #include<hgl/graph/VKVertexInputConfig.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/graph/RenderList.h>
 
 using namespace hgl;
diff --git a/example/Basic/auto_merge_material_instance.cpp b/example/Basic/auto_merge_material_instance.cpp
index 2b0e0894..05aa212a 100644
--- a/example/Basic/auto_merge_material_instance.cpp
+++ b/example/Basic/auto_merge_material_instance.cpp
@@ -4,7 +4,7 @@
 #include<hgl/math/Math.h>
 #include<hgl/filesystem/FileSystem.h>
 #include<hgl/graph/VKRenderablePrimitiveCreater.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/graph/RenderList.h>
 #include<hgl/color/Color.h>
 
diff --git a/example/Basic/draw_triangle_in_NDC.cpp b/example/Basic/draw_triangle_in_NDC.cpp
index 554c9ce0..e13c8d6e 100644
--- a/example/Basic/draw_triangle_in_NDC.cpp
+++ b/example/Basic/draw_triangle_in_NDC.cpp
@@ -7,7 +7,7 @@
 #include<hgl/graph/SceneInfo.h>
 #include<hgl/graph/VKVertexInputConfig.h>
 #include<hgl/graph/VKRenderablePrimitiveCreater.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 
 using namespace hgl;
 using namespace hgl::graph;
diff --git a/example/Basic/draw_triangle_use_UBO.cpp b/example/Basic/draw_triangle_use_UBO.cpp
index 34352adc..bb5b6eb6 100644
--- a/example/Basic/draw_triangle_use_UBO.cpp
+++ b/example/Basic/draw_triangle_use_UBO.cpp
@@ -5,7 +5,7 @@
 #include<hgl/filesystem/FileSystem.h>
 #include<hgl/graph/SceneInfo.h>
 #include<hgl/graph/VKRenderablePrimitiveCreater.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 
 using namespace hgl;
 using namespace hgl::graph;
diff --git a/example/Gizmo/PlaneGrid3D.cpp b/example/Gizmo/PlaneGrid3D.cpp
index 871fc18a..e03bb136 100644
--- a/example/Gizmo/PlaneGrid3D.cpp
+++ b/example/Gizmo/PlaneGrid3D.cpp
@@ -7,7 +7,7 @@
 #include<hgl/graph/RenderList.h>
 #include<hgl/graph/Camera.h>
 #include<hgl/graph/VKRenderablePrimitiveCreater.h>
-#include<hgl/graph/mtl/3d/Material3DCreateConfig.h>
+#include<hgl/graph/mtl/Material3DCreateConfig.h>
 
 using namespace hgl;
 using namespace hgl::graph;
diff --git a/example/Gizmo/RayPicking.cpp b/example/Gizmo/RayPicking.cpp
index bcb0c48a..db5a3231 100644
--- a/example/Gizmo/RayPicking.cpp
+++ b/example/Gizmo/RayPicking.cpp
@@ -8,7 +8,7 @@
 #include<hgl/graph/Camera.h>
 #include<hgl/graph/Ray.h>
 #include<hgl/graph/VKVertexAttribBuffer.h>
-#include<hgl/graph/mtl/3d/Material3DCreateConfig.h>
+#include<hgl/graph/mtl/Material3DCreateConfig.h>
 
 using namespace hgl;
 using namespace hgl::graph;
diff --git a/example/Texture/texture_quad.cpp b/example/Texture/texture_quad.cpp
index 3705961c..da7cb613 100644
--- a/example/Texture/texture_quad.cpp
+++ b/example/Texture/texture_quad.cpp
@@ -5,7 +5,7 @@
 #include<hgl/graph/VKSampler.h>
 #include<hgl/graph/VKInlinePipeline.h>
 #include<hgl/graph/VKRenderablePrimitiveCreater.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/math/Math.h>
 
 using namespace hgl;
diff --git a/example/Texture/texture_rect.cpp b/example/Texture/texture_rect.cpp
index 0a4c23f9..32c6c942 100644
--- a/example/Texture/texture_rect.cpp
+++ b/example/Texture/texture_rect.cpp
@@ -5,7 +5,7 @@
 #include<hgl/graph/VKSampler.h>
 #include<hgl/graph/VKInlinePipeline.h>
 #include<hgl/graph/VKRenderablePrimitiveCreater.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/math/Math.h>
 
 using namespace hgl;
diff --git a/example/Texture/texture_rect_array.cpp b/example/Texture/texture_rect_array.cpp
index 6bdee495..3e1e21a5 100644
--- a/example/Texture/texture_rect_array.cpp
+++ b/example/Texture/texture_rect_array.cpp
@@ -5,7 +5,7 @@
 #include<hgl/graph/VKSampler.h>
 #include<hgl/graph/VKInlinePipeline.h>
 #include<hgl/graph/VKRenderablePrimitiveCreater.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/math/Math.h>
 #include<hgl/filesystem/Filename.h>
 
diff --git a/inc/hgl/graph/mtl/2d/Material2DCreateConfig.h b/inc/hgl/graph/mtl/Material2DCreateConfig.h
similarity index 100%
rename from inc/hgl/graph/mtl/2d/Material2DCreateConfig.h
rename to inc/hgl/graph/mtl/Material2DCreateConfig.h
diff --git a/inc/hgl/graph/mtl/3d/Material3DCreateConfig.h b/inc/hgl/graph/mtl/Material3DCreateConfig.h
similarity index 100%
rename from inc/hgl/graph/mtl/3d/Material3DCreateConfig.h
rename to inc/hgl/graph/mtl/Material3DCreateConfig.h
diff --git a/src/ShaderGen/2d/M_PureTexture2D.cpp b/src/ShaderGen/2d/M_PureTexture2D.cpp
index 1a80399b..5c4b15dd 100644
--- a/src/ShaderGen/2d/M_PureTexture2D.cpp
+++ b/src/ShaderGen/2d/M_PureTexture2D.cpp
@@ -1,6 +1,6 @@
 #include"Std2DMaterial.h"
 #include<hgl/shadergen/MaterialCreateInfo.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/graph/mtl/SamplerName.h>
 
 STD_MTL_NAMESPACE_BEGIN
diff --git a/src/ShaderGen/2d/M_RectTexture2D.cpp b/src/ShaderGen/2d/M_RectTexture2D.cpp
index b2529fd1..4ae087d6 100644
--- a/src/ShaderGen/2d/M_RectTexture2D.cpp
+++ b/src/ShaderGen/2d/M_RectTexture2D.cpp
@@ -1,6 +1,6 @@
 #include"Std2DMaterial.h"
 #include<hgl/shadergen/MaterialCreateInfo.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/graph/mtl/UBOCommon.h>
 #include<hgl/graph/mtl/SamplerName.h>
 
diff --git a/src/ShaderGen/2d/M_RectTexture2DArray.cpp b/src/ShaderGen/2d/M_RectTexture2DArray.cpp
index 96885e87..39ae0e1f 100644
--- a/src/ShaderGen/2d/M_RectTexture2DArray.cpp
+++ b/src/ShaderGen/2d/M_RectTexture2DArray.cpp
@@ -1,6 +1,6 @@
 #include"Std2DMaterial.h"
 #include<hgl/shadergen/MaterialCreateInfo.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include"common/MFRectPrimitive.h"
 #include<hgl/graph/mtl/UBOCommon.h>
 #include<hgl/graph/mtl/SamplerName.h>
diff --git a/src/ShaderGen/2d/Std2DMaterial.cpp b/src/ShaderGen/2d/Std2DMaterial.cpp
index dbbbad66..563c44a7 100644
--- a/src/ShaderGen/2d/Std2DMaterial.cpp
+++ b/src/ShaderGen/2d/Std2DMaterial.cpp
@@ -1,6 +1,6 @@
 #include"Std2DMaterial.h"
 #include<hgl/shadergen/MaterialCreateInfo.h>
-#include<hgl/graph/mtl/2d/Material2DCreateConfig.h>
+#include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/graph/mtl/UBOCommon.h>
 #include"common/MFGetPosition.h"
 #include"common/MFRectPrimitive.h"
diff --git a/src/ShaderGen/3d/Std3DMaterial.cpp b/src/ShaderGen/3d/Std3DMaterial.cpp
index de680407..cc9a821c 100644
--- a/src/ShaderGen/3d/Std3DMaterial.cpp
+++ b/src/ShaderGen/3d/Std3DMaterial.cpp
@@ -1,6 +1,6 @@
 #include"Std3DMaterial.h"
 #include<hgl/shadergen/MaterialCreateInfo.h>
-#include<hgl/graph/mtl/3d/Material3DCreateConfig.h>
+#include<hgl/graph/mtl/Material3DCreateConfig.h>
 #include<hgl/graph/mtl/UBOCommon.h>
 #include"common/MFGetPosition.h"
 #include"common/MFGetNormal.h"
diff --git a/src/ShaderGen/CMakeLists.txt b/src/ShaderGen/CMakeLists.txt
index d3630493..47da7742 100644
--- a/src/ShaderGen/CMakeLists.txt
+++ b/src/ShaderGen/CMakeLists.txt
@@ -49,9 +49,7 @@ SOURCE_GROUP("Common" FILES ${SHADERGEN_COMMON_FILES})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-SET(STD_MTL_2D_HEADER_PATH ${STD_MTL_HEADER_PATH}/2d)
-
-SET(STD_MTL_2D_SOURCE_FILES	${STD_MTL_2D_HEADER_PATH}/Material2DCreateConfig.h
+SET(STD_MTL_2D_SOURCE_FILES	${STD_MTL_HEADER_PATH}/Material2DCreateConfig.h
                             2d/Std2DMaterial.h
                             2d/Std2DMaterial.cpp
                             2d/M_VertexColor2D.cpp
@@ -61,9 +59,7 @@ SET(STD_MTL_2D_SOURCE_FILES	${STD_MTL_2D_HEADER_PATH}/Material2DCreateConfig.h
                             2d/M_RectTexture2DArray.cpp
 )
 
-SET(STD_MTL_3D_HEADER_PATH ${STD_MTL_HEADER_PATH}/3d)
-
-SET(STD_MTL_3D_SOURCE_FILES	${STD_MTL_3D_HEADER_PATH}/Material3DCreateConfig.h
+SET(STD_MTL_3D_SOURCE_FILES	${STD_MTL_HEADER_PATH}/Material3DCreateConfig.h
                             3d/Std3DMaterial.h
                             3d/Std3DMaterial.cpp
                             3d/M_VertexColor3D.cpp