diff --git a/src/main/java/noppes/npcs/client/Client.java b/src/main/java/noppes/npcs/client/Client.java
index 5247e7bed..63dd8ec36 100644
--- a/src/main/java/noppes/npcs/client/Client.java
+++ b/src/main/java/noppes/npcs/client/Client.java
@@ -8,7 +8,6 @@ import noppes.npcs.CustomNpcs;
 import noppes.npcs.Server;
 import noppes.npcs.client.gui.OverlayQuestTracking;
 import noppes.npcs.client.gui.customoverlay.OverlayCustom;
-import noppes.npcs.client.renderer.customitem.ImageData;
 import noppes.npcs.constants.EnumPacketServer;
 import noppes.npcs.controllers.data.SkinOverlay;
 
diff --git a/src/main/java/noppes/npcs/client/ClientCache.java b/src/main/java/noppes/npcs/client/ClientCacheHandler.java
similarity index 86%
rename from src/main/java/noppes/npcs/client/ClientCache.java
rename to src/main/java/noppes/npcs/client/ClientCacheHandler.java
index 85b82e844..51a0af9d8 100644
--- a/src/main/java/noppes/npcs/client/ClientCache.java
+++ b/src/main/java/noppes/npcs/client/ClientCacheHandler.java
@@ -1,9 +1,9 @@
 package noppes.npcs.client;
 
-import noppes.npcs.client.renderer.customitem.ImageData;
+import noppes.npcs.client.renderer.ImageData;
 import noppes.npcs.util.CacheHashMap;
 
