diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb517828..fddedcab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,17 +163,17 @@ function(add_lego_libraries NAME)
   target_include_directories(geom${ARG_SUFFIX} PRIVATE "${PROJECT_SOURCE_DIR}/LEGO1/omni/include" "${PROJECT_SOURCE_DIR}/LEGO1" "${PROJECT_SOURCE_DIR}/LEGO1/lego/sources" "${PROJECT_SOURCE_DIR}/util")
   target_link_libraries(geom${ARG_SUFFIX} PRIVATE)
 
-  add_library(util${ARG_SUFFIX} STATIC
-    LEGO1/lego/sources/util/legocolor.cpp
-    LEGO1/lego/sources/util/legobox.cpp
-    LEGO1/lego/sources/util/legomesh.cpp
-    LEGO1/lego/sources/util/legosphere.cpp
-    LEGO1/lego/sources/util/legovertex.cpp
+  add_library(shape${ARG_SUFFIX} STATIC
+    LEGO1/lego/sources/shape/legocolor.cpp
+    LEGO1/lego/sources/shape/legobox.cpp
+    LEGO1/lego/sources/shape/legomesh.cpp
+    LEGO1/lego/sources/shape/legosphere.cpp
+    LEGO1/lego/sources/shape/legovertex.cpp
   )
-  list(APPEND list_targets util${ARG_SUFFIX})
-  set_property(TARGET util${ARG_SUFFIX} PROPERTY ARCHIVE_OUTPUT_NAME "util$<$<CONFIG:Debug>:d>${ARG_SUFFIX}")
-  target_include_directories(util${ARG_SUFFIX} PRIVATE "${PROJECT_SOURCE_DIR}/LEGO1/omni/include" "${PROJECT_SOURCE_DIR}/LEGO1" "${PROJECT_SOURCE_DIR}/LEGO1/lego/sources" "${PROJECT_SOURCE_DIR}/util")
-  target_link_libraries(util${ARG_SUFFIX} PRIVATE)
+  list(APPEND list_targets shape${ARG_SUFFIX})
+  set_property(TARGET shape${ARG_SUFFIX} PROPERTY ARCHIVE_OUTPUT_NAME "shape$<$<CONFIG:Debug>:d>${ARG_SUFFIX}")
+  target_include_directories(shape${ARG_SUFFIX} PRIVATE "${PROJECT_SOURCE_DIR}/LEGO1/omni/include" "${PROJECT_SOURCE_DIR}/LEGO1" "${PROJECT_SOURCE_DIR}/LEGO1/lego/sources" "${PROJECT_SOURCE_DIR}/util")
+  target_link_libraries(shape${ARG_SUFFIX} PRIVATE)
 
   add_library(anim${ARG_SUFFIX} STATIC
     LEGO1/lego/sources/anim/legoanim.cpp
@@ -443,7 +443,7 @@ function(add_lego_libraries NAME)
     misc${ARG_SUFFIX}
     3dmanager${ARG_SUFFIX}
     omni${ARG_SUFFIX}
-    util${ARG_SUFFIX}
+    shape${ARG_SUFFIX}
   )
 
   foreach(tgt IN LISTS list_targets)
diff --git a/LEGO1/lego/sources/roi/legolod.cpp b/LEGO1/lego/sources/roi/legolod.cpp
index db8776b3..7db2a0a9 100644
--- a/LEGO1/lego/sources/roi/legolod.cpp
+++ b/LEGO1/lego/sources/roi/legolod.cpp
@@ -4,8 +4,8 @@
 #include "legoroi.h"
 #include "misc/legocontainer.h"
 #include "misc/legostorage.h"
+#include "shape/legomesh.h"
 #include "tgl/d3drm/impl.h"
-#include "util/legomesh.h"
 
 DECOMP_SIZE_ASSERT(LODObject, 0x04)
 DECOMP_SIZE_ASSERT(ViewLOD, 0x0c)
diff --git a/LEGO1/lego/sources/roi/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp
index c363c031..50a26113 100644
--- a/LEGO1/lego/sources/roi/legoroi.cpp
+++ b/LEGO1/lego/sources/roi/legoroi.cpp
@@ -5,8 +5,8 @@
 #include "misc/legocontainer.h"
 #include "misc/legostorage.h"
 #include "realtime/realtime.h"
-#include "util/legobox.h"
-#include "util/legosphere.h"
+#include "shape/legobox.h"
+#include "shape/legosphere.h"
 
 #include <string.h>
 #include <vec.h>
diff --git a/LEGO1/lego/sources/util/legobox.cpp b/LEGO1/lego/sources/shape/legobox.cpp
similarity index 100%
rename from LEGO1/lego/sources/util/legobox.cpp
rename to LEGO1/lego/sources/shape/legobox.cpp
diff --git a/LEGO1/lego/sources/util/legobox.h b/LEGO1/lego/sources/shape/legobox.h
similarity index 100%
rename from LEGO1/lego/sources/util/legobox.h
rename to LEGO1/lego/sources/shape/legobox.h
diff --git a/LEGO1/lego/sources/util/legocolor.cpp b/LEGO1/lego/sources/shape/legocolor.cpp
similarity index 100%
rename from LEGO1/lego/sources/util/legocolor.cpp
rename to LEGO1/lego/sources/shape/legocolor.cpp
diff --git a/LEGO1/lego/sources/util/legocolor.h b/LEGO1/lego/sources/shape/legocolor.h
similarity index 100%
rename from LEGO1/lego/sources/util/legocolor.h
rename to LEGO1/lego/sources/shape/legocolor.h
diff --git a/LEGO1/lego/sources/util/legomesh.cpp b/LEGO1/lego/sources/shape/legomesh.cpp
similarity index 100%
rename from LEGO1/lego/sources/util/legomesh.cpp
rename to LEGO1/lego/sources/shape/legomesh.cpp
diff --git a/LEGO1/lego/sources/util/legomesh.h b/LEGO1/lego/sources/shape/legomesh.h
similarity index 100%
rename from LEGO1/lego/sources/util/legomesh.h
rename to LEGO1/lego/sources/shape/legomesh.h
diff --git a/LEGO1/lego/sources/util/legosphere.cpp b/LEGO1/lego/sources/shape/legosphere.cpp
similarity index 100%
rename from LEGO1/lego/sources/util/legosphere.cpp
rename to LEGO1/lego/sources/shape/legosphere.cpp
diff --git a/LEGO1/lego/sources/util/legosphere.h b/LEGO1/lego/sources/shape/legosphere.h
similarity index 100%
rename from LEGO1/lego/sources/util/legosphere.h
rename to LEGO1/lego/sources/shape/legosphere.h
diff --git a/LEGO1/lego/sources/util/legovertex.cpp b/LEGO1/lego/sources/shape/legovertex.cpp
similarity index 100%
rename from LEGO1/lego/sources/util/legovertex.cpp
rename to LEGO1/lego/sources/shape/legovertex.cpp
diff --git a/LEGO1/lego/sources/util/legovertex.h b/LEGO1/lego/sources/shape/legovertex.h
similarity index 100%
rename from LEGO1/lego/sources/util/legovertex.h
rename to LEGO1/lego/sources/shape/legovertex.h