diff --git a/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java b/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java
index 5f9d4ec..98b536e 100644
--- a/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java
+++ b/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java
@@ -11,8 +11,6 @@ import net.minecraft.client.render.entity.feature.FeatureRendererContext;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Identifier;
 
 public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState, PlayerEntityModel> {
     public HatFeatureRenderer(FeatureRendererContext<PlayerEntityRenderState, PlayerEntityModel> context) {
@@ -22,10 +20,9 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
     @Override
     public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
             PlayerEntityRenderState state, float limbAngle, float limbDistance) {
-        ItemStack headItem = state.equippedHeadStack;
         SaturnPlayer player = SaturnPlayer.get(state.name);
 
-        if (!headItem.isEmpty() || state.invisible || player == null || player.hat.isEmpty()) {
+        if (state.invisible || player == null || player.hat.isEmpty()) {
             return;
         }
 
@@ -33,9 +30,9 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
 
         this.getContextModel().head.rotate(matrices);
 
-        ObjModel.of(Identifier.of("saturnclient", "models/cosmetic/" + player.hat.split("_")[0] + "/model")).render(
-                MtlLoader.cosmetic(player.hat),
-                matrices, vertexConsumers, light, OverlayTexture.DEFAULT_UV);
+        ObjModel.cosmetic("hat", player.hat).render(MtlLoader.cosmetic(player.hat),
+                matrices, vertexConsumers, light,
+                OverlayTexture.DEFAULT_UV);
 
         matrices.pop();
     }
diff --git a/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java b/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java
index b4a8426..22ce3b9 100644
--- a/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java
+++ b/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java
@@ -52,6 +52,6 @@ public class MtlLoader {
         if (mtlId.isEmpty())
             mtlId = "white";
 
-        return of(Identifier.of("saturnclient", "models/cosmetic/" + mtlId + ".mtl"));
+        return of(Identifier.of("saturnclient", "models/cosmetic/materials/" + mtlId + ".mtl"));
     }
 }
diff --git a/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java b/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java
index 5ca61ff..6cf3323 100644
--- a/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java
+++ b/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java
@@ -35,6 +35,10 @@ public class ObjModel {
     Obj obj;
     Config config;
 
+    public static ObjModel cosmetic(String cosmeticKind, String id) {
+        return of(Identifier.of("saturnclient", "models/cosmetic/" + cosmeticKind + "/" + id.split("_")[0] + "/model"));
+    }
+
     public static ObjModel of(Identifier obj) {
         if (loadedObjModels.containsKey(obj))
             return loadedObjModels.get(obj);
diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/halo/model.json b/src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.json
similarity index 100%
rename from src/main/resources/assets/saturnclient/models/cosmetic/halo/model.json
rename to src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.json
diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/halo/model.obj b/src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.obj
similarity index 100%
rename from src/main/resources/assets/saturnclient/models/cosmetic/halo/model.obj
rename to src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.obj
diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/horns/model.json b/src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.json
similarity index 100%
rename from src/main/resources/assets/saturnclient/models/cosmetic/horns/model.json
rename to src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.json
diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/horns/model.obj b/src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.obj
similarity index 100%
rename from src/main/resources/assets/saturnclient/models/cosmetic/horns/model.obj
rename to src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.obj
diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/black.mtl b/src/main/resources/assets/saturnclient/models/cosmetic/materials/black.mtl
similarity index 100%
rename from src/main/resources/assets/saturnclient/models/cosmetic/black.mtl
rename to src/main/resources/assets/saturnclient/models/cosmetic/materials/black.mtl
diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/white.mtl b/src/main/resources/assets/saturnclient/models/cosmetic/materials/white.mtl
similarity index 100%
rename from src/main/resources/assets/saturnclient/models/cosmetic/white.mtl
rename to src/main/resources/assets/saturnclient/models/cosmetic/materials/white.mtl