diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
index f48f78fc..ebead987 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
@@ -18,13 +18,16 @@ import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+import com.voxelmodpack.hdskins.ducks.INetworkPlayerInfo;
 import com.voxelmodpack.hdskins.gui.GuiSkins;
-import com.voxelmodpack.hdskins.resource.SkinResourceManager;
-import com.voxelmodpack.hdskins.skins.BethlehemSkinServer;
-import com.voxelmodpack.hdskins.skins.LegacySkinServer;
-import com.voxelmodpack.hdskins.skins.ServerType;
-import com.voxelmodpack.hdskins.skins.SkinServer;
-import com.voxelmodpack.hdskins.skins.ValhallaSkinServer;
+import com.voxelmodpack.hdskins.resources.SkinResourceManager;
+import com.voxelmodpack.hdskins.resources.TextureLoader;
+import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
+import com.voxelmodpack.hdskins.server.BethlehemSkinServer;
+import com.voxelmodpack.hdskins.server.LegacySkinServer;
+import com.voxelmodpack.hdskins.server.ServerType;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.server.ValhallaSkinServer;
 import com.voxelmodpack.hdskins.util.CallableFutures;
 import com.voxelmodpack.hdskins.util.MoreStreams;
 import com.voxelmodpack.hdskins.util.PlayerUtil;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java
index d0732b50..43a63b0d 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java
@@ -12,11 +12,12 @@ import com.mumfrey.liteloader.modconfig.ConfigStrategy;
 import com.mumfrey.liteloader.modconfig.ExposableOptions;
 import com.mumfrey.liteloader.util.ModUtilities;
 import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
-import com.voxelmodpack.hdskins.gui.GLWindow;
 import com.voxelmodpack.hdskins.gui.HDSkinsConfigPanel;
 import com.voxelmodpack.hdskins.gui.RenderPlayerModel;
-import com.voxelmodpack.hdskins.skins.SkinServer;
-import com.voxelmodpack.hdskins.skins.SkinServerSerializer;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinServerSerializer;
+import com.voxelmodpack.hdskins.upload.GLWindow;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.resources.IReloadableResourceManager;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java b/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java
index 1b67a94c..4bcabb16 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java
@@ -1,9 +1,10 @@
 package com.voxelmodpack.hdskins;
 
+import com.voxelmodpack.hdskins.upload.IFileDialog;
+import com.voxelmodpack.hdskins.upload.ThreadOpenFilePNG;
+import com.voxelmodpack.hdskins.upload.ThreadSaveFilePNG;
 import com.voxelmodpack.hdskins.util.MoreHttpResponses;
-import com.voxelmodpack.hdskins.upload.awt.IFileDialog;
-import com.voxelmodpack.hdskins.upload.awt.ThreadSaveFilePNG;
-import com.voxelmodpack.hdskins.upload.awt.ThreadOpenFilePNG;
+
 import net.minecraft.client.Minecraft;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java b/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
index 675b80b9..e55e7323 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java
@@ -14,10 +14,11 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
+import com.voxelmodpack.hdskins.resources.PreviewTextureManager;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinUpload;
 import com.voxelmodpack.hdskins.util.MoreHttpResponses;
 import com.voxelmodpack.hdskins.util.NetClient;
