diff --git a/.classpath b/.classpath
index 981abc7..08da7a2 100644
--- a/.classpath
+++ b/.classpath
@@ -2,12 +2,12 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft Client/libraries/natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft Client/jars/natives"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/teavm/java">
+	<classpathentry kind="src" path="src/lwjgl/java">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft Client/libraries/natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft Client/jars/natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
@@ -21,7 +21,7 @@
 	<classpathentry kind="lib" path="jars/jzlib-1.1.3.jar"/>
 	<classpathentry kind="lib" path="jars/lwjgl.jar">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jars/natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft Client/jars/natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/lwjgl_util.jar"/>
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Matrix.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/Matrix.java
deleted file mode 100644
index d620fa0..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Matrix.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-import java.io.Serializable;
-import java.nio.FloatBuffer;
-
-public abstract class Matrix implements Serializable {
-
-	protected Matrix() {
-		super();
-	}
-
-	public abstract Matrix setIdentity();
-
-	public abstract Matrix invert();
-
-	public abstract Matrix load(FloatBuffer buf);
-
-	public abstract Matrix loadTranspose(FloatBuffer buf);
-
-	public abstract Matrix negate();
-
-	public abstract Matrix store(FloatBuffer buf);
-
-	public abstract Matrix storeTranspose(FloatBuffer buf);
-
-	public abstract Matrix transpose();
-
-	public abstract Matrix setZero();
-
-	public abstract float determinant();
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Matrix4f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/Matrix4f.java
deleted file mode 100644
index faa5eef..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Matrix4f.java
+++ /dev/null
@@ -1,608 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-import java.io.Serializable;
-import java.nio.FloatBuffer;
-
-public class Matrix4f extends Matrix implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	public float m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33;
-
-	public Matrix4f() {
-		super();
-		setIdentity();
-	}
-
-	public Matrix4f(final Matrix4f src) {
-		super();
-		load(src);
-	}
-
-	public String toString() {
-		StringBuilder buf = new StringBuilder();
-		buf.append(m00).append(' ').append(m10).append(' ').append(m20).append(' ').append(m30).append('\n');
-		buf.append(m01).append(' ').append(m11).append(' ').append(m21).append(' ').append(m31).append('\n');
-		buf.append(m02).append(' ').append(m12).append(' ').append(m22).append(' ').append(m32).append('\n');
-		buf.append(m03).append(' ').append(m13).append(' ').append(m23).append(' ').append(m33).append('\n');
-		return buf.toString();
-	}
-
-	public Matrix setIdentity() {
-		return setIdentity(this);
-	}
-
-	public static Matrix4f setIdentity(Matrix4f m) {
-		m.m00 = 1.0f;
-		m.m01 = 0.0f;
-		m.m02 = 0.0f;
-		m.m03 = 0.0f;
-		m.m10 = 0.0f;
-		m.m11 = 1.0f;
-		m.m12 = 0.0f;
-		m.m13 = 0.0f;
-		m.m20 = 0.0f;
-		m.m21 = 0.0f;
-		m.m22 = 1.0f;
-		m.m23 = 0.0f;
-		m.m30 = 0.0f;
-		m.m31 = 0.0f;
-		m.m32 = 0.0f;
-		m.m33 = 1.0f;
-
-		return m;
-	}
-
-	public Matrix setZero() {
-		return setZero(this);
-	}
-
-	public static Matrix4f setZero(Matrix4f m) {
-		m.m00 = 0.0f;
-		m.m01 = 0.0f;
-		m.m02 = 0.0f;
-		m.m03 = 0.0f;
-		m.m10 = 0.0f;
-		m.m11 = 0.0f;
-		m.m12 = 0.0f;
-		m.m13 = 0.0f;
-		m.m20 = 0.0f;
-		m.m21 = 0.0f;
-		m.m22 = 0.0f;
-		m.m23 = 0.0f;
-		m.m30 = 0.0f;
-		m.m31 = 0.0f;
-		m.m32 = 0.0f;
-		m.m33 = 0.0f;
-
-		return m;
-	}
-
-	public Matrix4f load(Matrix4f src) {
-		return load(src, this);
-	}
-
-	public static Matrix4f load(Matrix4f src, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-		dest.m00 = src.m00;
-		dest.m01 = src.m01;
-		dest.m02 = src.m02;
-		dest.m03 = src.m03;
-		dest.m10 = src.m10;
-		dest.m11 = src.m11;
-		dest.m12 = src.m12;
-		dest.m13 = src.m13;
-		dest.m20 = src.m20;
-		dest.m21 = src.m21;
-		dest.m22 = src.m22;
-		dest.m23 = src.m23;
-		dest.m30 = src.m30;
-		dest.m31 = src.m31;
-		dest.m32 = src.m32;
-		dest.m33 = src.m33;
-
-		return dest;
-	}
-
-	public Matrix load(FloatBuffer buf) {
-
-		m00 = buf.get();
-		m01 = buf.get();
-		m02 = buf.get();
-		m03 = buf.get();
-		m10 = buf.get();
-		m11 = buf.get();
-		m12 = buf.get();
-		m13 = buf.get();
-		m20 = buf.get();
-		m21 = buf.get();
-		m22 = buf.get();
-		m23 = buf.get();
-		m30 = buf.get();
-		m31 = buf.get();
-		m32 = buf.get();
-		m33 = buf.get();
-
-		return this;
-	}
-
-	public Matrix loadTranspose(FloatBuffer buf) {
-
-		m00 = buf.get();
-		m10 = buf.get();
-		m20 = buf.get();
-		m30 = buf.get();
-		m01 = buf.get();
-		m11 = buf.get();
-		m21 = buf.get();
-		m31 = buf.get();
-		m02 = buf.get();
-		m12 = buf.get();
-		m22 = buf.get();
-		m32 = buf.get();
-		m03 = buf.get();
-		m13 = buf.get();
-		m23 = buf.get();
-		m33 = buf.get();
-
-		return this;
-	}
-
-	public Matrix store(FloatBuffer buf) {
-		buf.put(m00);
-		buf.put(m01);
-		buf.put(m02);
-		buf.put(m03);
-		buf.put(m10);
-		buf.put(m11);
-		buf.put(m12);
-		buf.put(m13);
-		buf.put(m20);
-		buf.put(m21);
-		buf.put(m22);
-		buf.put(m23);
-		buf.put(m30);
-		buf.put(m31);
-		buf.put(m32);
-		buf.put(m33);
-		return this;
-	}
-	
-	public Matrix store(float[] buf) {
-		buf[0] = m00;
-		buf[1] = m01;
-		buf[2] = m02;
-		buf[3] = m03;
-		buf[4] = m10;
-		buf[5] = m11;
-		buf[6] = m12;
-		buf[7] = m13;
-		buf[8] = m20;
-		buf[9] = m21;
-		buf[10] = m22;
-		buf[11] = m23;
-		buf[12] = m30;
-		buf[13] = m31;
-		buf[14] = m32;
-		buf[15] = m33;
-		return this;
-	}
-
-	public Matrix storeTranspose(FloatBuffer buf) {
-		buf.put(m00);
-		buf.put(m10);
-		buf.put(m20);
-		buf.put(m30);
-		buf.put(m01);
-		buf.put(m11);
-		buf.put(m21);
-		buf.put(m31);
-		buf.put(m02);
-		buf.put(m12);
-		buf.put(m22);
-		buf.put(m32);
-		buf.put(m03);
-		buf.put(m13);
-		buf.put(m23);
-		buf.put(m33);
-		return this;
-	}
-
-	public Matrix store3f(FloatBuffer buf) {
-		buf.put(m00);
-		buf.put(m01);
-		buf.put(m02);
-		buf.put(m10);
-		buf.put(m11);
-		buf.put(m12);
-		buf.put(m20);
-		buf.put(m21);
-		buf.put(m22);
-		return this;
-	}
-
-	public static Matrix4f add(Matrix4f left, Matrix4f right, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-
-		dest.m00 = left.m00 + right.m00;
-		dest.m01 = left.m01 + right.m01;
-		dest.m02 = left.m02 + right.m02;
-		dest.m03 = left.m03 + right.m03;
-		dest.m10 = left.m10 + right.m10;
-		dest.m11 = left.m11 + right.m11;
-		dest.m12 = left.m12 + right.m12;
-		dest.m13 = left.m13 + right.m13;
-		dest.m20 = left.m20 + right.m20;
-		dest.m21 = left.m21 + right.m21;
-		dest.m22 = left.m22 + right.m22;
-		dest.m23 = left.m23 + right.m23;
-		dest.m30 = left.m30 + right.m30;
-		dest.m31 = left.m31 + right.m31;
-		dest.m32 = left.m32 + right.m32;
-		dest.m33 = left.m33 + right.m33;
-
-		return dest;
-	}
-
-	public static Matrix4f sub(Matrix4f left, Matrix4f right, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-
-		dest.m00 = left.m00 - right.m00;
-		dest.m01 = left.m01 - right.m01;
-		dest.m02 = left.m02 - right.m02;
-		dest.m03 = left.m03 - right.m03;
-		dest.m10 = left.m10 - right.m10;
-		dest.m11 = left.m11 - right.m11;
-		dest.m12 = left.m12 - right.m12;
-		dest.m13 = left.m13 - right.m13;
-		dest.m20 = left.m20 - right.m20;
-		dest.m21 = left.m21 - right.m21;
-		dest.m22 = left.m22 - right.m22;
-		dest.m23 = left.m23 - right.m23;
-		dest.m30 = left.m30 - right.m30;
-		dest.m31 = left.m31 - right.m31;
-		dest.m32 = left.m32 - right.m32;
-		dest.m33 = left.m33 - right.m33;
-
-		return dest;
-	}
-
-	public static Matrix4f mul(Matrix4f left, Matrix4f right, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-
-		float m00 = left.m00 * right.m00 + left.m10 * right.m01 + left.m20 * right.m02 + left.m30 * right.m03;
-		float m01 = left.m01 * right.m00 + left.m11 * right.m01 + left.m21 * right.m02 + left.m31 * right.m03;
-		float m02 = left.m02 * right.m00 + left.m12 * right.m01 + left.m22 * right.m02 + left.m32 * right.m03;
-		float m03 = left.m03 * right.m00 + left.m13 * right.m01 + left.m23 * right.m02 + left.m33 * right.m03;
-		float m10 = left.m00 * right.m10 + left.m10 * right.m11 + left.m20 * right.m12 + left.m30 * right.m13;
-		float m11 = left.m01 * right.m10 + left.m11 * right.m11 + left.m21 * right.m12 + left.m31 * right.m13;
-		float m12 = left.m02 * right.m10 + left.m12 * right.m11 + left.m22 * right.m12 + left.m32 * right.m13;
-		float m13 = left.m03 * right.m10 + left.m13 * right.m11 + left.m23 * right.m12 + left.m33 * right.m13;
-		float m20 = left.m00 * right.m20 + left.m10 * right.m21 + left.m20 * right.m22 + left.m30 * right.m23;
-		float m21 = left.m01 * right.m20 + left.m11 * right.m21 + left.m21 * right.m22 + left.m31 * right.m23;
-		float m22 = left.m02 * right.m20 + left.m12 * right.m21 + left.m22 * right.m22 + left.m32 * right.m23;
-		float m23 = left.m03 * right.m20 + left.m13 * right.m21 + left.m23 * right.m22 + left.m33 * right.m23;
-		float m30 = left.m00 * right.m30 + left.m10 * right.m31 + left.m20 * right.m32 + left.m30 * right.m33;
-		float m31 = left.m01 * right.m30 + left.m11 * right.m31 + left.m21 * right.m32 + left.m31 * right.m33;
-		float m32 = left.m02 * right.m30 + left.m12 * right.m31 + left.m22 * right.m32 + left.m32 * right.m33;
-		float m33 = left.m03 * right.m30 + left.m13 * right.m31 + left.m23 * right.m32 + left.m33 * right.m33;
-
-		dest.m00 = m00;
-		dest.m01 = m01;
-		dest.m02 = m02;
-		dest.m03 = m03;
-		dest.m10 = m10;
-		dest.m11 = m11;
-		dest.m12 = m12;
-		dest.m13 = m13;
-		dest.m20 = m20;
-		dest.m21 = m21;
-		dest.m22 = m22;
-		dest.m23 = m23;
-		dest.m30 = m30;
-		dest.m31 = m31;
-		dest.m32 = m32;
-		dest.m33 = m33;
-
-		return dest;
-	}
-
-	public static Vector4f transform(Matrix4f left, Vector4f right, Vector4f dest) {
-		if (dest == null)
-			dest = new Vector4f();
-
-		float x = left.m00 * right.x + left.m10 * right.y + left.m20 * right.z + left.m30 * right.w;
-		float y = left.m01 * right.x + left.m11 * right.y + left.m21 * right.z + left.m31 * right.w;
-		float z = left.m02 * right.x + left.m12 * right.y + left.m22 * right.z + left.m32 * right.w;
-		float w = left.m03 * right.x + left.m13 * right.y + left.m23 * right.z + left.m33 * right.w;
-
-		dest.x = x;
-		dest.y = y;
-		dest.z = z;
-		dest.w = w;
-
-		return dest;
-	}
-
-	public Matrix transpose() {
-		return transpose(this);
-	}
-
-	public Matrix4f translate(Vector2f vec) {
-		return translate(vec, this);
-	}
-
-	public Matrix4f translate(Vector3f vec) {
-		return translate(vec, this);
-	}
-
-	public Matrix4f scale(Vector3f vec) {
-		return scale(vec, this, this);
-	}
-
-	public static Matrix4f scale(Vector3f vec, Matrix4f src, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-		dest.m00 = src.m00 * vec.x;
-		dest.m01 = src.m01 * vec.x;
-		dest.m02 = src.m02 * vec.x;
-		dest.m03 = src.m03 * vec.x;
-		dest.m10 = src.m10 * vec.y;
-		dest.m11 = src.m11 * vec.y;
-		dest.m12 = src.m12 * vec.y;
-		dest.m13 = src.m13 * vec.y;
-		dest.m20 = src.m20 * vec.z;
-		dest.m21 = src.m21 * vec.z;
-		dest.m22 = src.m22 * vec.z;
-		dest.m23 = src.m23 * vec.z;
-		return dest;
-	}
-
-	public Matrix4f rotate(float angle, Vector3f axis) {
-		return rotate(angle, axis, this);
-	}
-
-	public Matrix4f rotate(float angle, Vector3f axis, Matrix4f dest) {
-		return rotate(angle, axis, this, dest);
-	}
-
-	public static Matrix4f rotate(float angle, Vector3f axis, Matrix4f src, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-		float c = (float) Math.cos(angle);
-		float s = (float) Math.sin(angle);
-		float oneminusc = 1.0f - c;
-		float xy = axis.x*axis.y;
-		float yz = axis.y*axis.z;
-		float xz = axis.x*axis.z;
-		float xs = axis.x*s;
-		float ys = axis.y*s;
-		float zs = axis.z*s;
-
-		float f00 = axis.x*axis.x*oneminusc+c;
-		float f01 = xy*oneminusc+zs;
-		float f02 = xz*oneminusc-ys;
-		float f10 = xy*oneminusc-zs;
-		float f11 = axis.y*axis.y*oneminusc+c;
-		float f12 = yz*oneminusc+xs;
-		float f20 = xz*oneminusc+ys;
-		float f21 = yz*oneminusc-xs;
-		float f22 = axis.z*axis.z*oneminusc+c;
-
-		float t00 = src.m00 * f00 + src.m10 * f01 + src.m20 * f02;
-		float t01 = src.m01 * f00 + src.m11 * f01 + src.m21 * f02;
-		float t02 = src.m02 * f00 + src.m12 * f01 + src.m22 * f02;
-		float t03 = src.m03 * f00 + src.m13 * f01 + src.m23 * f02;
-		float t10 = src.m00 * f10 + src.m10 * f11 + src.m20 * f12;
-		float t11 = src.m01 * f10 + src.m11 * f11 + src.m21 * f12;
-		float t12 = src.m02 * f10 + src.m12 * f11 + src.m22 * f12;
-		float t13 = src.m03 * f10 + src.m13 * f11 + src.m23 * f12;
-		dest.m20 = src.m00 * f20 + src.m10 * f21 + src.m20 * f22;
-		dest.m21 = src.m01 * f20 + src.m11 * f21 + src.m21 * f22;
-		dest.m22 = src.m02 * f20 + src.m12 * f21 + src.m22 * f22;
-		dest.m23 = src.m03 * f20 + src.m13 * f21 + src.m23 * f22;
-		dest.m00 = t00;
-		dest.m01 = t01;
-		dest.m02 = t02;
-		dest.m03 = t03;
-		dest.m10 = t10;
-		dest.m11 = t11;
-		dest.m12 = t12;
-		dest.m13 = t13;
-		return dest;
-	}
-
-	public Matrix4f translate(Vector3f vec, Matrix4f dest) {
-		return translate(vec, this, dest);
-	}
-
-	public static Matrix4f translate(Vector3f vec, Matrix4f src, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-
-		dest.m30 += src.m00 * vec.x + src.m10 * vec.y + src.m20 * vec.z;
-		dest.m31 += src.m01 * vec.x + src.m11 * vec.y + src.m21 * vec.z;
-		dest.m32 += src.m02 * vec.x + src.m12 * vec.y + src.m22 * vec.z;
-		dest.m33 += src.m03 * vec.x + src.m13 * vec.y + src.m23 * vec.z;
-
-		return dest;
-	}
-
-	public Matrix4f translate(Vector2f vec, Matrix4f dest) {
-		return translate(vec, this, dest);
-	}
-
-	public static Matrix4f translate(Vector2f vec, Matrix4f src, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-
-		dest.m30 += src.m00 * vec.x + src.m10 * vec.y;
-		dest.m31 += src.m01 * vec.x + src.m11 * vec.y;
-		dest.m32 += src.m02 * vec.x + src.m12 * vec.y;
-		dest.m33 += src.m03 * vec.x + src.m13 * vec.y;
-
-		return dest;
-	}
-
-	public Matrix4f transpose(Matrix4f dest) {
-		return transpose(this, dest);
-	}
-
-	public static Matrix4f transpose(Matrix4f src, Matrix4f dest) {
-		if (dest == null)
-		   dest = new Matrix4f();
-		float m00 = src.m00;
-		float m01 = src.m10;
-		float m02 = src.m20;
-		float m03 = src.m30;
-		float m10 = src.m01;
-		float m11 = src.m11;
-		float m12 = src.m21;
-		float m13 = src.m31;
-		float m20 = src.m02;
-		float m21 = src.m12;
-		float m22 = src.m22;
-		float m23 = src.m32;
-		float m30 = src.m03;
-		float m31 = src.m13;
-		float m32 = src.m23;
-		float m33 = src.m33;
-
-		dest.m00 = m00;
-		dest.m01 = m01;
-		dest.m02 = m02;
-		dest.m03 = m03;
-		dest.m10 = m10;
-		dest.m11 = m11;
-		dest.m12 = m12;
-		dest.m13 = m13;
-		dest.m20 = m20;
-		dest.m21 = m21;
-		dest.m22 = m22;
-		dest.m23 = m23;
-		dest.m30 = m30;
-		dest.m31 = m31;
-		dest.m32 = m32;
-		dest.m33 = m33;
-
-		return dest;
-	}
-
-	public float determinant() {
-		float f =
-			m00
-				* ((m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32)
-					- m13 * m22 * m31
-					- m11 * m23 * m32
-					- m12 * m21 * m33);
-		f -= m01
-			* ((m10 * m22 * m33 + m12 * m23 * m30 + m13 * m20 * m32)
-				- m13 * m22 * m30
-				- m10 * m23 * m32
-				- m12 * m20 * m33);
-		f += m02
-			* ((m10 * m21 * m33 + m11 * m23 * m30 + m13 * m20 * m31)
-				- m13 * m21 * m30
-				- m10 * m23 * m31
-				- m11 * m20 * m33);
-		f -= m03
-			* ((m10 * m21 * m32 + m11 * m22 * m30 + m12 * m20 * m31)
-				- m12 * m21 * m30
-				- m10 * m22 * m31
-				- m11 * m20 * m32);
-		return f;
-	}
-
-	private static float determinant3x3(float t00, float t01, float t02,
-				     float t10, float t11, float t12,
-				     float t20, float t21, float t22)
-	{
-		return   t00 * (t11 * t22 - t12 * t21)
-		       + t01 * (t12 * t20 - t10 * t22)
-		       + t02 * (t10 * t21 - t11 * t20);
-	}
-
-	public Matrix invert() {
-		return invert(this, this);
-	}
-
-	public static Matrix4f invert(Matrix4f src, Matrix4f dest) {
-		float determinant = src.determinant();
-
-		if (determinant != 0) {
-			if (dest == null)
-				dest = new Matrix4f();
-			float determinant_inv = 1f/determinant;
-			float t00 =  determinant3x3(src.m11, src.m12, src.m13, src.m21, src.m22, src.m23, src.m31, src.m32, src.m33);
-			float t01 = -determinant3x3(src.m10, src.m12, src.m13, src.m20, src.m22, src.m23, src.m30, src.m32, src.m33);
-			float t02 =  determinant3x3(src.m10, src.m11, src.m13, src.m20, src.m21, src.m23, src.m30, src.m31, src.m33);
-			float t03 = -determinant3x3(src.m10, src.m11, src.m12, src.m20, src.m21, src.m22, src.m30, src.m31, src.m32);
-			float t10 = -determinant3x3(src.m01, src.m02, src.m03, src.m21, src.m22, src.m23, src.m31, src.m32, src.m33);
-			float t11 =  determinant3x3(src.m00, src.m02, src.m03, src.m20, src.m22, src.m23, src.m30, src.m32, src.m33);
-			float t12 = -determinant3x3(src.m00, src.m01, src.m03, src.m20, src.m21, src.m23, src.m30, src.m31, src.m33);
-			float t13 =  determinant3x3(src.m00, src.m01, src.m02, src.m20, src.m21, src.m22, src.m30, src.m31, src.m32);
-			float t20 =  determinant3x3(src.m01, src.m02, src.m03, src.m11, src.m12, src.m13, src.m31, src.m32, src.m33);
-			float t21 = -determinant3x3(src.m00, src.m02, src.m03, src.m10, src.m12, src.m13, src.m30, src.m32, src.m33);
-			float t22 =  determinant3x3(src.m00, src.m01, src.m03, src.m10, src.m11, src.m13, src.m30, src.m31, src.m33);
-			float t23 = -determinant3x3(src.m00, src.m01, src.m02, src.m10, src.m11, src.m12, src.m30, src.m31, src.m32);
-			float t30 = -determinant3x3(src.m01, src.m02, src.m03, src.m11, src.m12, src.m13, src.m21, src.m22, src.m23);
-			float t31 =  determinant3x3(src.m00, src.m02, src.m03, src.m10, src.m12, src.m13, src.m20, src.m22, src.m23);
-			float t32 = -determinant3x3(src.m00, src.m01, src.m03, src.m10, src.m11, src.m13, src.m20, src.m21, src.m23);
-			float t33 =  determinant3x3(src.m00, src.m01, src.m02, src.m10, src.m11, src.m12, src.m20, src.m21, src.m22);
-
-			dest.m00 = t00*determinant_inv;
-			dest.m11 = t11*determinant_inv;
-			dest.m22 = t22*determinant_inv;
-			dest.m33 = t33*determinant_inv;
-			dest.m01 = t10*determinant_inv;
-			dest.m10 = t01*determinant_inv;
-			dest.m20 = t02*determinant_inv;
-			dest.m02 = t20*determinant_inv;
-			dest.m12 = t21*determinant_inv;
-			dest.m21 = t12*determinant_inv;
-			dest.m03 = t30*determinant_inv;
-			dest.m30 = t03*determinant_inv;
-			dest.m13 = t31*determinant_inv;
-			dest.m31 = t13*determinant_inv;
-			dest.m32 = t23*determinant_inv;
-			dest.m23 = t32*determinant_inv;
-			return dest;
-		} else
-			return null;
-	}
-
-	public Matrix negate() {
-		return negate(this);
-	}
-
-	public Matrix4f negate(Matrix4f dest) {
-		return negate(this, dest);
-	}
-
-	public static Matrix4f negate(Matrix4f src, Matrix4f dest) {
-		if (dest == null)
-			dest = new Matrix4f();
-
-		dest.m00 = -src.m00;
-		dest.m01 = -src.m01;
-		dest.m02 = -src.m02;
-		dest.m03 = -src.m03;
-		dest.m10 = -src.m10;
-		dest.m11 = -src.m11;
-		dest.m12 = -src.m12;
-		dest.m13 = -src.m13;
-		dest.m20 = -src.m20;
-		dest.m21 = -src.m21;
-		dest.m22 = -src.m22;
-		dest.m23 = -src.m23;
-		dest.m30 = -src.m30;
-		dest.m31 = -src.m31;
-		dest.m32 = -src.m32;
-		dest.m33 = -src.m33;
-
-		return dest;
-	}
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector.java
deleted file mode 100644
index f60444b..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-import java.nio.FloatBuffer;
-
-public interface ReadableVector {
-	float length();
-	float lengthSquared();
-	Vector store(FloatBuffer buf);
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector2f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector2f.java
deleted file mode 100644
index b6b108d..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector2f.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-public interface ReadableVector2f extends ReadableVector {
-	float getX();
-	float getY();
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector3f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector3f.java
deleted file mode 100644
index 8e8accd..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector3f.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-public interface ReadableVector3f extends ReadableVector2f {
-	float getZ();
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector4f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector4f.java
deleted file mode 100644
index f1af4c5..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/ReadableVector4f.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-public interface ReadableVector4f extends ReadableVector3f {
-
-	float getW();
-
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector.java
deleted file mode 100644
index df12a18..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-import java.io.Serializable;
-import java.nio.FloatBuffer;
-
-public abstract class Vector implements Serializable, ReadableVector {
-
-	protected Vector() {
-		super();
-	}
-
-	public final float length() {
-		return (float) Math.sqrt(lengthSquared());
-	}
-
-	public abstract float lengthSquared();
-
-	public abstract Vector load(FloatBuffer buf);
-
-	public abstract Vector negate();
-
-	public final Vector normalise() {
-		float len = length();
-		if (len != 0.0f) {
-			float l = 1.0f / len;
-			return scale(l);
-		} else
-			throw new IllegalStateException("Zero length vector");
-	}
-
-	public abstract Vector store(FloatBuffer buf);
-
-	public abstract Vector scale(float scale);
-
-
-
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector2f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector2f.java
deleted file mode 100644
index d63c864..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector2f.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-import java.io.Serializable;
-import java.nio.FloatBuffer;
-
-public class Vector2f extends Vector implements Serializable, ReadableVector2f, WritableVector2f {
-
-	private static final long serialVersionUID = 1L;
-
-	public float x, y;
-
-	public Vector2f() {
-		super();
-	}
-
-	public Vector2f(ReadableVector2f src) {
-		set(src);
-	}
-
-	public Vector2f(float x, float y) {
-		set(x, y);
-	}
-
-	public void set(float x, float y) {
-		this.x = x;
-		this.y = y;
-	}
-
-	public Vector2f set(ReadableVector2f src) {
-		x = src.getX();
-		y = src.getY();
-		return this;
-	}
-
-	public float lengthSquared() {
-		return x * x + y * y;
-	}
-
-	public Vector2f translate(float x, float y) {
-		this.x += x;
-		this.y += y;
-		return this;
-	}
-
-	public Vector negate() {
-		x = -x;
-		y = -y;
-		return this;
-	}
-
-	public Vector2f negate(Vector2f dest) {
-		if (dest == null)
-			dest = new Vector2f();
-		dest.x = -x;
-		dest.y = -y;
-		return dest;
-	}
-
-	public Vector2f normalise(Vector2f dest) {
-		float l = length();
-
-		if (dest == null)
-			dest = new Vector2f(x / l, y / l);
-		else
-			dest.set(x / l, y / l);
-
-		return dest;
-	}
-
-	public static float dot(Vector2f left, Vector2f right) {
-		return left.x * right.x + left.y * right.y;
-	}
-
-	public static float angle(Vector2f a, Vector2f b) {
-		float dls = dot(a, b) / (a.length() * b.length());
-		if (dls < -1f)
-			dls = -1f;
-		else if (dls > 1.0f)
-			dls = 1.0f;
-		return (float)Math.acos(dls);
-	}
-
-	public static Vector2f add(Vector2f left, Vector2f right, Vector2f dest) {
-		if (dest == null)
-			return new Vector2f(left.x + right.x, left.y + right.y);
-		else {
-			dest.set(left.x + right.x, left.y + right.y);
-			return dest;
-		}
-	}
-
-	public static Vector2f sub(Vector2f left, Vector2f right, Vector2f dest) {
-		if (dest == null)
-			return new Vector2f(left.x - right.x, left.y - right.y);
-		else {
-			dest.set(left.x - right.x, left.y - right.y);
-			return dest;
-		}
-	}
-
-	public Vector store(FloatBuffer buf) {
-		buf.put(x);
-		buf.put(y);
-		return this;
-	}
-
-	public Vector load(FloatBuffer buf) {
-		x = buf.get();
-		y = buf.get();
-		return this;
-	}
-
-	public Vector scale(float scale) {
-
-		x *= scale;
-		y *= scale;
-
-		return this;
-	}
-
-	public String toString() {
-		StringBuilder sb = new StringBuilder(64);
-
-		sb.append("Vector2f[");
-		sb.append(x);
-		sb.append(", ");
-		sb.append(y);
-		sb.append(']');
-		return sb.toString();
-	}
-
-	public final float getX() {
-		return x;
-	}
-
-	public final float getY() {
-		return y;
-	}
-
-	public final void setX(float x) {
-		this.x = x;
-	}
-
-	public final void setY(float y) {
-		this.y = y;
-	}	
-	
-	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (getClass() != obj.getClass()) return false;
-		Vector2f other = (Vector2f)obj;
-		
-		if (x == other.x && y == other.y) return true;
-		
-		return false;
-	}
-	
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector3f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector3f.java
deleted file mode 100644
index 3ec60dc..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector3f.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-import java.io.Serializable;
-import java.nio.FloatBuffer;
-
-public class Vector3f extends Vector implements Serializable, ReadableVector3f, WritableVector3f {
-
-	private static final long serialVersionUID = 1L;
-
-	public float x, y, z;
-
-	public Vector3f() {
-		super();
-	}
-
-	public Vector3f(ReadableVector3f src) {
-		set(src);
-	}
-
-	public Vector3f(float x, float y, float z) {
-		set(x, y, z);
-	}
-
-	public void set(float x, float y) {
-		this.x = x;
-		this.y = y;
-	}
-
-	public void set(float x, float y, float z) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-	}
-
-	public Vector3f set(ReadableVector3f src) {
-		x = src.getX();
-		y = src.getY();
-		z = src.getZ();
-		return this;
-	}
-
-	public float lengthSquared() {
-		return x * x + y * y + z * z;
-	}
-
-	public Vector3f translate(float x, float y, float z) {
-		this.x += x;
-		this.y += y;
-		this.z += z;
-		return this;
-	}
-
-	public static Vector3f add(Vector3f left, Vector3f right, Vector3f dest) {
-		if (dest == null)
-			return new Vector3f(left.x + right.x, left.y + right.y, left.z + right.z);
-		else {
-			dest.set(left.x + right.x, left.y + right.y, left.z + right.z);
-			return dest;
-		}
-	}
-
-	public static Vector3f sub(Vector3f left, Vector3f right, Vector3f dest) {
-		if (dest == null)
-			return new Vector3f(left.x - right.x, left.y - right.y, left.z - right.z);
-		else {
-			dest.set(left.x - right.x, left.y - right.y, left.z - right.z);
-			return dest;
-		}
-	}
-
-	public static Vector3f cross(
-			Vector3f left,
-			Vector3f right,
-			Vector3f dest)
-	{
-
-		if (dest == null)
-			dest = new Vector3f();
-
-		dest.set(
-				left.y * right.z - left.z * right.y,
-				right.x * left.z - right.z * left.x,
-				left.x * right.y - left.y * right.x
-				);
-
-		return dest;
-	}
-
-	public Vector negate() {
-		x = -x;
-		y = -y;
-		z = -z;
-		return this;
-	}
-
-	public Vector3f negate(Vector3f dest) {
-		if (dest == null)
-			dest = new Vector3f();
-		dest.x = -x;
-		dest.y = -y;
-		dest.z = -z;
-		return dest;
-	}
-
-	public Vector3f normalise(Vector3f dest) {
-		float l = length();
-
-		if (dest == null)
-			dest = new Vector3f(x / l, y / l, z / l);
-		else
-			dest.set(x / l, y / l, z / l);
-
-		return dest;
-	}
-
-	public static float dot(Vector3f left, Vector3f right) {
-		return left.x * right.x + left.y * right.y + left.z * right.z;
-	}
-
-	public static float angle(Vector3f a, Vector3f b) {
-		float dls = dot(a, b) / (a.length() * b.length());
-		if (dls < -1f)
-			dls = -1f;
-		else if (dls > 1.0f)
-			dls = 1.0f;
-		return (float)Math.acos(dls);
-	}
-
-	public Vector load(FloatBuffer buf) {
-		x = buf.get();
-		y = buf.get();
-		z = buf.get();
-		return this;
-	}
-
-	public Vector scale(float scale) {
-
-		x *= scale;
-		y *= scale;
-		z *= scale;
-
-		return this;
-
-	}
-
-	public Vector store(FloatBuffer buf) {
-
-		buf.put(x);
-		buf.put(y);
-		buf.put(z);
-
-		return this;
-	}
-
-	public String toString() {
-		StringBuilder sb = new StringBuilder(64);
-
-		sb.append("Vector3f[");
-		sb.append(x);
-		sb.append(", ");
-		sb.append(y);
-		sb.append(", ");
-		sb.append(z);
-		sb.append(']');
-		return sb.toString();
-	}
-
-	public final float getX() {
-		return x;
-	}
-
-	public final float getY() {
-		return y;
-	}
-
-	public final void setX(float x) {
-		this.x = x;
-	}
-
-	public final void setY(float y) {
-		this.y = y;
-	}
-
-	public void setZ(float z) {
-		this.z = z;
-	}
-
-	public float getZ() {
-		return z;
-	}
-	
-	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (getClass() != obj.getClass()) return false;
-		Vector3f other = (Vector3f)obj;
-		
-		if (x == other.x && y == other.y && z == other.z) return true;
-		
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector4f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector4f.java
deleted file mode 100644
index a02ca92..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/Vector4f.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-import java.io.Serializable;
-import java.nio.FloatBuffer;
-
-public class Vector4f extends Vector implements Serializable, ReadableVector4f, WritableVector4f {
-
-	private static final long serialVersionUID = 1L;
-
-	public float x, y, z, w;
-
-	public Vector4f() {
-		super();
-	}
-
-	public Vector4f(ReadableVector4f src) {
-		set(src);
-	}
-
-	public Vector4f(float x, float y, float z, float w) {
-		set(x, y, z, w);
-	}
-
-	public void set(float x, float y) {
-		this.x = x;
-		this.y = y;
-	}
-
-	public void set(float x, float y, float z) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-	}
-
-	public void set(float x, float y, float z, float w) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-		this.w = w;
-	}
-
-	public Vector4f set(ReadableVector4f src) {
-		x = src.getX();
-		y = src.getY();
-		z = src.getZ();
-		w = src.getW();
-		return this;
-	}
-
-	public float lengthSquared() {
-		return x * x + y * y + z * z + w * w;
-	}
-	
-	public Vector4f translate(float x, float y, float z, float w) {
-		this.x += x;
-		this.y += y;
-		this.z += z;
-		this.w += w;
-		return this;
-	}
-
-	public static Vector4f add(Vector4f left, Vector4f right, Vector4f dest) {
-		if (dest == null)
-			return new Vector4f(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
-		else {
-			dest.set(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
-			return dest;
-		}
-	}
-
-	public static Vector4f sub(Vector4f left, Vector4f right, Vector4f dest) {
-		if (dest == null)
-			return new Vector4f(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
-		else {
-			dest.set(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
-			return dest;
-		}
-	}
-
-	public Vector negate() {
-		x = -x;
-		y = -y;
-		z = -z;
-		w = -w;
-		return this;
-	}
-
-	public Vector4f negate(Vector4f dest) {
-		if (dest == null)
-			dest = new Vector4f();
-		dest.x = -x;
-		dest.y = -y;
-		dest.z = -z;
-		dest.w = -w;
-		return dest;
-	}
-
-	public Vector4f normalise(Vector4f dest) {
-		float l = length();
-
-		if (dest == null)
-			dest = new Vector4f(x / l, y / l, z / l, w / l);
-		else
-			dest.set(x / l, y / l, z / l, w / l);
-
-		return dest;
-	}
-
-	public static float dot(Vector4f left, Vector4f right) {
-		return left.x * right.x + left.y * right.y + left.z * right.z + left.w * right.w;
-	}
-
-	public static float angle(Vector4f a, Vector4f b) {
-		float dls = dot(a, b) / (a.length() * b.length());
-		if (dls < -1f)
-			dls = -1f;
-		else if (dls > 1.0f)
-			dls = 1.0f;
-		return (float)Math.acos(dls);
-	}
-
-	public Vector load(FloatBuffer buf) {
-		x = buf.get();
-		y = buf.get();
-		z = buf.get();
-		w = buf.get();
-		return this;
-	}
-
-	public Vector scale(float scale) {
-		x *= scale;
-		y *= scale;
-		z *= scale;
-		w *= scale;
-		return this;
-	}
-
-	public Vector store(FloatBuffer buf) {
-
-		buf.put(x);
-		buf.put(y);
-		buf.put(z);
-		buf.put(w);
-
-		return this;
-	}
-
-	public String toString() {
-		return "Vector4f: " + x + " " + y + " " + z + " " + w;
-	}
-
-	public final float getX() {
-		return x;
-	}
-
-	public final float getY() {
-		return y;
-	}
-
-	public final void setX(float x) {
-		this.x = x;
-	}
-
-	public final void setY(float y) {
-		this.y = y;
-	}
-
-	public void setZ(float z) {
-		this.z = z;
-	}
-
-	public float getZ() {
-		return z;
-	}
-
-	public void setW(float w) {
-		this.w = w;
-	}
-
-	public float getW() {
-		return w;
-	}
-
-	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (getClass() != obj.getClass()) return false;
-		Vector4f other = (Vector4f)obj;
-		
-		if (x == other.x && y == other.y && z == other.z && w == other.w) return true;
-		
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector2f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector2f.java
deleted file mode 100644
index aa2a0b1..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector2f.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-public interface WritableVector2f {
-
-	void setX(float x);
-
-	void setY(float y);
-	
-	void set(float x, float y);
-
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector3f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector3f.java
deleted file mode 100644
index b722b2e..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector3f.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-public interface WritableVector3f extends WritableVector2f {
-	
-	void setZ(float z);
-
-	void set(float x, float y, float z);
-
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector4f.java b/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector4f.java
deleted file mode 100644
index 9b53d34..0000000
--- a/src/lwjgl/java/net/PeytonPlayz585/util/vector/WritableVector4f.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package net.PeytonPlayz585.util.vector;
-
-public interface WritableVector4f extends WritableVector3f {
-
-	void setW(float w);
-
-	void set(float x, float y, float z, float w);
-
-}
\ No newline at end of file