diff --git a/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json b/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json
index 3334bcdf..9bc40b4c 100644
--- a/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json
+++ b/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json
@@ -2,7 +2,7 @@
 	"left_wing": {
 		"type": "mson:slot",
 		"name": "wings",
-		"implementation": "com.minelittlepony.client.model.components.PegasusWings$Wing",
+		"implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing",
 		"content": {
 			"folded": {
 				"texture": {"u": 56, "v": 32},
@@ -32,7 +32,7 @@
 	"right_wing": {
 		"type": "mson:slot",
 		"name": "wings",
-		"implementation": "com.minelittlepony.client.model.components.PegasusWings$Wing",
+		"implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing",
 		"content": {
 			"folded": {
 				"texture": {"u": 56, "v": 16},
@@ -62,7 +62,7 @@
 	"legacy_right_wing": {
 		"type": "mson:slot",
 		"name": "wings",
-		"implementation": "com.minelittlepony.client.model.components.PegasusWings$Wing",
+		"implementation": "com.minelittlepony.client.model.part.PegasusWings$Wing",
 		"content": {
 			"folded": {
 				"texture": {"u": 56, "v": 16},
diff --git a/src/main/resources/assets/minelittlepony/models/enderman.json b/src/main/resources/assets/minelittlepony/models/enderman.json
index 0c841c0a..2c706f80 100644
--- a/src/main/resources/assets/minelittlepony/models/enderman.json
+++ b/src/main/resources/assets/minelittlepony/models/enderman.json
@@ -17,13 +17,13 @@
 			{
 				"type": "mson:slot",
 				"name": "snout",
-				"implementation": "com.minelittlepony.client.model.components.PonySnout",
+				"implementation": "com.minelittlepony.client.model.part.PonySnout",
 				"content: "minelitlepony:components/snout"
 			},
 			{
 				"type": "mson:slot",
 				"name": "ears",
-				"implementation": "com.minelittlepony.client.model.components.PonyEars",
+				"implementation": "com.minelittlepony.client.model.part.PonyEars",
 				"content": "minelittlepony:components/ears"
 			},
 			{
@@ -103,5 +103,5 @@
 				"size": [ "#arm_width",  "#arm_length",  "#arm_depth" ]
 			}
 		]
-	},
+	}
 }
diff --git a/src/main/resources/assets/minelittlepony/models/races/alicorn.json b/src/main/resources/assets/minelittlepony/models/races/alicorn.json
index 367efb78..27293d83 100644
--- a/src/main/resources/assets/minelittlepony/models/races/alicorn.json
+++ b/src/main/resources/assets/minelittlepony/models/races/alicorn.json
@@ -3,7 +3,7 @@
 	"wings": {
 		"type": "mson:slot",
 		"name": "wings",
-		"implementation": "com.minelittlepony.client.model.components.PegasusWings",
+		"implementation": "com.minelittlepony.client.model.part.PegasusWings",
 		"content: "minelitlepony:components/pegasus_wings"
 	}
 }
diff --git a/src/main/resources/assets/minelittlepony/models/races/batpony.json b/src/main/resources/assets/minelittlepony/models/races/batpony.json
index f4039f87..9dc2a579 100644
--- a/src/main/resources/assets/minelittlepony/models/races/batpony.json
+++ b/src/main/resources/assets/minelittlepony/models/races/batpony.json
@@ -10,13 +10,13 @@
 			{
 				"type": "mson:slot",
 				"name": "snout",
-				"implementation": "com.minelittlepony.client.model.components.PonySnout",
+				"implementation": "com.minelittlepony.client.model.part.PonySnout",
 				"content: "minelitlepony:components/snout"
 			},
 			{
 				"type": "mson:slot",
 				"name": "ears",
-				"implementation": "com.minelittlepony.client.model.components.PonyEars",
+				"implementation": "com.minelittlepony.client.model.part.PonyEars",
 				"content": "minelittlepony:components/bat_ears"
 			}
 		]
@@ -24,7 +24,7 @@
 	"wings": {
 		"type": "mson:slot",
 		"name": "wings",
-		"implementation": "com.minelittlepony.client.model.components.BatWings",
+		"implementation": "com.minelittlepony.client.model.part.BatWings",
 		"content: "minelitlepony:components/bat_wings"
 	}
 }
diff --git a/src/main/resources/assets/minelittlepony/models/races/changeling.json b/src/main/resources/assets/minelittlepony/models/races/changeling.json
index 3753237b..af1d0adf 100644
--- a/src/main/resources/assets/minelittlepony/models/races/changeling.json
+++ b/src/main/resources/assets/minelittlepony/models/races/changeling.json
@@ -3,7 +3,7 @@
 	"wings": {
 		"type": "mson:slot",
 		"name": "wings",
-		"implementation": "com.minelittlepony.client.model.components.PegasusWings",
+		"implementation": "com.minelittlepony.client.model.part.PegasusWings",
 		"content: "minelitlepony:components/bug_wings"
 	}
 }
diff --git a/src/main/resources/assets/minelittlepony/models/races/pegasus.json b/src/main/resources/assets/minelittlepony/models/races/pegasus.json
index c335d15c..3ea32428 100644
--- a/src/main/resources/assets/minelittlepony/models/races/pegasus.json
+++ b/src/main/resources/assets/minelittlepony/models/races/pegasus.json
@@ -3,7 +3,7 @@
 	"wings": {
 		"type": "mson:slot",
 		"name": "wings",
-		"implementation": "com.minelittlepony.client.model.components.PegasusWings",
+		"implementation": "com.minelittlepony.client.model.part.PegasusWings",
 		"content: "minelitlepony:components/pegasus_wings"
 	}
 }