-import com.voxelmodpack.hdskins.skins.SkinServer;
-import com.voxelmodpack.hdskins.skins.SkinUpload;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/INetworkPlayerInfo.java b/src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java
similarity index 72%
rename from src/hdskins/java/com/voxelmodpack/hdskins/INetworkPlayerInfo.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java
index 2720bb4d..4585518b 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/INetworkPlayerInfo.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.ducks;
 
 public interface INetworkPlayerInfo {
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
index 8d18191f..5cbe2984 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
@@ -4,9 +4,10 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
-import com.voxelmodpack.hdskins.LocalTexture;
-import com.voxelmodpack.hdskins.LocalTexture.IBlankSkinSupplier;
 import com.voxelmodpack.hdskins.SkinUploader;
+import com.voxelmodpack.hdskins.resources.LocalTexture;
+import com.voxelmodpack.hdskins.resources.LocalTexture.IBlankSkinSupplier;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.SkinManager;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
index b1627153..fba4c62a 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
@@ -10,8 +10,9 @@ import com.voxelmodpack.hdskins.HDSkinManager;
 import com.voxelmodpack.hdskins.SkinChooser;
 import com.voxelmodpack.hdskins.SkinUploader;
 import com.voxelmodpack.hdskins.SkinUploader.ISkinUploadHandler;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.upload.GLWindow;
 import com.voxelmodpack.hdskins.util.CallableFutures;
-import com.voxelmodpack.hdskins.skins.SkinServer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java
index 56cca71c..8b52eabb 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java
@@ -5,6 +5,7 @@ import com.minelittlepony.gui.Checkbox;
 import com.minelittlepony.gui.SettingsPanel;
 import com.voxelmodpack.hdskins.HDSkinManager;
 import com.voxelmodpack.hdskins.LiteModHDSkins;
+import com.voxelmodpack.hdskins.upload.GLWindow;
 
 public class HDSkinsConfigPanel extends SettingsPanel {
     @Override
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java
index f7bd2ff9..fb4bf6b4 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java
@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.voxelmodpack.hdskins.gui.GLWindow;
+import com.voxelmodpack.hdskins.upload.GLWindow;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java
index ff131648..ba4fb4c3 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java
@@ -4,7 +4,7 @@ import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.voxelmodpack.hdskins.HDSkinManager;
-import com.voxelmodpack.hdskins.INetworkPlayerInfo;
+import com.voxelmodpack.hdskins.ducks.INetworkPlayerInfo;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetworkPlayerInfo;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/AsyncCacheLoader.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/AsyncCacheLoader.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java
index e7547ad5..92770458 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/AsyncCacheLoader.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.resources;
 
 import com.google.common.cache.CacheLoader;
 import com.google.common.util.concurrent.ListenableFuture;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java
similarity index 91%
rename from src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java
index 90ff7030..f2ed6f67 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/ImageLoader.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java
@@ -1,7 +1,8 @@
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.resources;
+
+import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage;
+import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
 
-import com.voxelmodpack.hdskins.DynamicTextureImage;
-import com.voxelmodpack.hdskins.ImageBufferDownloadHD;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/LocalTexture.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java
similarity index 94%
rename from src/hdskins/java/com/voxelmodpack/hdskins/LocalTexture.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java
index 83d72b00..2d6c855b 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/LocalTexture.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java
@@ -1,7 +1,10 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage;
+import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.renderer.texture.TextureManager;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTexture.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/PreviewTexture.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java
index f92caf25..868418f4 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTexture.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources;
 
 import net.minecraft.client.renderer.IImageBuffer;
 import net.minecraft.client.renderer.ThreadDownloadImageData;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java
similarity index 88%
rename from src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java
index 9b6cc516..b4e8500f 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java
@@ -1,8 +1,11 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources;
 
 import com.google.common.collect.Maps;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload;
+import com.voxelmodpack.hdskins.resources.texture.ISkinAvailableCallback;
+import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD;
+
 import net.minecraft.client.resources.SkinManager;
 import net.minecraft.util.ResourceLocation;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java
similarity index 90%
rename from src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java
index 59f46576..348ed2cc 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinData.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.resources;
 
 import net.minecraft.util.ResourceLocation;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java
similarity index 99%
rename from src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java
index d02b22df..d894617f 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/SkinResourceManager.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.resources;
 
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/TextureLoader.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java
similarity index 91%
rename from src/hdskins/java/com/voxelmodpack/hdskins/TextureLoader.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java
index 959e0131..82877c3b 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/TextureLoader.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.ITextureObject;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/package-info.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java
similarity index 78%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/package-info.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java
index c590c3dc..a8901f0a 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/package-info.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java
@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.resources;
 
 import mcp.MethodsReturnNonnullByDefault;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/DynamicTextureImage.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java
similarity index 91%
rename from src/hdskins/java/com/voxelmodpack/hdskins/DynamicTextureImage.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java
index 7847e245..f076acee 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/DynamicTextureImage.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import net.minecraft.client.renderer.texture.DynamicTexture;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/IBufferedTexture.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java
similarity index 75%
rename from src/hdskins/java/com/voxelmodpack/hdskins/IBufferedTexture.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java
index 155e0f53..ece6a358 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/IBufferedTexture.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import java.awt.image.BufferedImage;
 import javax.annotation.Nullable;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinAvailableCallback.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java
similarity index 83%
rename from src/hdskins/java/com/voxelmodpack/hdskins/ISkinAvailableCallback.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java
index c4659a36..12f25a30 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinAvailableCallback.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import net.minecraft.client.renderer.IImageBuffer;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java
index 147e0763..7c438910 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java
@@ -1,6 +1,7 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
+import com.voxelmodpack.hdskins.HDSkinManager;
 
 import javax.annotation.Nullable;
 import java.awt.Graphics;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java
similarity index 99%
rename from src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java
index ea625641..35bfb40b 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins;
+package com.voxelmodpack.hdskins.resources.texture;
 
 import com.voxelmodpack.hdskins.util.MoreHttpResponses;
 import net.minecraft.client.renderer.IImageBuffer;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java
similarity index 98%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java
index f6837346..e9fdb626 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java
similarity index 99%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java
index 9d29020b..438544ef 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ServerType.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java
similarity index 87%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/ServerType.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java
index 3f7df569..4c60eb7c 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ServerType.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java
similarity index 89%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java
index db26139e..5804f8b7 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
@@ -27,7 +27,8 @@ public interface SkinServer extends Exposable {
 
     List<SkinServer> defaultServers = Lists.newArrayList(new LegacySkinServer(
             "http://skins.voxelmodpack.com",
-            "http://skinmanager.voxelmodpack.com"));
+            "http://skinmanager.voxelmodpack.com")
+    );
 
     MinecraftTexturesPayload loadProfileData(GameProfile profile) throws IOException;
 
@@ -41,7 +42,7 @@ public interface SkinServer extends Exposable {
         return true;
     }
 
-    public static void verifyServerConnection(Session session, String serverId) throws AuthenticationException {
+    static void verifyServerConnection(Session session, String serverId) throws AuthenticationException {
         MinecraftSessionService service = Minecraft.getMinecraft().getSessionService();
         service.joinServer(session.getProfile(), session.getToken(), serverId);
     }
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServerSerializer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServerSerializer.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java
index f4992bed..01779cbf 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServerSerializer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUpload.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java
similarity index 94%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUpload.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java
index dbcd20bd..14dd0b16 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUpload.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUploadResponse.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java
similarity index 91%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUploadResponse.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java
index fb37fe1d..c132d694 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinUploadResponse.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java
similarity index 99%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java
index 6bba39aa..4841218f 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import com.google.common.base.Preconditions;
 import com.google.gson.JsonObject;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/package-info.java b/src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java
similarity index 79%
rename from src/hdskins/java/com/voxelmodpack/hdskins/skins/package-info.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java
index 4232b554..997d41b5 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/package-info.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java
@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package com.voxelmodpack.hdskins.skins;
+package com.voxelmodpack.hdskins.server;
 
 import mcp.MethodsReturnNonnullByDefault;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java
index 0aac1ef4..d6b2a84e 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.gui;
+package com.voxelmodpack.hdskins.upload;
 
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/FileDropper.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java
similarity index 97%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/FileDropper.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java
index 8c37a5a1..42b600aa 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/FileDropper.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import org.lwjgl.opengl.Display;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java
similarity index 98%
rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java
index 9df285cb..63095f41 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GLWindow.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java
@@ -1,7 +1,6 @@
-package com.voxelmodpack.hdskins.gui;
+package com.voxelmodpack.hdskins.upload;
 
 import com.google.common.collect.Lists;
-import com.voxelmodpack.hdskins.upload.awt.FileDropper;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.DefaultResourcePack;
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IFileCallback.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java
similarity index 64%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IFileCallback.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java
index 25075e79..69a416f6 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IFileCallback.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java
@@ -1,7 +1,8 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import java.io.File;
 
+@FunctionalInterface
 public interface IFileCallback {
     void onDialogClosed(File file, int dialogResults);
 }
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IFileDialog.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java
similarity index 60%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IFileDialog.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java
index 08bed605..7b996303 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/IFileDialog.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 public interface IFileDialog extends Runnable {
     void start();
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java
similarity index 91%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java
index 58d0ec05..913df35c 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java
@@ -1,12 +1,10 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import javax.swing.JFrame;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.voxelmodpack.hdskins.gui.GLWindow;
-
 final class InternalDialog {
 
     private static final Logger LOGGER = LogManager.getLogger();
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java
similarity index 97%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java
index d980515c..8dccbb54 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import net.minecraft.client.Minecraft;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java
similarity index 94%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java
index ccda4df9..fffbe344 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFilePNG.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import net.minecraft.client.Minecraft;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadSaveFile.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java
similarity index 96%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadSaveFile.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java
index 3235016c..a7251581 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadSaveFile.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import net.minecraft.client.Minecraft;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadSaveFilePNG.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java
similarity index 95%
rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadSaveFilePNG.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java
index fbe12f3a..786db60d 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadSaveFilePNG.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java
@@ -1,4 +1,4 @@
-package com.voxelmodpack.hdskins.upload.awt;
+package com.voxelmodpack.hdskins.upload;
 
 import net.minecraft.client.Minecraft;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resource/package-info.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java
similarity index 78%
rename from src/hdskins/java/com/voxelmodpack/hdskins/resource/package-info.java
rename to src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java
index e3758569..188351cf 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/resource/package-info.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java
@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package com.voxelmodpack.hdskins.resource;
+package com.voxelmodpack.hdskins.upload;
 
 import mcp.MethodsReturnNonnullByDefault;
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java b/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java
index c342698d..1f0df66f 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java
@@ -1,7 +1,8 @@
 package com.voxelmodpack.hdskins.util;
 
 import com.google.common.io.CharStreams;
-import com.voxelmodpack.hdskins.skins.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinServer;
+
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
diff --git a/src/main/java/com/minelittlepony/MineLittlePony.java b/src/main/java/com/minelittlepony/MineLittlePony.java
index c6b23bbc..fc6f80dd 100644
--- a/src/main/java/com/minelittlepony/MineLittlePony.java
+++ b/src/main/java/com/minelittlepony/MineLittlePony.java
@@ -7,9 +7,10 @@ import com.minelittlepony.pony.data.PonyDataSerialiser;
 import com.minelittlepony.render.skull.PonySkullRenderer;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.voxelmodpack.hdskins.HDSkinManager;
-import com.voxelmodpack.hdskins.skins.LegacySkinServer;
-import com.voxelmodpack.hdskins.skins.SkinServer;
-import com.voxelmodpack.hdskins.skins.ValhallaSkinServer;
+import com.voxelmodpack.hdskins.server.LegacySkinServer;
+import com.voxelmodpack.hdskins.server.SkinServer;
+import com.voxelmodpack.hdskins.server.ValhallaSkinServer;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.resources.IReloadableResourceManager;
diff --git a/src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java b/src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java
index 39d3f4f9..843fdc7c 100644
--- a/src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java
+++ b/src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java
@@ -3,6 +3,7 @@ package com.minelittlepony.hdskins.gui;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
+
 import net.minecraft.util.ResourceLocation;
 
 /**
diff --git a/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java
index a43805fe..15255d74 100644
--- a/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java
+++ b/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java
@@ -9,7 +9,8 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
 import com.voxelmodpack.hdskins.gui.GuiSkins;
-import com.voxelmodpack.hdskins.skins.SkinServer;
+import com.voxelmodpack.hdskins.server.SkinServer;
+
 import net.minecraft.init.Items;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java b/src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java
index 9ca6a523..e24286a8 100644
--- a/src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java
+++ b/src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java
@@ -1,10 +1,11 @@
 package com.minelittlepony.mixin;
 
-import com.voxelmodpack.hdskins.IBufferedTexture;
 import net.minecraft.client.renderer.ThreadDownloadImageData;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
+import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture;
+
 import java.awt.image.BufferedImage;
 
 @Mixin(ThreadDownloadImageData.class)
diff --git a/src/main/java/com/minelittlepony/pony/data/Pony.java b/src/main/java/com/minelittlepony/pony/data/Pony.java
index da2aa838..258fa4b4 100644
--- a/src/main/java/com/minelittlepony/pony/data/Pony.java
+++ b/src/main/java/com/minelittlepony/pony/data/Pony.java
@@ -3,7 +3,8 @@ package com.minelittlepony.pony.data;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.minelittlepony.MineLittlePony;
-import com.voxelmodpack.hdskins.IBufferedTexture;
+import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.ITextureObject;