diff --git a/src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java b/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java
similarity index 99%
rename from src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java
rename to src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java
index 356312c..a91ff29 100644
--- a/src/main/java/org/saturnclient/cosmetics/CloakFeatureRenderer.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java
@@ -1,8 +1,7 @@
-package org.saturnclient.cosmetics;
+package org.saturnclient.cosmetics.cloak;
 
 import java.util.Arrays;
 
-import org.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.config.Config;
 
diff --git a/src/main/java/org/saturnclient/cosmetics/cloaks/Cloaks.java b/src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java
similarity index 98%
rename from src/main/java/org/saturnclient/cosmetics/cloaks/Cloaks.java
rename to src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java
index 54ac5ef..ef54f85 100644
--- a/src/main/java/org/saturnclient/cosmetics/cloaks/Cloaks.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java
@@ -1,4 +1,4 @@
-package org.saturnclient.cosmetics.cloaks;
+package org.saturnclient.cosmetics.cloak;
 
 import net.minecraft.util.Identifier;
 
@@ -15,8 +15,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.saturnclient.cosmetics.cloaks.utils.AnimatedCloakData;
-import org.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
+import org.saturnclient.cosmetics.cloak.utils.AnimatedCloakData;
+import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils;
 import org.saturnclient.saturnclient.SaturnClient;
 
 /**
diff --git a/src/main/java/org/saturnclient/cosmetics/cloaks/GifDecoder.java b/src/main/java/org/saturnclient/cosmetics/cloak/GifDecoder.java
similarity index 99%
rename from src/main/java/org/saturnclient/cosmetics/cloaks/GifDecoder.java
rename to src/main/java/org/saturnclient/cosmetics/cloak/GifDecoder.java
index 4cd9e5f..dcb4b2b 100644
--- a/src/main/java/org/saturnclient/cosmetics/cloaks/GifDecoder.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloak/GifDecoder.java
@@ -1,4 +1,4 @@
-package org.saturnclient.cosmetics.cloaks;
+package org.saturnclient.cosmetics.cloak;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
diff --git a/src/main/java/org/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java b/src/main/java/org/saturnclient/cosmetics/cloak/utils/AnimatedCloakData.java
similarity index 94%
rename from src/main/java/org/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java
rename to src/main/java/org/saturnclient/cosmetics/cloak/utils/AnimatedCloakData.java
index a7a5479..ca92aa0 100644
--- a/src/main/java/org/saturnclient/cosmetics/cloaks/utils/AnimatedCloakData.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloak/utils/AnimatedCloakData.java
@@ -1,4 +1,4 @@
-package org.saturnclient.cosmetics.cloaks.utils;
+package org.saturnclient.cosmetics.cloak.utils;
 
 import net.minecraft.util.Identifier;
 
diff --git a/src/main/java/org/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java b/src/main/java/org/saturnclient/cosmetics/cloak/utils/IdentifierUtils.java
similarity index 98%
rename from src/main/java/org/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java
rename to src/main/java/org/saturnclient/cosmetics/cloak/utils/IdentifierUtils.java
index a9e752d..93fb940 100644
--- a/src/main/java/org/saturnclient/cosmetics/cloaks/utils/IdentifierUtils.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloak/utils/IdentifierUtils.java
@@ -1,4 +1,4 @@
-package org.saturnclient.cosmetics.cloaks.utils;
+package org.saturnclient.cosmetics.cloak.utils;
 
 import org.saturnclient.saturnclient.SaturnClient;
 import net.minecraft.client.texture.NativeImage;
diff --git a/src/main/java/org/saturnclient/cosmetics/cloaks/utils/RandomUtils.java b/src/main/java/org/saturnclient/cosmetics/cloak/utils/RandomUtils.java
similarity index 96%
rename from src/main/java/org/saturnclient/cosmetics/cloaks/utils/RandomUtils.java
rename to src/main/java/org/saturnclient/cosmetics/cloak/utils/RandomUtils.java
index 744073f..b555d83 100644
--- a/src/main/java/org/saturnclient/cosmetics/cloaks/utils/RandomUtils.java
+++ b/src/main/java/org/saturnclient/cosmetics/cloak/utils/RandomUtils.java
@@ -1,4 +1,4 @@
-package org.saturnclient.cosmetics.cloaks.utils;
+package org.saturnclient.cosmetics.cloak.utils;
 
 import java.util.Random;
 
diff --git a/src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java b/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java
similarity index 98%
rename from src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java
rename to src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java
index c682358..7608246 100644
--- a/src/main/java/org/saturnclient/cosmetics/HatFeatureRenderer.java
+++ b/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java
@@ -1,4 +1,4 @@
-package org.saturnclient.cosmetics;
+package org.saturnclient.cosmetics.hat;
 
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.SaturnClient;
diff --git a/src/main/java/org/saturnclient/cosmetics/Hats.java b/src/main/java/org/saturnclient/cosmetics/hat/Hats.java
similarity index 95%
rename from src/main/java/org/saturnclient/cosmetics/Hats.java
rename to src/main/java/org/saturnclient/cosmetics/hat/Hats.java
index 948c998..6aee225 100644
--- a/src/main/java/org/saturnclient/cosmetics/Hats.java
+++ b/src/main/java/org/saturnclient/cosmetics/hat/Hats.java
@@ -1,4 +1,4 @@
-package org.saturnclient.cosmetics;
+package org.saturnclient.cosmetics.hat;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
index d0c77a9..9d2db7f 100644
--- a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
+++ b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
@@ -7,8 +7,8 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.math.MatrixStack;
 
 import org.saturnclient.cosmetics.Emotes;
-import org.saturnclient.cosmetics.Hats;
-import org.saturnclient.cosmetics.cloaks.Cloaks;
+import org.saturnclient.cosmetics.cloak.Cloaks;
+import org.saturnclient.cosmetics.hat.Hats;
 import org.saturnclient.modules.ModManager;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.config.Config;
diff --git a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
index a0f4b4f..4102704 100644
--- a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
+++ b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java
@@ -3,8 +3,8 @@ package org.saturnclient.saturnclient.client;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import org.saturnclient.cosmetics.Hats;
-import org.saturnclient.cosmetics.cloaks.Cloaks;
+import org.saturnclient.cosmetics.cloak.Cloaks;
+import org.saturnclient.cosmetics.hat.Hats;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 
diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
index 97cef55..5a9228e 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
@@ -7,8 +7,8 @@ import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.entity.player.PlayerEntity;
 
-import org.saturnclient.cosmetics.CloakFeatureRenderer;
-import org.saturnclient.cosmetics.HatFeatureRenderer;
+import org.saturnclient.cosmetics.cloak.CloakFeatureRenderer;
+import org.saturnclient.cosmetics.hat.HatFeatureRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java b/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
index 82d5dee..6cc79d3 100644
--- a/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
+++ b/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java
@@ -11,7 +11,7 @@ import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGUniverse;
 
 import org.jetbrains.annotations.Nullable;
-import org.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
+import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java b/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java
index ad1ff7d..724407a 100644
--- a/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java
+++ b/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java
@@ -1,6 +1,6 @@
 package org.saturnclient.ui2.screens.cosmetics;
 
-import org.saturnclient.cosmetics.cloaks.Cloaks;
+import org.saturnclient.cosmetics.cloak.Cloaks;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.config.AnimationConfig;
diff --git a/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java b/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java
index 6a15046..f21723a 100644
--- a/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java
+++ b/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java
@@ -1,6 +1,6 @@
 package org.saturnclient.ui2.screens.cosmetics;
 
-import org.saturnclient.cosmetics.Hats;
+import org.saturnclient.cosmetics.hat.Hats;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.saturnclient.config.AnimationConfig;
diff --git a/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java b/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
index 6518e91..2978972 100644
--- a/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
+++ b/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
@@ -1,6 +1,6 @@
 package org.saturnclient.ui2.screens.store;
 
-import org.saturnclient.cosmetics.cloaks.Cloaks;
+import org.saturnclient.cosmetics.cloak.Cloaks;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
diff --git a/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java b/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
index ea32ee5..328f701 100644
--- a/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
+++ b/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
@@ -1,6 +1,6 @@
 package org.saturnclient.ui2.screens.store;
 
-import org.saturnclient.cosmetics.Hats;
+import org.saturnclient.cosmetics.hat.Hats;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;