diff --git a/gradle.properties b/gradle.properties
index ba0cadb..0826efc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 mod.name=Additional
 mod.id=additional
-mod.version=3.0.3
+mod.version=3.0.4
 
 minecraft.version=1.8.9
 loom.platform=forge
diff --git a/src/main/java/me/waffles/additional/Additional.java b/src/main/java/me/waffles/additional/Additional.java
index 77a5607..64355c8 100644
--- a/src/main/java/me/waffles/additional/Additional.java
+++ b/src/main/java/me/waffles/additional/Additional.java
@@ -11,10 +11,10 @@
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import me.waffles.additional.mixin.EntityLivingBaseAccessor;
-import me.waffles.additional.util.Bedwars;
-import me.waffles.additional.util.Duels;
+import me.waffles.additional.playerData.Bedwars;
+import me.waffles.additional.playerData.Duels;
 import me.waffles.additional.util.EldestRemovalMap;
-import me.waffles.additional.util.PlayerProfile;
+import me.waffles.additional.playerData.PlayerProfile;
 
 @Mod(modid = Additional.MODID, name = Additional.NAME, version = Additional.VERSION)
 public class Additional {
diff --git a/src/main/java/me/waffles/additional/command/BedwarsStatsCommand.java b/src/main/java/me/waffles/additional/command/BedwarsStatsCommand.java
index 30a0176..77a1804 100644
--- a/src/main/java/me/waffles/additional/command/BedwarsStatsCommand.java
+++ b/src/main/java/me/waffles/additional/command/BedwarsStatsCommand.java
@@ -6,9 +6,9 @@
 import cc.polyfrost.oneconfig.utils.commands.annotations.Main;
 import com.mojang.authlib.GameProfile;
 import me.waffles.additional.Additional;
-import me.waffles.additional.util.Bedwars;
+import me.waffles.additional.playerData.Bedwars;
 import me.waffles.additional.util.HypixelAPIUtils;
-import me.waffles.additional.util.PlayerProfile;
+import me.waffles.additional.playerData.PlayerProfile;
 import net.minecraft.client.Minecraft;
 
 import java.io.IOException;
diff --git a/src/main/java/me/waffles/additional/command/DuelsStatsCommand.java b/src/main/java/me/waffles/additional/command/DuelsStatsCommand.java
index fd054c3..1a463fd 100644
--- a/src/main/java/me/waffles/additional/command/DuelsStatsCommand.java
+++ b/src/main/java/me/waffles/additional/command/DuelsStatsCommand.java
@@ -7,8 +7,8 @@
 import com.mojang.authlib.GameProfile;
 import me.waffles.additional.Additional;
 import me.waffles.additional.util.HypixelAPIUtils;
-import me.waffles.additional.util.Duels;
-import me.waffles.additional.util.PlayerProfile;
+import me.waffles.additional.playerData.Duels;
+import me.waffles.additional.playerData.PlayerProfile;
 import net.minecraft.client.Minecraft;
 
 import java.util.NavigableMap;
diff --git a/src/main/java/me/waffles/additional/util/Bedwars.java b/src/main/java/me/waffles/additional/playerData/Bedwars.java
similarity index 96%
rename from src/main/java/me/waffles/additional/util/Bedwars.java
rename to src/main/java/me/waffles/additional/playerData/Bedwars.java
index af35eda..e4d0011 100644
--- a/src/main/java/me/waffles/additional/util/Bedwars.java
+++ b/src/main/java/me/waffles/additional/playerData/Bedwars.java
@@ -1,4 +1,4 @@
-package me.waffles.additional.util;
+package me.waffles.additional.playerData;
 
 public class Bedwars {
     private final int Bedwarsstar;
diff --git a/src/main/java/me/waffles/additional/util/Duels.java b/src/main/java/me/waffles/additional/playerData/Duels.java
similarity index 96%
rename from src/main/java/me/waffles/additional/util/Duels.java
rename to src/main/java/me/waffles/additional/playerData/Duels.java
index c1b0373..9eac399 100644
--- a/src/main/java/me/waffles/additional/util/Duels.java
+++ b/src/main/java/me/waffles/additional/playerData/Duels.java
@@ -1,4 +1,4 @@
-package me.waffles.additional.util;
+package me.waffles.additional.playerData;
 
 public class Duels {
     private final int Duelswins;
diff --git a/src/main/java/me/waffles/additional/util/PlayerProfile.java b/src/main/java/me/waffles/additional/playerData/PlayerProfile.java
similarity index 91%
rename from src/main/java/me/waffles/additional/util/PlayerProfile.java
rename to src/main/java/me/waffles/additional/playerData/PlayerProfile.java
index dcf642e..8909152 100644
--- a/src/main/java/me/waffles/additional/util/PlayerProfile.java
+++ b/src/main/java/me/waffles/additional/playerData/PlayerProfile.java
@@ -1,4 +1,4 @@
-package me.waffles.additional.util;
+package me.waffles.additional.playerData;
 
 public class PlayerProfile {
     private final String displayName, rank, guildTag;
diff --git a/src/main/java/me/waffles/additional/util/HypixelAPIUtils.java b/src/main/java/me/waffles/additional/util/HypixelAPIUtils.java
index fb4f688..7622ca4 100644
--- a/src/main/java/me/waffles/additional/util/HypixelAPIUtils.java
+++ b/src/main/java/me/waffles/additional/util/HypixelAPIUtils.java
@@ -5,6 +5,9 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import me.waffles.additional.command.DuelsStatsCommand;
+import me.waffles.additional.playerData.Bedwars;
+import me.waffles.additional.playerData.Duels;
+import me.waffles.additional.playerData.PlayerProfile;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -91,14 +94,14 @@ public static PlayerProfile parsePlayerProfilePlayerData(String json, String gui
                 : null;
 
         if(tag != null) {
-            if(tag.contains("✧")) tag = tag.replaceAll("✧", "✧");
-            if(tag.contains("Î")) tag = tag.replaceAll("Î", "Θ");
-            if(tag.contains("✌")) tag = tag.replaceAll("✌", "✌");
-            if(tag.contains("â?¤")) tag = tag.replaceAll("â?¤", "❤");
-            if(tag.contains("✿")) tag = tag.replaceAll("✿", "✿");
-            if(tag.contains("✪")) tag = tag.replaceAll("✪", "✪");
-            if(tag.contains("➊")) tag = tag.replaceAll("➊", "➊");
-            if(tag.contains("✖")) tag = tag.replaceAll("✖", "✖");
+            tag = tag.replaceAll("✧", "✧")
+                    .replaceAll("Θ", "Θ")
+                    .replaceAll("✌", "✌")
+                    .replaceAll("â?¤", "❤")
+                    .replaceAll("✿", "✿")
+                    .replaceAll("✪", "✪")
+                    .replaceAll("➊", "➊")
+                    .replaceAll("✖", "✖");
         }
         
         String tagColor = guildObject.has("tagColor")