diff --git a/src/main/java/io/github/hydos/ginger/Example.java b/src/main/java/io/github/hydos/ginger/Example.java
index 25e9074..b82a02d 100644
--- a/src/main/java/io/github/hydos/ginger/Example.java
+++ b/src/main/java/io/github/hydos/ginger/Example.java
@@ -15,20 +15,20 @@ import io.github.hydos.ginger.engine.font.FontType;
 import io.github.hydos.ginger.engine.font.GUIText;
 import io.github.hydos.ginger.engine.font.TextMaster;
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
 import io.github.hydos.ginger.engine.obj.ModelLoader;
 import io.github.hydos.ginger.engine.obj.normals.NormalMappedObjLoader;
 import io.github.hydos.ginger.engine.particle.ParticleMaster;
 import io.github.hydos.ginger.engine.particle.ParticleSystem;
 import io.github.hydos.ginger.engine.particle.ParticleTexture;
-import io.github.hydos.ginger.engine.postProcessing.Fbo;
-import io.github.hydos.ginger.engine.postProcessing.PostProcessing;
-import io.github.hydos.ginger.engine.renderEngine.MasterRenderer;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
-import io.github.hydos.ginger.engine.renderEngine.texture.ModelTexture;
-import io.github.hydos.ginger.engine.renderEngine.tools.MousePicker;
+import io.github.hydos.ginger.engine.postprocessing.Fbo;
+import io.github.hydos.ginger.engine.postprocessing.PostProcessing;
+import io.github.hydos.ginger.engine.render.MasterRenderer;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
+import io.github.hydos.ginger.engine.render.texture.ModelTexture;
+import io.github.hydos.ginger.engine.render.tools.MousePicker;
 import io.github.hydos.ginger.engine.terrain.Terrain;
 import io.github.hydos.ginger.engine.terrain.TerrainTexture;
 import io.github.hydos.ginger.engine.terrain.TerrainTexturePack;
