diff --git a/...gine/client/texture/ImageDataFactory.java → ...pout/engine/texture/ImageDataFactory.java b/...gine/client/texture/ImageDataFactory.java → ...pout/engine/texture/ImageDataFactory.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

diff --git a/...gine/client/texture/ImageIOImageData.java → ...pout/engine/texture/ImageIOImageData.java b/...gine/client/texture/ImageIOImageData.java → ...pout/engine/texture/ImageIOImageData.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.awt.Color;
 import java.awt.Graphics2D;

diff --git a/...client/texture/InternalTextureLoader.java → ...engine/texture/InternalTextureLoader.java b/...client/texture/InternalTextureLoader.java → ...engine/texture/InternalTextureLoader.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -14,7 +14,7 @@
 
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
-import org.spout.engine.client.loader.ResourceLoader;
+import org.spout.engine.loader.ResourceLoader;
 
 
 /**

diff --git a/...ine/client/texture/LoadableImageData.java → ...out/engine/texture/LoadableImageData.java b/...ine/client/texture/LoadableImageData.java → ...out/engine/texture/LoadableImageData.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...out/engine/client/texture/PNGDecoder.java → .../org/spout/engine/texture/PNGDecoder.java b/...out/engine/client/texture/PNGDecoder.java → .../org/spout/engine/texture/PNGDecoder.java
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.io.EOFException;
 import java.io.IOException;

diff --git a/...t/engine/client/texture/PNGImageData.java → ...rg/spout/engine/texture/PNGImageData.java b/...t/engine/client/texture/PNGImageData.java → ...rg/spout/engine/texture/PNGImageData.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...t/engine/client/texture/TGAImageData.java → ...rg/spout/engine/texture/TGAImageData.java b/...t/engine/client/texture/TGAImageData.java → ...rg/spout/engine/texture/TGAImageData.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;

diff --git a/.../spout/engine/client/texture/Texture.java → ...ava/org/spout/engine/texture/Texture.java b/.../spout/engine/client/texture/Texture.java → ...ava/org/spout/engine/texture/Texture.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 /**
  * The description of a texture loaded by the TextureLoader utility

diff --git a/...ut/engine/client/texture/TextureImpl.java → ...org/spout/engine/texture/TextureImpl.java b/...ut/engine/client/texture/TextureImpl.java → ...org/spout/engine/texture/TextureImpl.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

diff --git a/.../engine/client/texture/TextureLoader.java → ...g/spout/engine/texture/TextureLoader.java b/.../engine/client/texture/TextureLoader.java → ...g/spout/engine/texture/TextureLoader.java
@@ -1,4 +1,4 @@
-package org.spout.engine.client.texture;
+package org.spout.engine.texture;
 
 import java.io.IOException;
 import java.io.InputStream;