-public class ClientCache {
+public class ClientCacheHandler {
     private static final CacheHashMap<String, CacheHashMap.CachedObject<ImageData>> imageDataCache = new CacheHashMap<>(10*60*1000);
 
     public static ImageData getImageData(String directory) {
diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java
index f5bb21fb9..1f65abc32 100644
--- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java
+++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java
@@ -9,26 +9,14 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.ITextureObject;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.util.ResourceLocation;
 import noppes.npcs.api.gui.ICustomGuiComponent;
-import noppes.npcs.client.Client;
-import noppes.npcs.client.ClientCache;
-import noppes.npcs.client.ImageDownloadAlt;
+import noppes.npcs.client.ClientCacheHandler;
 import noppes.npcs.client.gui.custom.GuiCustom;
 import noppes.npcs.client.gui.custom.interfaces.IClickListener;
-import noppes.npcs.client.renderer.ImageBufferDownloadAlt;
-import noppes.npcs.client.renderer.customitem.ImageData;
+import noppes.npcs.client.renderer.ImageData;
 import noppes.npcs.scripted.gui.ScriptGuiButton;
 import org.lwjgl.opengl.GL11;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-
 public class CustomGuiButton extends GuiButton implements IClickListener {
     GuiCustom parent;
 
@@ -63,7 +51,7 @@ public class CustomGuiButton extends GuiButton implements IClickListener {
         this.textureY = textureY;
         this.label = buttonText;
         if (texture != null && !texture.isEmpty()) {
-            this.imageData = ClientCache.getImageData(texture);
+            this.imageData = ClientCacheHandler.getImageData(texture);
         }
     }
 
diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java
index af16d4907..89ef316a6 100644
--- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java
+++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java
@@ -6,28 +6,16 @@
 package noppes.npcs.client.gui.custom.components;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.util.ResourceLocation;
 import noppes.npcs.api.gui.ICustomGuiComponent;
-import noppes.npcs.client.Client;
-import noppes.npcs.client.ClientCache;
-import noppes.npcs.client.ImageDownloadAlt;
+import noppes.npcs.client.ClientCacheHandler;
 import noppes.npcs.client.gui.custom.GuiCustom;
 import noppes.npcs.client.gui.custom.interfaces.IGuiComponent;
-import noppes.npcs.client.renderer.ImageBufferDownloadAlt;
-import noppes.npcs.client.renderer.customitem.ImageData;
+import noppes.npcs.client.renderer.ImageData;
 import noppes.npcs.scripted.gui.ScriptGuiTexturedRect;
 import org.lwjgl.opengl.GL11;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-
 public class CustomGuiTexturedRect extends Gui implements IGuiComponent {
     GuiCustom parent;
 
@@ -62,7 +50,7 @@ public class CustomGuiTexturedRect extends Gui implements IGuiComponent {
         this.textureX = textureX;
         this.textureY = textureY;
         if (texture != null && !texture.isEmpty()) {
-            this.imageData = ClientCache.getImageData(texture);
+            this.imageData = ClientCacheHandler.getImageData(texture);
         }
     }
 
diff --git a/src/main/java/noppes/npcs/client/renderer/customitem/ImageData.java b/src/main/java/noppes/npcs/client/renderer/ImageData.java
similarity index 98%
rename from src/main/java/noppes/npcs/client/renderer/customitem/ImageData.java
rename to src/main/java/noppes/npcs/client/renderer/ImageData.java
index 1be88063a..11013ebb0 100644
--- a/src/main/java/noppes/npcs/client/renderer/customitem/ImageData.java
+++ b/src/main/java/noppes/npcs/client/renderer/ImageData.java
@@ -1,4 +1,4 @@
-package noppes.npcs.client.renderer.customitem;
+package noppes.npcs.client.renderer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureManager;
diff --git a/src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java b/src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java
index d831fb727..5a3518690 100644
--- a/src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java
@@ -6,24 +6,20 @@ import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.resources.IResource;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
-import noppes.npcs.client.Client;
-import noppes.npcs.client.ClientCache;
+import noppes.npcs.client.ClientCacheHandler;
+import noppes.npcs.client.renderer.ImageData;
 import noppes.npcs.items.ItemScripted;
 import noppes.npcs.scripted.item.ScriptCustomItem;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Random;
 
 import static net.minecraft.client.renderer.entity.RenderItem.renderInFrame;
@@ -50,7 +46,7 @@ public class CustomItemRenderer implements IItemRenderer {
     public void renderItem(ItemRenderType type, ItemStack itemStack, Object... data) {
         ScriptCustomItem scriptCustomItem = ItemScripted.GetWrapper(itemStack);
 
-        BufferedImage bufferedImage = ClientCache.getImageData(scriptCustomItem.texture).getBufferedImage();
+        BufferedImage bufferedImage = ClientCacheHandler.getImageData(scriptCustomItem.texture).getBufferedImage();
         if (bufferedImage != null && (scriptCustomItem.width != bufferedImage.getWidth() || scriptCustomItem.height != bufferedImage.getHeight())) {
             scriptCustomItem.width = bufferedImage.getWidth();
             scriptCustomItem.height = bufferedImage.getHeight();
@@ -137,7 +133,7 @@ public class CustomItemRenderer implements IItemRenderer {
         int pass = 0;
 
         GL11.glPushMatrix();
-            ClientCache.getImageData(scriptCustomItem.texture).bindTexture();
+            ClientCacheHandler.getImageData(scriptCustomItem.texture).bindTexture();
 
             Tessellator tessellator = Tessellator.instance;
 
@@ -192,7 +188,7 @@ public class CustomItemRenderer implements IItemRenderer {
                     // Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug...
                     GL11.glTranslatef(0f, 0f, f9 + f10);
 
-                    ImageData imageData = ClientCache.getImageData(scriptCustomItem.texture);
+                    ImageData imageData = ClientCacheHandler.getImageData(scriptCustomItem.texture);
                     ItemRenderer.renderItemIn2D(tessellator, f15, f4, f14, f5, imageData.getTotalWidth(), imageData.getTotalHeight(), f9);
 
                     if (itemStack.hasEffect(pass))
@@ -292,7 +288,7 @@ public class CustomItemRenderer implements IItemRenderer {
             GL11.glDisable(GL11.GL_LIGHTING); //Forge: Make sure that render states are reset, a renderEffect can derp them up.
             GL11.glEnable(GL11.GL_ALPHA_TEST);
 
-            ClientCache.getImageData(scriptCustomItem.texture).bindTexture();
+            ClientCacheHandler.getImageData(scriptCustomItem.texture).bindTexture();
             renderCustomItemSlot(0,0,16,16, itemRed, itemGreen, itemBlue);
 
             GL11.glEnable(GL11.GL_LIGHTING);
@@ -367,7 +363,7 @@ public class CustomItemRenderer implements IItemRenderer {
         TextureManager texturemanager = mc.getTextureManager();
         int par3 = 0;
 
-        ClientCache.getImageData(scriptCustomItem.texture).bindTexture();
+        ClientCacheHandler.getImageData(scriptCustomItem.texture).bindTexture();
 
         Tessellator tessellator = Tessellator.instance;
         IIcon icon = entityLivingBase.getItemIcon(itemStack, par3);
@@ -422,7 +418,7 @@ public class CustomItemRenderer implements IItemRenderer {
 
     public static void renderCustomItemIn2D(ItemStack itemStack, Tessellator p_78439_0_, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, float p_78439_7_)
     {
-        ImageData imageData = ClientCache.getImageData(ItemScripted.GetWrapper(itemStack).texture);
+        ImageData imageData = ClientCacheHandler.getImageData(ItemScripted.GetWrapper(itemStack).texture);
         int width = imageData.getTotalWidth();
         int height = imageData.getTotalHeight();