diff --git a/shader/brdf.glsl b/shader/PBR/brdf.glsl
similarity index 100%
rename from shader/brdf.glsl
rename to shader/PBR/brdf.glsl
diff --git a/shader/push_constant_3d.glsl b/shader/UBO/PushConstant3D.glsl
similarity index 100%
rename from shader/push_constant_3d.glsl
rename to shader/UBO/PushConstant3D.glsl
diff --git a/shader/WorldMatrix.ubo b/shader/UBO/WorldMatrix.glsl
similarity index 96%
rename from shader/WorldMatrix.ubo
rename to shader/UBO/WorldMatrix.glsl
index b986c85..0335cf8 100644
--- a/shader/WorldMatrix.ubo
+++ b/shader/UBO/WorldMatrix.glsl
@@ -13,4 +13,4 @@ layout(binding=0) uniform WorldMatrix     // hgl/math/Math.h
 
     vec4 view_pos;
     vec2 resolution;
-} world; 
+} world;
diff --git a/shader/UBO_WorldMatrix.glsl b/shader/UBO_WorldMatrix.glsl
deleted file mode 100644
index 6336904..0000000
--- a/shader/UBO_WorldMatrix.glsl
+++ /dev/null
@@ -1,15 +0,0 @@
-layout(binding = 0) uniform WorldMatrix     // hgl/math/Math.h
-{
-    mat4 ortho;
-
-    mat4 projection;
-    mat4 inverse_projection;
-
-    mat4 modelview;
-    mat4 inverse_modelview;
-
-    mat4 mvp;
-    mat4 inverse_mvp;
-
-    vec4 view_pos;
-} world;