diff --git a/mappings/net/minecraft/client/model/Box.mapping b/mappings/net/minecraft/client/model/Box.mapping
deleted file mode 100644
index 5937046e4a..0000000000
--- a/mappings/net/minecraft/client/model/Box.mapping
+++ /dev/null
@@ -1,37 +0,0 @@
-CLASS net/minecraft/class_628 net/minecraft/client/model/Box
-	FIELD field_3643 zMin F
-	FIELD field_3644 yMin F
-	FIELD field_3645 xMin F
-	FIELD field_3646 zMax F
-	FIELD field_3647 yMax F
-	FIELD field_3648 xMax F
-	FIELD field_3649 polygons [Lnet/minecraft/class_593;
-	FIELD field_3650 name Ljava/lang/String;
-	FIELD field_3651 vertices [Lnet/minecraft/class_618;
-	METHOD <init> (Lnet/minecraft/class_630;IIFFFIIIF)V
-		ARG 1 parent
-		ARG 2 textureOffsetU
-		ARG 3 textureOffsetV
-		ARG 4 xMin
-		ARG 5 yMin
-		ARG 6 zMin
-		ARG 7 xSize
-		ARG 8 ySize
-		ARG 9 zSize
-		ARG 10 scale
-	METHOD <init> (Lnet/minecraft/class_630;IIFFFIIIFZ)V
-		ARG 1 parent
-		ARG 2 textureOffsetU
-		ARG 3 textureOffsetV
-		ARG 4 xMin
-		ARG 5 yMin
-		ARG 6 zMin
-		ARG 7 xSize
-		ARG 8 ySize
-		ARG 9 zSize
-		ARG 10 scale
-		ARG 11 flip
-	METHOD method_2842 setName (Ljava/lang/String;)Lnet/minecraft/class_628;
-		ARG 1 name
-	METHOD method_2843 render (Lnet/minecraft/class_287;F)V
-		ARG 2 scale
diff --git a/mappings/net/minecraft/client/model/Cuboid.mapping b/mappings/net/minecraft/client/model/Cuboid.mapping
index e4232c6d11..4ed135503f 100644
--- a/mappings/net/minecraft/client/model/Cuboid.mapping
+++ b/mappings/net/minecraft/client/model/Cuboid.mapping
@@ -1,87 +1,37 @@
-CLASS net/minecraft/class_630 net/minecraft/client/model/Cuboid
-	FIELD field_3654 pitch F
-	FIELD field_3655 rotationPointZ F
-	FIELD field_3656 rotationPointY F
-	FIELD field_3657 rotationPointX F
-	FIELD field_3658 textureHeight F
-	FIELD field_3659 textureWidth F
-	FIELD field_3660 compiled Z
-	FIELD field_3661 children Ljava/util/List;
-	FIELD field_3662 name Ljava/lang/String;
-	FIELD field_3663 boxes Ljava/util/List;
-	FIELD field_3665 visible Z
-	FIELD field_3666 mirror Z
-	FIELD field_3667 list I
-	FIELD field_3669 z F
-	FIELD field_3670 textureOffsetV I
-	FIELD field_3671 y F
-	FIELD field_3672 textureOffsetU I
-	FIELD field_3673 x F
-	FIELD field_3674 roll F
-	FIELD field_3675 yaw F
-	METHOD <init> (Lnet/minecraft/class_3879;II)V
-		ARG 1 owner
+CLASS net/minecraft/class_628 net/minecraft/client/model/Cuboid
+	FIELD field_3643 zMin F
+	FIELD field_3644 yMin F
+	FIELD field_3645 xMin F
+	FIELD field_3646 zMax F
+	FIELD field_3647 yMax F
+	FIELD field_3648 xMax F
+	FIELD field_3649 polygons [Lnet/minecraft/class_593;
+	FIELD field_3650 name Ljava/lang/String;
+	FIELD field_3651 vertices [Lnet/minecraft/class_618;
+	METHOD <init> (Lnet/minecraft/class_630;IIFFFIIIF)V
+		ARG 1 parent
 		ARG 2 textureOffsetU
 		ARG 3 textureOffsetV
-	METHOD <init> (Lnet/minecraft/class_3879;Ljava/lang/String;)V
-		ARG 1 owner
-		ARG 2 name
-	METHOD method_17138 copyRotation (Lnet/minecraft/class_630;)V
-	METHOD method_17578 removeChild (Lnet/minecraft/class_630;)V
-	METHOD method_2844 addBox (FFFIII)Lnet/minecraft/class_630;
-		ARG 1 xMin
-		ARG 2 yMin
-		ARG 3 zMin
-		ARG 4 xSize
-		ARG 5 ySize
-		ARG 6 zSize
-	METHOD method_2845 addChild (Lnet/minecraft/class_630;)V
-	METHOD method_2846 render (F)V
-		ARG 1 scale
-	METHOD method_2847 applyTransform (F)V
-		ARG 1 scale
-	METHOD method_2848 addBox (Ljava/lang/String;FFFIIIFII)Lnet/minecraft/class_630;
-		ARG 1 suffix
-		ARG 2 xMin
-		ARG 3 yMin
-		ARG 4 zMin
-		ARG 5 xSize
-		ARG 6 ySize
-		ARG 7 zSize
-		ARG 9 textureOffsetU
-		ARG 10 textureOffsetV
-	METHOD method_2849 addBox (FFFIIIFZ)V
-		ARG 1 xMin
-		ARG 2 yMin
-		ARG 3 zMin
-		ARG 4 xSize
-		ARG 5 ySize
-		ARG 6 zSize
-	METHOD method_2850 setTextureOffset (II)Lnet/minecraft/class_630;
-		ARG 1 u
-		ARG 2 v
-	METHOD method_2851 setRotationPoint (FFF)V
-		ARG 1 x
-		ARG 2 y
-		ARG 3 z
-	METHOD method_2852 (F)V
-		ARG 1 scale
-	METHOD method_2853 setTextureSize (II)Lnet/minecraft/class_630;
-		ARG 1 width
-		ARG 2 height
-	METHOD method_2854 addBox (FFFIIIZ)Lnet/minecraft/class_630;
-		ARG 1 xMin
-		ARG 2 yMin
-		ARG 3 zMin
-		ARG 4 xSize
-		ARG 5 ySize
-		ARG 6 zSize
-	METHOD method_2855 compile (F)V
-		ARG 1 scale
-	METHOD method_2856 addBox (FFFIIIF)V
-		ARG 1 xMin
-		ARG 2 yMin
-		ARG 3 zMin
-		ARG 4 xSize
-		ARG 5 ySize
-		ARG 6 zSize
+		ARG 4 xMin
+		ARG 5 yMin
+		ARG 6 zMin
+		ARG 7 xSize
+		ARG 8 ySize
+		ARG 9 zSize
+		ARG 10 scale
+	METHOD <init> (Lnet/minecraft/class_630;IIFFFIIIFZ)V
+		ARG 1 parent
+		ARG 2 textureOffsetU
+		ARG 3 textureOffsetV
+		ARG 4 xMin
+		ARG 5 yMin
+		ARG 6 zMin
+		ARG 7 xSize
+		ARG 8 ySize
+		ARG 9 zSize
+		ARG 10 scale
+		ARG 11 flip
+	METHOD method_2842 setName (Ljava/lang/String;)Lnet/minecraft/class_628;
+		ARG 1 name
+	METHOD method_2843 render (Lnet/minecraft/class_287;F)V
+		ARG 2 scale
diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping
new file mode 100644
index 0000000000..7288b8c597
--- /dev/null
+++ b/mappings/net/minecraft/client/model/ModelPart.mapping
@@ -0,0 +1,87 @@
+CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
+	FIELD field_3654 pitch F
+	FIELD field_3655 rotationPointZ F
+	FIELD field_3656 rotationPointY F
+	FIELD field_3657 rotationPointX F
+	FIELD field_3658 textureHeight F
+	FIELD field_3659 textureWidth F
+	FIELD field_3660 compiled Z
+	FIELD field_3661 children Ljava/util/List;
+	FIELD field_3662 name Ljava/lang/String;
+	FIELD field_3663 cuboids Ljava/util/List;
+	FIELD field_3665 visible Z
+	FIELD field_3666 mirror Z
+	FIELD field_3667 renderList I
+	FIELD field_3669 z F
+	FIELD field_3670 textureOffsetV I
+	FIELD field_3671 y F
+	FIELD field_3672 textureOffsetU I
+	FIELD field_3673 x F
+	FIELD field_3674 roll F
+	FIELD field_3675 yaw F
+	METHOD <init> (Lnet/minecraft/class_3879;II)V
+		ARG 1 owner
+		ARG 2 textureOffsetU
+		ARG 3 textureOffsetV
+	METHOD <init> (Lnet/minecraft/class_3879;Ljava/lang/String;)V
+		ARG 1 owner
+		ARG 2 name
+	METHOD method_17138 copyRotation (Lnet/minecraft/class_630;)V
+	METHOD method_17578 removeChild (Lnet/minecraft/class_630;)V
+	METHOD method_2844 addCuboid (FFFIII)Lnet/minecraft/class_630;
+		ARG 1 xMin
+		ARG 2 yMin
+		ARG 3 zMin
+		ARG 4 xSize
+		ARG 5 ySize
+		ARG 6 zSize
+	METHOD method_2845 addChild (Lnet/minecraft/class_630;)V
+	METHOD method_2846 render (F)V
+		ARG 1 scale
+	METHOD method_2847 applyTransform (F)V
+		ARG 1 scale
+	METHOD method_2848 addCuboid (Ljava/lang/String;FFFIIIFII)Lnet/minecraft/class_630;
+		ARG 1 suffix
+		ARG 2 xMin
+		ARG 3 yMin
+		ARG 4 zMin
+		ARG 5 xSize
+		ARG 6 ySize
+		ARG 7 zSize
+		ARG 9 textureOffsetU
+		ARG 10 textureOffsetV
+	METHOD method_2849 addCuboid (FFFIIIFZ)V
+		ARG 1 xMin
+		ARG 2 yMin
+		ARG 3 zMin
+		ARG 4 xSize
+		ARG 5 ySize
+		ARG 6 zSize
+	METHOD method_2850 setTextureOffset (II)Lnet/minecraft/class_630;
+		ARG 1 u
+		ARG 2 v
+	METHOD method_2851 setRotationPoint (FFF)V
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+	METHOD method_2852 (F)V
+		ARG 1 scale
+	METHOD method_2853 setTextureSize (II)Lnet/minecraft/class_630;
+		ARG 1 width
+		ARG 2 height
+	METHOD method_2854 addCuboid (FFFIIIZ)Lnet/minecraft/class_630;
+		ARG 1 xMin
+		ARG 2 yMin
+		ARG 3 zMin
+		ARG 4 xSize
+		ARG 5 ySize
+		ARG 6 zSize
+	METHOD method_2855 compile (F)V
+		ARG 1 scale
+	METHOD method_2856 addCuboid (FFFIIIF)V
+		ARG 1 xMin
+		ARG 2 yMin
+		ARG 3 zMin
+		ARG 4 xSize
+		ARG 5 ySize
+		ARG 6 zSize