diff --git a/src/main/resources/assets/minelittlepony/models/races/unicorn.json b/src/main/resources/assets/minelittlepony/models/races/unicorn.json
index eae88d81..fd03bb3b 100644
--- a/src/main/resources/assets/minelittlepony/models/races/unicorn.json
+++ b/src/main/resources/assets/minelittlepony/models/races/unicorn.json
@@ -10,19 +10,19 @@
 			{
 				"type": "mson:slot",
 				"name": "snout",
-				"implementation": "com.minelittlepony.client.model.components.PonySnout",
+				"implementation": "com.minelittlepony.client.model.part.PonySnout",
 				"content: "minelitlepony:components/snout"
 			},
 			{
 				"type": "mson:slot",
 				"name": "ears",
-				"implementation": "com.minelittlepony.client.model.components.PonyEars",
+				"implementation": "com.minelittlepony.client.model.part.PonyEars",
 				"content": "minelittlepony:components/ears"
 			},
 			{
 				"type": "mson:slot",
 				"name": "horn",
-				"implementation": "com.minelittlepony.client.model.components.UnicornHorn",
+				"implementation": "com.minelittlepony.client.model.part.UnicornHorn",
 				"content": "minelittlepony:components/horn"
 			}
 		]
diff --git a/src/main/resources/assets/minelittlepony/models/races/zebra.json b/src/main/resources/assets/minelittlepony/models/races/zebra.json
index 2f952780..d88dcd57 100644
--- a/src/main/resources/assets/minelittlepony/models/races/zebra.json
+++ b/src/main/resources/assets/minelittlepony/models/races/zebra.json
@@ -10,13 +10,13 @@
 			{
 				"type": "mson:slot",
 				"name": "snout",
-				"implementation": "com.minelittlepony.client.model.components.PonySnout",
+				"implementation": "com.minelittlepony.client.model.part.PonySnout",
 				"content: "minelitlepony:components/snout"
 			},
 			{
 				"type": "mson:slot",
 				"name": "ears",
-				"implementation": "com.minelittlepony.client.model.components.PonyEars",
+				"implementation": "com.minelittlepony.client.model.part.PonyEars",
 				"content": "minelittlepony:components/ears"
 			},
 			{
diff --git a/src/main/resources/assets/minelittlepony/models/seapony.json b/src/main/resources/assets/minelittlepony/models/seapony.json
index 3f0b5d42..7b2a39a9 100644
--- a/src/main/resources/assets/minelittlepony/models/seapony.json
+++ b/src/main/resources/assets/minelittlepony/models/seapony.json
@@ -32,7 +32,7 @@
 	"tail": {
 		"type": "mson:slot",
 		"name": "tail",
-		"implementation": "com.minelittlepony.client.model.components.SeaponyTail",
+		"implementation": "com.minelittlepony.client.model.part.SeaponyTail",
 		"content": "minelittlepony:components/fish_tail"
 	}
 }
diff --git a/src/main/resources/assets/minelittlepony/models/steve_pony.json b/src/main/resources/assets/minelittlepony/models/steve_pony.json
index 1fa1b549..e58d63bb 100644
--- a/src/main/resources/assets/minelittlepony/models/steve_pony.json
+++ b/src/main/resources/assets/minelittlepony/models/steve_pony.json
@@ -24,13 +24,13 @@
 			{
 				"type": "mson:slot",
 				"name": "snout",
-				"implementation": "com.minelittlepony.client.model.components.PonySnout",
+				"implementation": "com.minelittlepony.client.model.part.PonySnout",
 				"content: "minelitlepony:components/snout"
 			},
 			{
 				"type": "mson:slot",
 				"name": "ears",
-				"implementation": "com.minelittlepony.client.model.components.PonyEars",
+				"implementation": "com.minelittlepony.client.model.part.PonyEars",
 				"content": "minelittlepony:components/ears"
 			}
 		]
@@ -245,7 +245,7 @@
 	"tail": {
 		"type": "mson:slot",
 		"name": "tail",
-		"implementation": "com.minelittlepony.client.model.components.PonyTail",
+		"implementation": "com.minelittlepony.client.model.part.PonyTail",
 		"content": "minelittlepony:components/tail"
 	},
 	"right_arm": {
diff --git a/src/main/resources/assets/minelittlepony/models/villager.json b/src/main/resources/assets/minelittlepony/models/villager.json
index 9018ff53..b2a6da9f 100644
--- a/src/main/resources/assets/minelittlepony/models/villager.json
+++ b/src/main/resources/assets/minelittlepony/models/villager.json
@@ -10,13 +10,13 @@
 			{
 				"type": "mson:slot",
 				"name": "snout",
-				"implementation": "com.minelittlepony.client.model.components.PonySnout",
+				"implementation": "com.minelittlepony.client.model.part.PonySnout",
 				"content: "minelitlepony:components/snout"
 			},
 			{
 				"type": "mson:slot",
 				"name": "ears",
-				"implementation": "com.minelittlepony.client.model.components.PonyEars",
+				"implementation": "com.minelittlepony.client.model.part.PonyEars",
 				"content": "minelittlepony:components/bat_ears"
 			}
 		]
@@ -24,7 +24,7 @@
 	"bat_wings": {
 		"type": "mson:slot",
 		"name": "wings",
-		"implementation": "com.minelittlepony.client.model.components.BatWings",
+		"implementation": "com.minelittlepony.client.model.part.BatWings",
 		"content: "minelitlepony:components/bat_wings"
 	}
 	"apron": {