diff --git a/src/main/java/io/github/hydos/ginger/UI/UIManager.java b/src/main/java/io/github/hydos/ginger/UI/UIManager.java
index 69d973a..d594684 100644
--- a/src/main/java/io/github/hydos/ginger/UI/UIManager.java
+++ b/src/main/java/io/github/hydos/ginger/UI/UIManager.java
@@ -3,7 +3,7 @@ package io.github.hydos.ginger.UI;
 import io.github.hydos.ginger.UI.canvases.WelcomeScreen;
 import io.github.hydos.ginger.UI.enums.UIColourType;
 import io.github.hydos.ginger.engine.elements.GuiTexture;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class UIManager {
diff --git a/src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java b/src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java
index db65367..cccbd2f 100644
--- a/src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java
+++ b/src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java
@@ -3,7 +3,7 @@ package io.github.hydos.ginger.engine.cameras;
 import org.lwjgl.glfw.GLFW;
 
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class FirstPersonCamera {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java b/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java
index 752cdf0..64a59f9 100644
--- a/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java
+++ b/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java
@@ -5,7 +5,7 @@ import org.lwjgl.glfw.GLFWScrollCallback;
 
 import io.github.hydos.ginger.engine.elements.objects.RenderPlayer;
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class ThirdPersonCamera {
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java b/src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java
index 2de79a7..765a890 100644
--- a/src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java
+++ b/src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java
@@ -1,6 +1,6 @@
 package io.github.hydos.ginger.engine.elements;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
 
 public class GuiTexture {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java b/src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java
index 121f707..3fc7235 100644
--- a/src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java
+++ b/src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java
@@ -6,7 +6,7 @@ import org.lwjgl.glfw.GLFW;
 
 import io.github.hydos.ginger.engine.elements.GuiTexture;
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class TextureButton{
diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Entity.java b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Entity.java
index 09423e5..471a64d 100644
--- a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Entity.java
+++ b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Entity.java
@@ -1,7 +1,7 @@
 package io.github.hydos.ginger.engine.elements.objects;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
 
 public class Entity {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java
index 713f217..2f8b983 100644
--- a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java
+++ b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java
@@ -1,6 +1,6 @@
 package io.github.hydos.ginger.engine.elements.objects;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class Light {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java b/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java
index 2b62aba..450c9ad 100644
--- a/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java
@@ -3,8 +3,8 @@ package io.github.hydos.ginger.engine.elements.objects;
 import org.lwjgl.glfw.GLFW;
 
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
 import io.github.hydos.ginger.engine.terrain.Terrain;
 import io.github.hydos.ginger.main.settings.Constants;
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/font/GUIText.java b/src/main/java/io/github/hydos/ginger/engine/font/GUIText.java
index 3f4270a..ce4fea5 100644
--- a/src/main/java/io/github/hydos/ginger/engine/font/GUIText.java
+++ b/src/main/java/io/github/hydos/ginger/engine/font/GUIText.java
@@ -1,7 +1,7 @@
 package io.github.hydos.ginger.engine.font;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 /**
  * Represents a piece of text in the game.
diff --git a/src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java b/src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java
index 6dbf6f8..daa257f 100644
--- a/src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java
+++ b/src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java
@@ -5,7 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.github.hydos.ginger.engine.renderEngine.renderers.FontRenderer;
+import io.github.hydos.ginger.engine.render.renderers.FontRenderer;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class TextMaster {
diff --git a/src/main/java/io/github/hydos/ginger/engine/io/Window.java b/src/main/java/io/github/hydos/ginger/engine/io/Window.java
index f05d4dd..e44bd09 100644
--- a/src/main/java/io/github/hydos/ginger/engine/io/Window.java
+++ b/src/main/java/io/github/hydos/ginger/engine/io/Window.java
@@ -12,9 +12,9 @@ import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GLCapabilities;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.renderEngine.texture.Image;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.render.texture.Image;
 
 public class Window {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/Maths.java b/src/main/java/io/github/hydos/ginger/engine/math/Maths.java
similarity index 91%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/Maths.java
rename to src/main/java/io/github/hydos/ginger/engine/math/Maths.java
index 49d48a0..f294b2f 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/Maths.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/Maths.java
@@ -1,9 +1,9 @@
-package io.github.hydos.ginger.engine.mathEngine;
+package io.github.hydos.ginger.engine.math;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class Maths {
     
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/Quaternion.java b/src/main/java/io/github/hydos/ginger/engine/math/Quaternion.java
similarity index 96%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/Quaternion.java
rename to src/main/java/io/github/hydos/ginger/engine/math/Quaternion.java
index d76c77d..3814f32 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/Quaternion.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/Quaternion.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine;
+package io.github.hydos.ginger.engine.math;
 
 /**
  *
@@ -42,11 +42,11 @@ package io.github.hydos.ginger.engine.mathEngine;
 
 import java.nio.FloatBuffer;
 
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix3f;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.ReadableVector4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix3f;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.ReadableVector4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
 
 public class Quaternion extends Vector implements ReadableVector4f {
 	private static final long serialVersionUID = 1L;
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.java b/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix.java
similarity index 98%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.java
rename to src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix.java
index 50817da..95165d5 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.matrixes;
+package io.github.hydos.ginger.engine.math.matrixes;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.java b/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix2f.java
similarity index 98%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix2f.java
index befb8e1..09041c8 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix2f.java
@@ -29,12 +29,12 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package io.github.hydos.ginger.engine.mathEngine.matrixes;
+package io.github.hydos.ginger.engine.math.matrixes;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
 
 /**
  *
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.java b/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix3f.java
similarity index 99%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix3f.java
index fc7b771..1ed0630 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix3f.java
@@ -31,12 +31,12 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package io.github.hydos.ginger.engine.mathEngine.matrixes;
+package io.github.hydos.ginger.engine.math.matrixes;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 /**
  *
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.java b/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix4f.java
similarity index 99%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix4f.java
index c50d637..e1296bb 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix4f.java
@@ -29,14 +29,14 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package io.github.hydos.ginger.engine.mathEngine.matrixes;
+package io.github.hydos.ginger.engine.math.matrixes;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
 
 /**
  * Holds a 4x4 float matrix.
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector.java
similarity index 97%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector.java
index 23b2074..c532128 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 import java.nio.FloatBuffer;
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java
similarity index 96%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java
index 91e2600..33d920d 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 /**
  * @author foo
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java
similarity index 96%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java
index eeed7f0..32b8f5d 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 /**
  * @author foo
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java
similarity index 96%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java
index b3bc993..0cfaef1 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 /**
  * @author foo
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector.java
similarity index 98%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector.java
index 9f50fa9..71e62a6 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector2f.java
similarity index 99%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector2f.java
index 52b1fa5..a8ce5dc 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector2f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector3f.java
similarity index 99%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector3f.java
index fead93c..f044849 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector3f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector4f.java
similarity index 99%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector4f.java
index 0f4f294..724e93a 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector4f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 import java.io.Serializable;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector2f.java
similarity index 97%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector2f.java
index eb6c3e7..f512c77 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector2f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 /**
  * Writable interface to Vector2fs
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector3f.java
similarity index 97%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector3f.java
index 6e8f697..e596468 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector3f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 /**
  * Writable interface to Vector3fs
diff --git a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.java b/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector4f.java
similarity index 97%
rename from src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.java
rename to src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector4f.java
index 6848c04..5ee06a6 100644
--- a/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.java
+++ b/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector4f.java
@@ -29,7 +29,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 io.github.hydos.ginger.engine.mathEngine.vectors;
+package io.github.hydos.ginger.engine.math.vectors;
 
 /**
  * Writable interface to Vector4fs
diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java b/src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java
index af7f527..76728db 100644
--- a/src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java
@@ -1,7 +1,7 @@
 package io.github.hydos.ginger.engine.obj;
 
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
-import io.github.hydos.ginger.engine.renderEngine.texture.ModelTexture;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
+import io.github.hydos.ginger.engine.render.texture.ModelTexture;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class ModelLoader {
diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java b/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java
index 874817c..7999480 100644
--- a/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java
@@ -6,8 +6,8 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class OBJFileLoader {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java b/src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java
index 924dccb..2c13bf1 100644
--- a/src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java
+++ b/src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java
@@ -1,6 +1,6 @@
 package io.github.hydos.ginger.engine.obj;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class Vertex {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java b/src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java
index 26dc858..355ae57 100644
--- a/src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java
@@ -6,9 +6,9 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.render.models.RawModel;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class NormalMappedObjLoader {
diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java b/src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java
index 14c65d0..7f6e5e7 100644
--- a/src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java
+++ b/src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java
@@ -3,7 +3,7 @@ package io.github.hydos.ginger.engine.obj.normals;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class VertexNM {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/particle/Particle.java b/src/main/java/io/github/hydos/ginger/engine/particle/Particle.java
index 4c6021d..7339f67 100644
--- a/src/main/java/io/github/hydos/ginger/engine/particle/Particle.java
+++ b/src/main/java/io/github/hydos/ginger/engine/particle/Particle.java
@@ -2,8 +2,8 @@ package io.github.hydos.ginger.engine.particle;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 import io.github.hydos.ginger.main.settings.Constants;
 
 public class Particle {
diff --git a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java b/src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java
index 07bf4d5..77f2b0e 100644
--- a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java
+++ b/src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java
@@ -8,8 +8,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.renderEngine.renderers.ParticleRenderer;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.render.renderers.ParticleRenderer;
 
 public class ParticleMaster {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java b/src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java
index 3bf484d..a7452a7 100644
--- a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java
+++ b/src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java
@@ -3,9 +3,9 @@ package io.github.hydos.ginger.engine.particle;
 import java.util.Random;
 
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
 
 public class ParticleSystem {
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.java b/src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastChanger.java
similarity index 91%
rename from src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.java
rename to src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastChanger.java
index a2dadb8..943306f 100644
--- a/src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.java
+++ b/src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastChanger.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.postProcessing;
+package io.github.hydos.ginger.engine.postprocessing;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
diff --git a/src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastShader.java b/src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastShader.java
similarity index 76%
rename from src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastShader.java
rename to src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastShader.java
index 86d4b32..12e57d7 100644
--- a/src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastShader.java
@@ -1,6 +1,6 @@
-package io.github.hydos.ginger.engine.postProcessing;
+package io.github.hydos.ginger.engine.postprocessing;
 
-import io.github.hydos.ginger.engine.renderEngine.shaders.ShaderProgram;
+import io.github.hydos.ginger.engine.render.shaders.ShaderProgram;
 
 public class ContrastShader extends ShaderProgram {
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java b/src/main/java/io/github/hydos/ginger/engine/postprocessing/Fbo.java
similarity index 99%
rename from src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java
rename to src/main/java/io/github/hydos/ginger/engine/postprocessing/Fbo.java
index 9a1b4c6..c9b73a2 100644
--- a/src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java
+++ b/src/main/java/io/github/hydos/ginger/engine/postprocessing/Fbo.java
@@ -1,5 +1,5 @@
 
-package io.github.hydos.ginger.engine.postProcessing;
+package io.github.hydos.ginger.engine.postprocessing;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java b/src/main/java/io/github/hydos/ginger/engine/postprocessing/ImageRenderer.java
similarity index 91%
rename from src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/postprocessing/ImageRenderer.java
index 35d66ca..15659a8 100644
--- a/src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/postprocessing/ImageRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.postProcessing;
+package io.github.hydos.ginger.engine.postprocessing;
 
 import org.lwjgl.opengl.GL11;
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/postProcessing/PostProcessing.java b/src/main/java/io/github/hydos/ginger/engine/postprocessing/PostProcessing.java
similarity index 88%
rename from src/main/java/io/github/hydos/ginger/engine/postProcessing/PostProcessing.java
rename to src/main/java/io/github/hydos/ginger/engine/postprocessing/PostProcessing.java
index 5b8a996..dd3bba4 100644
--- a/src/main/java/io/github/hydos/ginger/engine/postProcessing/PostProcessing.java
+++ b/src/main/java/io/github/hydos/ginger/engine/postprocessing/PostProcessing.java
@@ -1,10 +1,10 @@
-package io.github.hydos.ginger.engine.postProcessing;
+package io.github.hydos.ginger.engine.postprocessing;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
+import io.github.hydos.ginger.engine.render.models.RawModel;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class PostProcessing {
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.java b/src/main/java/io/github/hydos/ginger/engine/render/MasterRenderer.java
similarity index 87%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/render/MasterRenderer.java
index 6d0d89c..8b5027d 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/MasterRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine;
+package io.github.hydos.ginger.engine.render;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13,17 +13,17 @@ import io.github.hydos.ginger.engine.elements.GuiTexture;
 import io.github.hydos.ginger.engine.elements.objects.Entity;
 import io.github.hydos.ginger.engine.elements.objects.Light;
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
-import io.github.hydos.ginger.engine.renderEngine.renderers.EntityRenderer;
-import io.github.hydos.ginger.engine.renderEngine.renderers.GuiRenderer;
-import io.github.hydos.ginger.engine.renderEngine.renderers.NormalMappingRenderer;
-import io.github.hydos.ginger.engine.renderEngine.renderers.SkyboxRenderer;
-import io.github.hydos.ginger.engine.renderEngine.renderers.TerrainRenderer;
-import io.github.hydos.ginger.engine.renderEngine.shaders.GuiShader;
-import io.github.hydos.ginger.engine.renderEngine.shaders.StaticShader;
-import io.github.hydos.ginger.engine.renderEngine.shaders.TerrainShader;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
+import io.github.hydos.ginger.engine.render.renderers.EntityRenderer;
+import io.github.hydos.ginger.engine.render.renderers.GuiRenderer;
+import io.github.hydos.ginger.engine.render.renderers.NormalMappingRenderer;
+import io.github.hydos.ginger.engine.render.renderers.SkyboxRenderer;
+import io.github.hydos.ginger.engine.render.renderers.TerrainRenderer;
+import io.github.hydos.ginger.engine.render.shaders.GuiShader;
+import io.github.hydos.ginger.engine.render.shaders.StaticShader;
+import io.github.hydos.ginger.engine.render.shaders.TerrainShader;
 import io.github.hydos.ginger.engine.shadow.ShadowMapMasterRenderer;
 import io.github.hydos.ginger.engine.terrain.Terrain;
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/models/RawModel.java b/src/main/java/io/github/hydos/ginger/engine/render/models/RawModel.java
similarity index 83%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/models/RawModel.java
rename to src/main/java/io/github/hydos/ginger/engine/render/models/RawModel.java
index 1ee03f0..2698d71 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/models/RawModel.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/models/RawModel.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.models;
+package io.github.hydos.ginger.engine.render.models;
 
 public class RawModel {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.java b/src/main/java/io/github/hydos/ginger/engine/render/models/TexturedModel.java
similarity index 72%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.java
rename to src/main/java/io/github/hydos/ginger/engine/render/models/TexturedModel.java
index 6ad25a5..2c2b566 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/models/TexturedModel.java
@@ -1,6 +1,6 @@
-package io.github.hydos.ginger.engine.renderEngine.models;
+package io.github.hydos.ginger.engine.render.models;
 
-import io.github.hydos.ginger.engine.renderEngine.texture.ModelTexture;
+import io.github.hydos.ginger.engine.render.texture.ModelTexture;
 
 public class TexturedModel {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.java b/src/main/java/io/github/hydos/ginger/engine/render/renderers/EntityRenderer.java
similarity index 79%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/render/renderers/EntityRenderer.java
index 71b4700..a58cedc 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/renderers/EntityRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.renderers;
+package io.github.hydos.ginger.engine.render.renderers;
 
 import java.util.List;
 import java.util.Map;
@@ -9,13 +9,13 @@ import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 
 import io.github.hydos.ginger.engine.elements.objects.Entity;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.renderEngine.MasterRenderer;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
-import io.github.hydos.ginger.engine.renderEngine.shaders.StaticShader;
-import io.github.hydos.ginger.engine.renderEngine.texture.ModelTexture;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.render.MasterRenderer;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
+import io.github.hydos.ginger.engine.render.shaders.StaticShader;
+import io.github.hydos.ginger.engine.render.texture.ModelTexture;
 
 public class EntityRenderer {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.java b/src/main/java/io/github/hydos/ginger/engine/render/renderers/FontRenderer.java
similarity index 92%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/render/renderers/FontRenderer.java
index 55b1fbf..2879560 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/renderers/FontRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.renderers;
+package io.github.hydos.ginger.engine.render.renderers;
 
 import java.util.List;
 import java.util.Map;
@@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL30;
 
 import io.github.hydos.ginger.engine.font.FontType;
 import io.github.hydos.ginger.engine.font.GUIText;
-import io.github.hydos.ginger.engine.renderEngine.shaders.FontShader;
+import io.github.hydos.ginger.engine.render.shaders.FontShader;
 
 public class FontRenderer {
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.java b/src/main/java/io/github/hydos/ginger/engine/render/renderers/GuiRenderer.java
similarity index 80%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/render/renderers/GuiRenderer.java
index 0d1454a..4c81acc 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/renderers/GuiRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.renderers;
+package io.github.hydos.ginger.engine.render.renderers;
 
 import java.util.List;
 
@@ -8,10 +8,10 @@ import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 
 import io.github.hydos.ginger.engine.elements.GuiTexture;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.shaders.GuiShader;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.shaders.GuiShader;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class GuiRenderer {
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.java b/src/main/java/io/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java
similarity index 83%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java
index 5cfb6b3..87628d4 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.renderers;
+package io.github.hydos.ginger.engine.render.renderers;
 
 import java.util.List;
 import java.util.Map;
@@ -12,14 +12,14 @@ import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
 import io.github.hydos.ginger.engine.elements.objects.Entity;
 import io.github.hydos.ginger.engine.elements.objects.Light;
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
-import io.github.hydos.ginger.engine.renderEngine.MasterRenderer;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
-import io.github.hydos.ginger.engine.renderEngine.shaders.NormalMappingShader;
-import io.github.hydos.ginger.engine.renderEngine.texture.ModelTexture;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
+import io.github.hydos.ginger.engine.render.MasterRenderer;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
+import io.github.hydos.ginger.engine.render.shaders.NormalMappingShader;
+import io.github.hydos.ginger.engine.render.texture.ModelTexture;
 
 public class NormalMappingRenderer {
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java b/src/main/java/io/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java
similarity index 93%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java
index 523de84..092a7d7 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.renderers;
+package io.github.hydos.ginger.engine.render.renderers;
 
 import java.nio.FloatBuffer;
 import java.util.List;
@@ -12,13 +12,13 @@ import org.lwjgl.opengl.GL30;
 import org.lwjgl.opengl.GL31;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 import io.github.hydos.ginger.engine.particle.Particle;
 import io.github.hydos.ginger.engine.particle.ParticleTexture;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.shaders.ParticleShader;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.shaders.ParticleShader;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class ParticleRenderer {
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.java b/src/main/java/io/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java
similarity index 89%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java
index 8554060..b7ddb12 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.renderers;
+package io.github.hydos.ginger.engine.render.renderers;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
@@ -6,9 +6,9 @@ import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.shaders.SkyboxShader;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.shaders.SkyboxShader;
 import io.github.hydos.ginger.engine.utils.Loader;
 
 public class SkyboxRenderer {
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.java b/src/main/java/io/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java
similarity index 86%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.java
rename to src/main/java/io/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java
index d9c46b9..83e0a56 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.renderers;
+package io.github.hydos.ginger.engine.render.renderers;
 
 import java.util.List;
 
@@ -7,11 +7,11 @@ import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.shaders.TerrainShader;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.shaders.TerrainShader;
 import io.github.hydos.ginger.engine.terrain.Terrain;
 import io.github.hydos.ginger.engine.terrain.TerrainTexture;
 import io.github.hydos.ginger.engine.terrain.TerrainTexturePack;
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.java b/src/main/java/io/github/hydos/ginger/engine/render/shaders/FontShader.java
similarity index 89%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.java
rename to src/main/java/io/github/hydos/ginger/engine/render/shaders/FontShader.java
index 64a0488..ea22a19 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/shaders/FontShader.java
@@ -1,8 +1,8 @@
-package io.github.hydos.ginger.engine.renderEngine.shaders;
+package io.github.hydos.ginger.engine.render.shaders;
 
 import io.github.hydos.ginger.engine.font.GUIText;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class FontShader extends ShaderProgram{
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.java b/src/main/java/io/github/hydos/ginger/engine/render/shaders/GuiShader.java
similarity index 85%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.java
rename to src/main/java/io/github/hydos/ginger/engine/render/shaders/GuiShader.java
index 14f94e5..258502b 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/shaders/GuiShader.java
@@ -1,6 +1,6 @@
-package io.github.hydos.ginger.engine.renderEngine.shaders;
+package io.github.hydos.ginger.engine.render.shaders;
 
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
 
 public class GuiShader extends ShaderProgram{
     
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.java b/src/main/java/io/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java
similarity index 93%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.java
rename to src/main/java/io/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java
index ad2e01f..1ed18d0 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java
@@ -1,12 +1,12 @@
-package io.github.hydos.ginger.engine.renderEngine.shaders;
+package io.github.hydos.ginger.engine.render.shaders;
 
 import java.util.List;
 
 import io.github.hydos.ginger.engine.elements.objects.Light;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
 
 public class NormalMappingShader extends ShaderProgram{
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.java b/src/main/java/io/github/hydos/ginger/engine/render/shaders/ParticleShader.java
similarity index 88%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.java
rename to src/main/java/io/github/hydos/ginger/engine/render/shaders/ParticleShader.java
index 7eb437f..76f63ff 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/shaders/ParticleShader.java
@@ -1,6 +1,6 @@
-package io.github.hydos.ginger.engine.renderEngine.shaders;
+package io.github.hydos.ginger.engine.render.shaders;
 
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
 
 public class ParticleShader extends ShaderProgram {
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.java b/src/main/java/io/github/hydos/ginger/engine/render/shaders/ShaderProgram.java
similarity index 91%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.java
rename to src/main/java/io/github/hydos/ginger/engine/render/shaders/ShaderProgram.java
index 02f4caa..4bea08d 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/shaders/ShaderProgram.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.shaders;
+package io.github.hydos.ginger.engine.render.shaders;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -9,10 +9,10 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL20;
 
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
 
 public abstract class ShaderProgram {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.java b/src/main/java/io/github/hydos/ginger/engine/render/shaders/SkyboxShader.java
similarity index 84%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.java
rename to src/main/java/io/github/hydos/ginger/engine/render/shaders/SkyboxShader.java
index 4055866..cc829a7 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/shaders/SkyboxShader.java
@@ -1,8 +1,8 @@
-package io.github.hydos.ginger.engine.renderEngine.shaders;
+package io.github.hydos.ginger.engine.render.shaders;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
 
 public class SkyboxShader extends ShaderProgram{
      
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.java b/src/main/java/io/github/hydos/ginger/engine/render/shaders/StaticShader.java
similarity index 92%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.java
rename to src/main/java/io/github/hydos/ginger/engine/render/shaders/StaticShader.java
index 134c3e2..d79793a 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/shaders/StaticShader.java
@@ -1,12 +1,12 @@
-package io.github.hydos.ginger.engine.renderEngine.shaders;
+package io.github.hydos.ginger.engine.render.shaders;
 
 import java.util.List;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
 import io.github.hydos.ginger.engine.elements.objects.Light;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class StaticShader extends ShaderProgram{
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.java b/src/main/java/io/github/hydos/ginger/engine/render/shaders/TerrainShader.java
similarity index 94%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.java
rename to src/main/java/io/github/hydos/ginger/engine/render/shaders/TerrainShader.java
index 71ceedd..4b5faa0 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/shaders/TerrainShader.java
@@ -1,12 +1,12 @@
-package io.github.hydos.ginger.engine.renderEngine.shaders;
+package io.github.hydos.ginger.engine.render.shaders;
 
 import java.util.List;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
 import io.github.hydos.ginger.engine.elements.objects.Light;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
 
 public class TerrainShader extends ShaderProgram{
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/Image.java b/src/main/java/io/github/hydos/ginger/engine/render/texture/Image.java
similarity index 96%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/Image.java
rename to src/main/java/io/github/hydos/ginger/engine/render/texture/Image.java
index bd7150a..0e302e9 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/Image.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/texture/Image.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.texture;
+package io.github.hydos.ginger.engine.render.texture;
 
 import static org.lwjgl.stb.STBImage.stbi_failure_reason;
 import static org.lwjgl.stb.STBImage.stbi_info_from_memory;
@@ -11,7 +11,7 @@ import java.nio.IntBuffer;
 
 import org.lwjgl.system.MemoryStack;
 
-import io.github.hydos.ginger.engine.renderEngine.tools.IOUtil;
+import io.github.hydos.ginger.engine.render.tools.IOUtil;
 
 public class Image {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.java b/src/main/java/io/github/hydos/ginger/engine/render/texture/ModelTexture.java
similarity index 97%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.java
rename to src/main/java/io/github/hydos/ginger/engine/render/texture/ModelTexture.java
index 32e5c40..707a4a0 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/texture/ModelTexture.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.texture;
+package io.github.hydos.ginger.engine.render.texture;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL14;
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.java b/src/main/java/io/github/hydos/ginger/engine/render/tools/IOUtil.java
similarity index 95%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.java
rename to src/main/java/io/github/hydos/ginger/engine/render/tools/IOUtil.java
index 0dcb89b..6925512 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/tools/IOUtil.java
@@ -1,4 +1,4 @@
-package io.github.hydos.ginger.engine.renderEngine.tools;
+package io.github.hydos.ginger.engine.render.tools;
 
 import static org.lwjgl.BufferUtils.createByteBuffer;
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.java b/src/main/java/io/github/hydos/ginger/engine/render/tools/MousePicker.java
similarity index 91%
rename from src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.java
rename to src/main/java/io/github/hydos/ginger/engine/render/tools/MousePicker.java
index 5ccaf40..4a12a9c 100644
--- a/src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.java
+++ b/src/main/java/io/github/hydos/ginger/engine/render/tools/MousePicker.java
@@ -1,12 +1,12 @@
-package io.github.hydos.ginger.engine.renderEngine.tools;
+package io.github.hydos.ginger.engine.render.tools;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
 import io.github.hydos.ginger.engine.terrain.Terrain;
 
 public class MousePicker {
diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java
index a6c51fb..6efa6d6 100644
--- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java
+++ b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java
@@ -2,10 +2,10 @@ package io.github.hydos.ginger.engine.shadow;
 
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector4f;
-import io.github.hydos.ginger.engine.renderEngine.MasterRenderer;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.math.vectors.Vector4f;
+import io.github.hydos.ginger.engine.render.MasterRenderer;
 
 /**
  * Represents the 3D cuboidal area of the world in which objects will cast
diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java
index 07f7fd6..41a66d9 100644
--- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java
@@ -9,11 +9,11 @@ import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 
 import io.github.hydos.ginger.engine.elements.objects.Entity;
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.renderEngine.MasterRenderer;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.render.MasterRenderer;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
 
 public class ShadowMapEntityRenderer {
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java
index 2196779..7b1bff1 100644
--- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java
+++ b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java
@@ -8,10 +8,10 @@ import org.lwjgl.opengl.GL11;
 import io.github.hydos.ginger.engine.cameras.ThirdPersonCamera;
 import io.github.hydos.ginger.engine.elements.objects.Entity;
 import io.github.hydos.ginger.engine.elements.objects.Light;
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
 
 /**
  * This class is in charge of using all of the classes in the shadows package to
diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java
index 554d9a4..78b2ca2 100644
--- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java
@@ -1,7 +1,7 @@
 package io.github.hydos.ginger.engine.shadow;
 
-import io.github.hydos.ginger.engine.mathEngine.matrixes.Matrix4f;
-import io.github.hydos.ginger.engine.renderEngine.shaders.ShaderProgram;
+import io.github.hydos.ginger.engine.math.matrixes.Matrix4f;
+import io.github.hydos.ginger.engine.render.shaders.ShaderProgram;
 
 public class ShadowShader extends ShaderProgram {
 	
diff --git a/src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java b/src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java
index 002cf65..8e6bd98 100644
--- a/src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java
+++ b/src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java
@@ -5,10 +5,10 @@ import java.io.IOException;
 
 import javax.imageio.ImageIO;
 
-import io.github.hydos.ginger.engine.mathEngine.Maths;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector2f;
-import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
+import io.github.hydos.ginger.engine.math.Maths;
+import io.github.hydos.ginger.engine.math.vectors.Vector2f;
+import io.github.hydos.ginger.engine.math.vectors.Vector3f;
+import io.github.hydos.ginger.engine.render.models.RawModel;
 import io.github.hydos.ginger.engine.utils.Loader;
 import io.github.hydos.ginger.main.settings.Constants;
 
diff --git a/src/main/java/io/github/hydos/ginger/engine/utils/Loader.java b/src/main/java/io/github/hydos/ginger/engine/utils/Loader.java
index 1dc4946..ea7eaa2 100644
--- a/src/main/java/io/github/hydos/ginger/engine/utils/Loader.java
+++ b/src/main/java/io/github/hydos/ginger/engine/utils/Loader.java
@@ -16,9 +16,9 @@ import org.lwjgl.opengl.GL30;
 import org.lwjgl.opengl.GL33;
 
 import io.github.hydos.ginger.engine.io.Window;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.texture.Image;
-import io.github.hydos.ginger.engine.renderEngine.texture.ModelTexture;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.texture.Image;
+import io.github.hydos.ginger.engine.render.texture.ModelTexture;
 import io.github.hydos.ginger.engine.terrain.TerrainTexture;
 
 public class Loader {
diff --git a/src/main/java/io/github/hydos/ginger/main/GingerMain.java b/src/main/java/io/github/hydos/ginger/main/GingerMain.java
index 1b4f69e..0eabe2e 100644
--- a/src/main/java/io/github/hydos/ginger/main/GingerMain.java
+++ b/src/main/java/io/github/hydos/ginger/main/GingerMain.java
@@ -5,10 +5,10 @@ import io.github.hydos.ginger.UI.enums.UIColourType;
 import io.github.hydos.ginger.engine.font.TextMaster;
 import io.github.hydos.ginger.engine.obj.ModelLoader;
 import io.github.hydos.ginger.engine.obj.normals.NormalMappedObjLoader;
-import io.github.hydos.ginger.engine.renderEngine.MasterRenderer;
-import io.github.hydos.ginger.engine.renderEngine.models.RawModel;
-import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel;
-import io.github.hydos.ginger.engine.renderEngine.texture.ModelTexture;
+import io.github.hydos.ginger.engine.render.MasterRenderer;
+import io.github.hydos.ginger.engine.render.models.RawModel;
+import io.github.hydos.ginger.engine.render.models.TexturedModel;
+import io.github.hydos.ginger.engine.render.texture.ModelTexture;
 
 public class GingerMain {
 	
diff --git a/target/classes/io/github/hydos/ginger/Example.class b/target/classes/io/github/hydos/ginger/Example.class
index 48bb95b..98c6292 100644
Binary files a/target/classes/io/github/hydos/ginger/Example.class and b/target/classes/io/github/hydos/ginger/Example.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.class b/target/classes/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.class
index c89ecb2..40cb2c6 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.class and b/target/classes/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class
index e4eae53..de13116 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class and b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/font/GUIText.class b/target/classes/io/github/hydos/ginger/engine/font/GUIText.class
index 3164476..7a94aec 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/font/GUIText.class and b/target/classes/io/github/hydos/ginger/engine/font/GUIText.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/font/TextMaster.class b/target/classes/io/github/hydos/ginger/engine/font/TextMaster.class
index f825fb0..9e9e182 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/font/TextMaster.class and b/target/classes/io/github/hydos/ginger/engine/font/TextMaster.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/io/Window.class b/target/classes/io/github/hydos/ginger/engine/io/Window.class
index 898464b..efd9fc2 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/io/Window.class and b/target/classes/io/github/hydos/ginger/engine/io/Window.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class
deleted file mode 100644
index ab4a36a..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/Quaternion.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/Quaternion.class
deleted file mode 100644
index 07f445b..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/Quaternion.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.class
deleted file mode 100644
index 20d0847..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.class
deleted file mode 100644
index dffe93b..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.class
deleted file mode 100644
index df64082..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.class
deleted file mode 100644
index 4bd934a..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.class
deleted file mode 100644
index 2263590..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.class
deleted file mode 100644
index aa55db3..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.class
deleted file mode 100644
index 444dbd4..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.class
deleted file mode 100644
index 3150c3e..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.class
deleted file mode 100644
index 2b6dbd0..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.class
deleted file mode 100644
index e2692d4..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.class
deleted file mode 100644
index b83e8cd..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.class
deleted file mode 100644
index 9994d90..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.class
deleted file mode 100644
index 4bf23a7..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.class
deleted file mode 100644
index 96c389f..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.class
deleted file mode 100644
index c0f4a78..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class b/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class
index 6dbdbcc..124ad82 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class and b/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class b/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class
index 4c7056c..917714b 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class and b/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/obj/Vertex.class b/target/classes/io/github/hydos/ginger/engine/obj/Vertex.class
index b724afb..b0849d4 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/obj/Vertex.class and b/target/classes/io/github/hydos/ginger/engine/obj/Vertex.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.class b/target/classes/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.class
index 006228b..796bbc8 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.class and b/target/classes/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/obj/normals/VertexNM.class b/target/classes/io/github/hydos/ginger/engine/obj/normals/VertexNM.class
index 81ca120..8d9aeee 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/obj/normals/VertexNM.class and b/target/classes/io/github/hydos/ginger/engine/obj/normals/VertexNM.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/particle/Particle.class b/target/classes/io/github/hydos/ginger/engine/particle/Particle.class
index 869ea42..3254901 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/particle/Particle.class and b/target/classes/io/github/hydos/ginger/engine/particle/Particle.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class b/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class
index 0e12499..55b4a3d 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class and b/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/particle/ParticleSystem.class b/target/classes/io/github/hydos/ginger/engine/particle/ParticleSystem.class
index 8379d27..7b401de 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/particle/ParticleSystem.class and b/target/classes/io/github/hydos/ginger/engine/particle/ParticleSystem.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.class
index 7c8b4bb..09a9125 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastShader.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastShader.class
index 7edbcdb..f57a430 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastShader.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastShader.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class
index 1d2d96a..8f475c6 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class
index 8c2114c..0ef3f5a 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/PostProcessing.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/PostProcessing.class
index bc08dde..4c1f569 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/PostProcessing.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/PostProcessing.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class
deleted file mode 100644
index e0f8d62..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/models/RawModel.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/models/RawModel.class
deleted file mode 100644
index f57d586..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/models/RawModel.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.class
deleted file mode 100644
index 3375f05..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.class
deleted file mode 100644
index 5bb6ffa..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.class
deleted file mode 100644
index 624d0c1..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.class
deleted file mode 100644
index 73c1af6..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class
deleted file mode 100644
index d306b5e..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class
deleted file mode 100644
index a6bf241..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class
deleted file mode 100644
index 06acb95..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.class
deleted file mode 100644
index 4472ab9..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.class
deleted file mode 100644
index 578a549..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.class
deleted file mode 100644
index ce543c3..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.class
deleted file mode 100644
index 52c9ec3..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.class
deleted file mode 100644
index 94743b5..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.class
deleted file mode 100644
index 5120c96..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class
deleted file mode 100644
index ff89f64..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class
deleted file mode 100644
index df60fa1..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class
deleted file mode 100644
index f717529..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/Image.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/Image.class
deleted file mode 100644
index 69a5faf..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/Image.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.class
deleted file mode 100644
index b417ebc..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.class
deleted file mode 100644
index dcae783..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class
deleted file mode 100644
index 43b3238..0000000
Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class and /dev/null differ
diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class
index aba8579..70defa3 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.class
index d816201..42d3b1d 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class
index 929c7fd..e877688 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowShader.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowShader.class
index 72e10ed..447830e 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowShader.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowShader.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/terrain/Terrain.class b/target/classes/io/github/hydos/ginger/engine/terrain/Terrain.class
index 365d633..6ed057b 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/terrain/Terrain.class and b/target/classes/io/github/hydos/ginger/engine/terrain/Terrain.class differ
diff --git a/target/classes/io/github/hydos/ginger/engine/utils/Loader.class b/target/classes/io/github/hydos/ginger/engine/utils/Loader.class
index c8dab9b..b022902 100644
Binary files a/target/classes/io/github/hydos/ginger/engine/utils/Loader.class and b/target/classes/io/github/hydos/ginger/engine/utils/Loader.class differ
diff --git a/target/classes/io/github/hydos/ginger/main/GingerMain.class b/target/classes/io/github/hydos/ginger/main/GingerMain.class
index 485916f..1d66131 100644
Binary files a/target/classes/io/github/hydos/ginger/main/GingerMain.class and b/target/classes/io/github/hydos/ginger/main/GingerMain.class differ