diff --git a/build.gradle b/build.gradle
index 486a58e..e48a813 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,28 +1,30 @@
 plugins {
 	id "java"
-	id "nova.gradle" version "0.2.5"
+	id "nova.gradle" version "0.2.6"
 	id "maven-publish"
 	id "com.jfrog.artifactory" version "3.1.1"
 }
 
-
 apply from: "https://raw.githubusercontent.com/NOVA-Team/NOVA-Gradle/master/shared-scripts/java.gradle"
 
 dependencies {
-	compile "nova.core:NovaCore:$novaVersion"
-	testCompile "nova.core:NovaCore:$novaVersion:wrappertests"
+	compile nova(nova_version)
 }
+
 nova {
 	wrappers {
 		"17" {
-			wrapper "nova.core:NOVA-Core-Wrapper-MC1.7:$novaVersion"
+			wrapper "nova.core:NOVA-Core-Wrapper-MC1.7:$nova_version"
 			runtime project(":minecraft:1.7")
 		}
-
 		"18" {
-			wrapper "nova.core:NOVA-Core-Wrapper-MC1.8:$novaVersion"
+			wrapper "nova.core:NOVA-Core-Wrapper-MC1.8:$nova_version"
 			runtime project(":minecraft:1.8")
 		}
+		"1_11" {
+			wrapper "nova.core:NOVA-Core-Wrapper-MC1.11:$nova_version"
+			runtime project(":minecraft:1.11")
+		}
 	}
 }
 
diff --git a/gradle.properties b/gradle.properties
index a35cc57..dc9e34e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 version = 0.0.1-SNAPSHOT
 group = nova.gui
-novaVersion = 0.1.0-SNAPSHOT
+nova_version = 0.1.0-SNAPSHOT
 
 packaging = jar
 info.inceptionYear = 2015
diff --git a/minecraft/.gitignore b/minecraft/.gitignore
index a4c6e69..896c508 100644
--- a/minecraft/.gitignore
+++ b/minecraft/.gitignore
@@ -3,5 +3,6 @@
 !/build.gradle
 !/.gitignore
 
+!/1.11
 !/1.8
 !/1.7
diff --git a/minecraft/1.11/.gitignore b/minecraft/1.11/.gitignore
new file mode 100644
index 0000000..85be317
--- /dev/null
+++ b/minecraft/1.11/.gitignore
@@ -0,0 +1,17 @@
+# Ignore All
+/*
+
+# Sources
+!/src
+
+# github
+!/.gitignore
+!/README.md
+
+# gradle
+!/build.gradle
+!/build.properties
+!/settings.gradle
+!/gradle.properties
+!/gradlew*
+!/gradle
diff --git a/minecraft/1.11/build.gradle b/minecraft/1.11/build.gradle
new file mode 100644
index 0000000..922cfa2
--- /dev/null
+++ b/minecraft/1.11/build.gradle
@@ -0,0 +1,73 @@
+apply plugin: "maven-publish"
+apply plugin: "com.jfrog.artifactory"
+apply from: "https://raw.githubusercontent.com/NOVA-Team/NOVA-Gradle/master/shared-scripts/java.gradle"
+
+idea.module.name = "GUI-MC-1.11"
+archivesBaseName = "NOVA-GUI-Wrapper-MC1.11"
+
+publishing {
+	publications {
+		main(MavenPublication) {
+			from components.java
+
+			artifactId "NOVA-GUI-Wrapper-MC1.11"
+
+			artifact sourcesJar
+			artifact javadocJar
+
+			pom.withXml(writePom(project.properties))
+		}
+	}
+}
+
+artifactory {
+	publish {
+		defaults {
+			publications("main")
+			publishPom = true
+		}
+	}
+}
+
+task deobfJar(type: Jar) {
+	from sourceSets.main.output
+	classifier = 'deobf'
+}
+
+artifacts {
+	archives jar
+	archives deobfJar
+}
+
+apply plugin: 'net.minecraftforge.gradle.forge'
+
+minecraft {
+	version = property("minecraft.version") + "-" + property("forge.version")
+	mappings = 'snapshot_20161220'
+	runDir = "run"
+}
+
+dependencies {
+	compile rootProject
+	compile group: "nova.core", name: "NOVA-Core", version: property("nova_version"), changing: true
+	compile "nova.core:NOVA-Core-Wrapper-MC1.11:0.1.0-SNAPSHOT:deobf"
+}
+
+processResources {
+	// this will ensure that this task is redone when the versions change.
+	inputs.property "version", project.version
+	inputs.property "mcversion", project.minecraft.version
+
+	// replace stuff in mcmod.info, nothing else
+	from(sourceSets.main.resources.srcDirs) {
+		include "mcmod.info"
+
+		// replace version and mcversion
+		expand "version": project.version, "mcversion": project.minecraft.version
+	}
+
+	// copy everything else, thats not the mcmod.info
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "mcmod.info"
+	}
+}
diff --git a/minecraft/1.11/gradle.properties b/minecraft/1.11/gradle.properties
new file mode 100644
index 0000000..9f642ab
--- /dev/null
+++ b/minecraft/1.11/gradle.properties
@@ -0,0 +1,9 @@
+group = nova.gui
+
+minecraft.version = 1.11
+forge.version = 13.19.1.2189
+forgeGradleVersion = 2.2-SNAPSHOT
+
+packaging = jar
+info.inceptionYear = 2016
+info.description = The NOVA-GUI Minecraft 1.11 wrapper.info.organization.name = NOVA
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/DrawableGuiComponent.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/DrawableGuiComponent.java
similarity index 92%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/DrawableGuiComponent.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/DrawableGuiComponent.java
index d926d4e..83a7c3d 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/DrawableGuiComponent.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/DrawableGuiComponent.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_11;
 
 import nova.gui.nativeimpl.NativeGuiComponent;
 import nova.gui.render.Graphics;
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/GuiUtils.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/GuiUtils.java
new file mode 100644
index 0000000..e63e3af
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/GuiUtils.java
@@ -0,0 +1,34 @@
+package nova.gui.wrapper.mc.forge.v1_11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.util.ResourceLocation;
+import nova.core.wrapper.mc.forge.v1_11.launcher.NovaMinecraft;
+import org.lwjgl.opengl.GL11;
+
+public class GuiUtils {
+
+	public static final ResourceLocation RESOURCE_GUI_CONTROLS = new ResourceLocation(NovaMinecraft.id, "textures/gui/controls.png");
+
+	public static void drawGUIWindow(int xOffset, int yOffset, int width, int height) {
+		GL11.glTranslatef(xOffset, yOffset, 0);
+
+		Gui.drawRect(3, 3, width - 3, height - 3, 0xFFC6C6C6);
+		Gui.drawRect(4, 0, width - 4, 1, 0xFF000000);
+		Gui.drawRect(4, 1, width - 4, 3, 0xFFFFFFFF);
+		Gui.drawRect(4, height - 1, width - 4, height, 0xFF000000);
+		Gui.drawRect(4, height - 3, width - 4, height - 1, 0xFF555555);
+		Gui.drawRect(0, 4, 1, height - 4, 0xFF000000);
+		Gui.drawRect(1, 4, 3, height - 4, 0xFFFFFFFF);
+		Gui.drawRect(width - 1, 4, width, height - 4, 0xFF000000);
+		Gui.drawRect(width - 3, 4, width - 1, height - 4, 0xFF555555);
+
+		Minecraft.getMinecraft().renderEngine.bindTexture(RESOURCE_GUI_CONTROLS);
+		GL11.glColor4f(1, 1, 1, 1);
+		Gui.drawModalRectWithCustomSizedTexture(0, 0, 0, 0, 4, 4, 32, 32);
+		Gui.drawModalRectWithCustomSizedTexture(width - 4, 0, 4, 0, 4, 4, 32, 32);
+		Gui.drawModalRectWithCustomSizedTexture(width - 4, height - 4, 4, 4, 4, 4, 32, 32);
+		Gui.drawModalRectWithCustomSizedTexture(0, height - 4, 0, 4, 4, 4, 32, 32);
+		GL11.glTranslatef(-xOffset, -yOffset, 0);
+	}
+}
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCButton.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCButton.java
new file mode 100644
index 0000000..4ba7c96
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCButton.java
@@ -0,0 +1,101 @@
+package nova.gui.wrapper.mc.forge.v1_11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraftforge.fml.client.config.GuiButtonExt;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import nova.gui.GuiEvent.MouseEvent;
+import nova.gui.GuiEvent.MouseEvent.EnumMouseState;
+import nova.gui.Outline;
+import nova.gui.component.Button;
+import nova.gui.nativeimpl.NativeButton;
+import nova.gui.render.Graphics;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.lwjgl.opengl.GL11;
+
+import java.util.Optional;
+
+public class MCButton extends MCGuiComponent<Button> implements NativeButton, DrawableGuiComponent {
+
+	@SideOnly(Side.CLIENT)
+	private MCGuiButton button;
+
+	public MCButton(Button component) {
+		super(component);
+
+		if (FMLCommonHandler.instance().getSide().isClient()) {
+			button = new MCGuiButton();
+		}
+
+		component.onGuiEvent(this::onMousePressed, MouseEvent.class);
+	}
+
+	@Override
+	public void setOutline(Outline outline) {
+		button.width = outline.getWidth();
+		button.height = outline.getHeight();
+		button.xPosition = outline.minXi();
+		button.yPosition = outline.minYi();
+		super.setOutline(outline);
+	}
+
+	@Override
+	public String getText() {
+		return button.displayString;
+	}
+
+	@Override
+	public void setText(String text) {
+		if (FMLCommonHandler.instance().getSide().isClient()) {
+			button.displayString = text;
+		}
+	}
+
+	@Override
+	public Optional<Vector2D> getMinimumSize() {
+		FontRenderer fontRenderer = Minecraft.getMinecraft().fontRendererObj;
+		return fontRenderer != null ? Optional.of(new Vector2D(fontRenderer.getStringWidth(button.displayString) + 10, fontRenderer.FONT_HEIGHT + 10)) : Optional.empty();
+	}
+
+	@Override
+	public boolean isPressed() {
+		// TODO
+		return false;
+	}
+
+	@Override
+	public void setPressed(boolean isPressed) {
+		// TODO
+	}
+
+	@Override
+	public void draw(int mouseX, int mouseY, float partial, Graphics graphics) {
+		button.drawButton(Minecraft.getMinecraft(), mouseX, mouseY);
+		super.draw(mouseX, mouseY, partial, graphics);
+	}
+
+	public void onMousePressed(MouseEvent event) {
+		if (event.state == EnumMouseState.DOWN) {
+			if (getComponent().isMouseOver()) {
+				button.playPressSound(Minecraft.getMinecraft().getSoundHandler());
+			}
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	public class MCGuiButton extends GuiButtonExt {
+
+		public MCGuiButton() {
+			super(0, 0, 0, "");
+		}
+
+		@Override
+		public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+			GL11.glTranslatef(-xPosition, -yPosition, 0);
+			super.drawButton(mc, mouseX + xPosition, mouseY + yPosition);
+			GL11.glTranslatef(xPosition, yPosition, 0);
+		}
+	}
+}
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCCanvas.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCCanvas.java
new file mode 100644
index 0000000..9570694
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCCanvas.java
@@ -0,0 +1,134 @@
+package nova.gui.wrapper.mc.forge.v1_11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.ResourceLocation;
+import nova.core.render.texture.Texture;
+import nova.gui.Spacing;
+import nova.gui.render.Canvas;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.lwjgl.opengl.GL11;
+
+public class MCCanvas extends Canvas {
+
+	private final Tessellator tessellator;
+	private final VertexBuffer worldRenderer;
+	private final float scale;
+
+	public MCCanvas(int width, int height, Tessellator tessellator) {
+		this(width, height, tessellator, 1F);
+	}
+
+	public MCCanvas(int width, int height, Tessellator tessellator, float scale) {
+		super(new Vector2D(width, height), false);
+		this.tessellator = tessellator;
+		this.worldRenderer = tessellator.getBuffer();
+		this.scale = scale;
+	}
+
+	@Override
+	public void bindTexture(Texture texture) {
+		Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(texture.getResource()));
+	}
+
+	@Override
+	public void startDrawing(boolean textured) {
+		if (!textured) {
+			GL11.glDisable(GL11.GL_TEXTURE_2D);
+		}
+		GL11.glColor4f(state.color().redf(), state.color().greenf(), state.color().bluef(), state.color().alphaf());
+		worldRenderer.begin(GL11.GL_POLYGON, DefaultVertexFormats.POSITION_TEX_COLOR);
+	}
+
+	@Override
+	public void addVertex(double x, double y) {
+		worldRenderer.pos(x, y, state.zIndex());
+	}
+
+	@Override
+	public void addVertexWithUV(double x, double y, double u, double v) {
+		worldRenderer.tex(u, v);
+		worldRenderer.pos(x, y, state.zIndex());
+	}
+
+	@Override
+	public void draw() {
+		tessellator.draw();
+		GL11.glEnable(GL11.GL_TEXTURE_2D);
+	}
+
+	@Override
+	public void translate(double x, double y) {
+		super.translate(x, y);
+		GL11.glTranslated(x, y, 0);
+	}
+
+	@Override
+	public void rotate(double angle) {
+		super.rotate(angle);
+		GL11.glRotated(angle, 0, 0, 1);
+	}
+
+	@Override
+	public void push() {
+		super.push();
+		GL11.glPushMatrix();
+	}
+
+	@Override
+	public void pop() {
+		super.pop();
+		GL11.glPopMatrix();
+
+		Spacing scissor = state.scissor();
+		glScissor(scissor.top(), scissor.right(), scissor.bottom(), scissor.left());
+		if (state.isScissor()) {
+			GL11.glEnable(GL11.GL_SCISSOR_TEST);
+		} else {
+			GL11.glDisable(GL11.GL_SCISSOR_TEST);
+		}
+	}
+
+	@Override
+	public void setScissor(int top, int right, int bottom, int left) {
+		glScissor(top, right, bottom, left);
+		super.setScissor(top, right, bottom, left);
+	}
+
+	@Override
+	public void addScissor(int top, int right, int bottom, int left) {
+		super.addScissor(top, right, bottom, left);
+		Spacing scissor = state.scissor();
+		glScissor(scissor.top(), scissor.right(), scissor.bottom(), scissor.left());
+	}
+
+	private void glScissor(int top, int right, int bottom, int left) {
+		//System.out.println();
+		//System.out.println(top + " " + right + " " + bottom + " " + left);
+		Minecraft mc = Minecraft.getMinecraft();
+
+		left = (int) Math.max(Math.ceil(left * scale), 0);
+		top = (int) Math.max(Math.ceil(top * scale), 0);
+		right = (int) Math.min(Math.ceil(mc.displayWidth / scale) * scale - Math.ceil(right * scale), mc.displayWidth);
+		bottom = (int) Math.min(Math.ceil(mc.displayHeight / scale) * scale - Math.ceil(bottom * scale), mc.displayHeight);
+
+		//System.out.println(top + " " + right + " " + bottom + " " + left);
+
+		GL11.glScissor(left, mc.displayHeight - bottom - top, right + left, bottom);
+
+	}
+
+	@Override
+	public void enableScissor() {
+		GL11.glEnable(GL11.GL_SCISSOR_TEST);
+		super.enableScissor();
+	}
+
+	@Override
+	public void disableScissor() {
+		GL11.glDisable(GL11.GL_SCISSOR_TEST);
+		super.disableScissor();
+	}
+}
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGui.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGui.java
new file mode 100644
index 0000000..fec077f
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGui.java
@@ -0,0 +1,291 @@
+package nova.gui.wrapper.mc.forge.v1_11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import nova.core.network.Packet;
+import nova.core.wrapper.mc.forge.v1_11.network.netty.MCNetworkManager;
+import nova.gui.Gui;
+import nova.gui.GuiComponent;
+import nova.gui.GuiEvent.MouseEvent.EnumMouseButton;
+import nova.gui.Outline;
+import nova.gui.nativeimpl.NativeGui;
+import nova.gui.render.Canvas;
+import nova.gui.render.Graphics;
+import nova.gui.render.text.TextMetrics;
+import nova.gui.wrapper.mc.forge.v1_11.text.MCTextRenderer;
+import nova.internal.core.Game;
+import nova.gui.wrapper.mc.forge.v1_11.network.PacketGui;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+
+import java.io.IOException;
+import java.util.Optional;
+
+/**
+ * Minecraft implementation of the NOVA GUI System
+ *
+ * @author Vic Nightfall
+ */
+public class MCGui extends MCGuiContainer implements NativeGui, DrawableGuiComponent {
+
+	private static final Container fakeContainer = new Container() {
+		@Override
+		public boolean canInteractWith(EntityPlayer player) {
+			return false;
+		}
+	};
+	private final Gui component;
+	private Outline outline = Outline.empty;
+	private Graphics graphics;
+	private MCTextRenderer textRenderer;
+	@SideOnly(Side.CLIENT)
+	private MCGuiScreen guiScreen;
+	private MCContainer container;
+
+	public MCGui(Gui component) {
+		super(component);
+		this.component = component;
+
+		if (FMLCommonHandler.instance().getSide().isClient()) {
+			guiScreen = new MCGuiScreen();
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	public MCGuiScreen getGuiScreen() {
+		return guiScreen;
+	}
+
+	public MCContainer newContainer() {
+		container = new MCContainer();
+		if (FMLCommonHandler.instance().getSide().isClient()) {
+			guiScreen.inventorySlots = container;
+		}
+		for (GuiComponent<?, ?> component : components) {
+			((DrawableGuiComponent) component.getNative()).onAddedToContainer(container);
+		}
+		return container;
+	}
+
+	@Override
+	public MCCanvas getCanvas() {
+		return (MCCanvas) graphics.getCanvas();
+	}
+
+	@Override
+	public TextMetrics getTextMetrics() {
+		return textRenderer;
+	}
+
+	@Override
+	public Gui getComponent() {
+		return component;
+	}
+
+	@Override
+	public Outline getOutline() {
+		return outline;
+	}
+
+	@Override
+	public void setOutline(Outline outline) {
+		this.outline = outline;
+	}
+
+	@Override
+	public void requestRender() {
+		// Not needed as it gets redrawn every frame
+	}
+
+	@Override
+	public void dispatchNetworkEvent(Packet packet) {
+		// TODO I think the NetworkManager should be able to do this
+		MCNetworkManager manager = (MCNetworkManager) Game.network();
+		manager.sendToServer(new PacketGui(packet));
+	}
+
+	@Override
+	public void draw(int mouseX, int mouseY, float partial, Graphics graphics) {
+
+		Canvas canvas = graphics.getCanvas();
+
+		Optional<Vector2D> preferredSize = getComponent().getPreferredSize();
+		if (preferredSize.isPresent()) {
+			// We have a preferred size so we can draw our fancy gray
+			// background.
+
+			Vector2D size = getOutline().getDimension();
+			Vector2D position = getOutline().getPosition();
+			GuiUtils.drawGUIWindow((int) position.getX() - 4, (int) position.getY() - 4, (int) size.getX() + 8, (int) size.getY() + 8);
+		}
+
+		Outline guiOutline = getOutline();
+		canvas.translate(guiOutline.minXi(), guiOutline.minYi());
+		super.draw(mouseX - guiOutline.minXi(), mouseY - guiOutline.minYi(), partial, graphics);
+		canvas.translate(-guiOutline.minXi(), -guiOutline.minYi());
+	}
+
+	public class MCContainer extends Container {
+
+		@Override
+		public boolean canInteractWith(EntityPlayer player) {
+			return true;
+		}
+
+		public MCGui getGui() {
+			return MCGui.this;
+		}
+
+		@Override
+		public void onContainerClosed(EntityPlayer player) {
+			super.onContainerClosed(player);
+			getGui().component.unbind();
+		}
+
+		@Override
+		public Slot addSlotToContainer(Slot slot) {
+			return super.addSlotToContainer(slot);
+		}
+
+		@Override
+		public ItemStack transferStackInSlot(EntityPlayer player, int slot) {
+			// TODO Nothing here
+			return null;
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	public class MCGuiScreen extends GuiContainer {
+
+		public MCGuiScreen() {
+			super(MCGui.this.container);
+		}
+
+		// TODO bridge, might want to use the AT for this?
+		public int guiLeft() {
+			return guiLeft;
+		}
+
+		public int guiTop() {
+			return guiTop;
+		}
+
+		@Override
+		public void drawScreen(int mouseX, int mouseY, float partial) {
+			Container container = inventorySlots;
+			// Replace container instance withPriority fake container in order to stop
+			// slot rendering
+			inventorySlots = fakeContainer;
+			super.drawScreen(mouseX, mouseY, partial);
+			// Back to where it belongs
+			inventorySlots = container;
+		}
+
+		@Override
+		protected void drawGuiContainerBackgroundLayer(float partial, int mouseX, int mouseY) {
+			GL11.glDisable(GL11.GL_CULL_FACE);
+			GL11.glPushMatrix();
+			MCGui.this.draw(mouseX, mouseY, partial, graphics);
+			GL11.glPopMatrix();
+			GL11.glEnable(GL11.GL_CULL_FACE);
+		}
+
+		@Override
+		protected void mouseClicked(int mouseX, int mouseY, int button) {
+			onMousePressed(mouseX - getOutline().minXi(), mouseY - getOutline().minYi(), getMouseButton(button), true);
+
+			try {
+				super.mouseClicked(mouseX, mouseY, button);
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+		@Override
+		protected void mouseClickMove(int mouseX, int mouseY, int button, long time) {
+			onMousePressed(mouseX - getOutline().minXi(), mouseY - getOutline().minYi(), getMouseButton(button), false);
+			super.mouseClickMove(mouseX, mouseY, button, time);
+		}
+
+		private EnumMouseButton getMouseButton(int button) {
+			switch (button) {
+				case 0:
+				default:
+					return EnumMouseButton.LEFT;
+				case 1:
+					return EnumMouseButton.RIGHT;
+				case 2:
+					return EnumMouseButton.MIDDLE;
+			}
+		}
+
+		@Override
+		public void handleKeyboardInput() {
+			boolean state = Keyboard.getEventKeyState();
+			int key = Keyboard.getEventKey();
+			char ch = Keyboard.getEventCharacter();
+			onKeyPressed(Game.input().getKey(key), ch, state);
+			if (state) {
+				try {
+					keyTyped(ch, key);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+
+			this.mc.dispatchKeypresses();
+		}
+
+		@Override
+		public boolean doesGuiPauseGame() {
+			return false;
+		}
+
+		@Override
+		public void setWorldAndResolution(Minecraft mc, int width, int height) {
+			ScaledResolution scaledresolution = new ScaledResolution(mc);
+
+			MCCanvas canvas = new MCCanvas(width, height, Tessellator.getInstance(), scaledresolution.getScaleFactor());
+			if (textRenderer == null) {
+				textRenderer = new MCTextRenderer(fontRendererObj, canvas);
+			}
+
+			textRenderer.setCanvas(canvas);
+			graphics = new Graphics(canvas, textRenderer);
+
+			boolean resized = width != outline.getWidth() || height != outline.getHeight();
+			Outline oldOutline = outline;
+			outline = new Outline(0, 0, width, height);
+
+			if (resized) {
+				Optional<Vector2D> preferredSize = getComponent().getPreferredSize();
+				if (preferredSize.isPresent()) {
+					// Set the size to the preferred size and center the GUI
+					Vector2D size = preferredSize.get();
+					int xOffset = (int) (width / 2 - size.getX() / 2);
+					int yOffset = (int) (height / 2 - size.getY() / 2);
+					setOutline(getOutline().setPosition(new Vector2D(xOffset, yOffset)).setDimension(size));
+				}
+				onResized(oldOutline);
+			}
+
+			xSize = outline.getWidth();
+			ySize = outline.getHeight();
+			super.setWorldAndResolution(mc, width, height);
+		}
+
+		public MCGui getGui() {
+			return MCGui.this;
+		}
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiComponent.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiComponent.java
old mode 100755
new mode 100644
similarity index 95%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiComponent.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiComponent.java
index 37d10e7..365b8a4
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiComponent.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiComponent.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_11;
 
 import nova.gui.GuiComponent;
 import nova.gui.Outline;
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiComponentFactory.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiComponentFactory.java
old mode 100755
new mode 100644
similarity index 96%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiComponentFactory.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiComponentFactory.java
index 3bc9bf7..beca506
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiComponentFactory.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiComponentFactory.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_11;
 
 import nova.gui.AbstractGuiContainer;
 import nova.gui.Gui;
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiContainer.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiContainer.java
old mode 100755
new mode 100644
similarity index 94%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiContainer.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiContainer.java
index 2293ed2..f4cb190
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiContainer.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiContainer.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_11;
 
 import nova.gui.AbstractGuiContainer;
 import nova.gui.GuiComponent;
@@ -6,7 +6,7 @@
 import nova.gui.nativeimpl.NativeContainer;
 import nova.gui.render.Canvas;
 import nova.gui.render.Graphics;
-import nova.gui.wrapper.mc17.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_11.MCGui.MCContainer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiFactory.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiFactory.java
new file mode 100644
index 0000000..869ca5a
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiFactory.java
@@ -0,0 +1,126 @@
+package nova.gui.wrapper.mc.forge.v1_11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.network.IGuiHandler;
+import nova.core.entity.Entity;
+import nova.core.wrapper.mc.forge.v1_11.launcher.NovaMinecraft;
+import nova.core.wrapper.mc.forge.v1_11.wrapper.entity.backward.BWEntity;
+import nova.gui.Gui;
+import nova.gui.GuiException;
+import nova.gui.factory.GuiFactory;
+import nova.gui.factory.GuiManager;
+import nova.gui.wrapper.mc.forge.v1_11.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_11.MCGui.MCGuiScreen;
+import nova.internal.core.Game;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class MCGuiFactory extends GuiManager {
+
+	private static Optional<Gui> guiToOpen = Optional.empty();
+	private static List<GuiFactory> idMappedFactories = new ArrayList<>();
+
+	public MCGuiFactory() {
+		super(Game.events());
+	}
+
+	@Override
+	public GuiFactory register(GuiFactory factory) {
+		idMappedFactories.add(factory);
+		return super.register(factory);
+	}
+
+	@Override
+	public void showGui(String identifier, Entity entity, Vector3D pos) {
+		GuiFactory factory = registry.get(identifier).orElseThrow(() -> new GuiException(String.format("No GUI called %s registered!", identifier)));
+		Gui gui = factory.build();
+		showGui(gui, entity, pos, idMappedFactories.indexOf(factory));
+	}
+
+	@Override
+	protected void showGui(Gui gui, Entity entity, Vector3D pos) {
+		showGui(gui, entity, pos, -1);
+	}
+
+	private void showGui(Gui gui, Entity entity, Vector3D pos, int id) {
+		BWEntity player = (BWEntity) entity;
+		guiToOpen = Optional.of(gui);
+		if (player.entity.world.isRemote != gui.hasServerSide()) {
+			((EntityPlayer) player.entity).openGui(NovaMinecraft.id, id, ((EntityPlayer) player.entity).getEntityWorld(), (int) pos.getX(), (int) pos.getY(), (int) pos.getZ());
+		}
+	}
+
+	@Override
+	protected void closeGui(Gui gui) {
+		if (gui.hasServerSide()) {
+			Minecraft.getMinecraft().player.closeScreen();
+		} else {
+			//TODO Does this work?
+			Minecraft.getMinecraft().player.closeScreen();
+		}
+	}
+
+	@Override
+	public Optional<Gui> getActiveGuiImpl() {
+		GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+		if (gui instanceof MCGuiScreen) {
+			return Optional.of(((MCGuiScreen) gui).getGui().getComponent());
+		}
+		return Optional.empty();
+	}
+
+	@Override
+	public Optional<Gui> getActiveGuiImpl(Entity player) {
+		BWEntity entityPlayer = (BWEntity) player;
+		Container container = ((EntityPlayer) entityPlayer.entity).openContainer;
+		if (container instanceof MCContainer) {
+			return Optional.of(((MCContainer) container).getGui().getComponent());
+		}
+		return Optional.empty();
+	}
+
+	public static class GuiHandler implements IGuiHandler {
+
+		@Override
+		public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {
+			if (guiToOpen.isPresent()) {
+				Gui gui = guiToOpen.get();
+				guiToOpen = Optional.empty();
+				gui.bind(new BWEntity(player), new Vector3D(x, y, z));
+				return ((MCGui) gui.getNative()).newContainer();
+			}
+			return null;
+		}
+
+		@Override
+		public GuiContainer getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {
+			Gui gui;
+			if (guiToOpen.isPresent()) {
+				// Check if the client side GUI instance was set withPriority showGui on
+				// the client
+				gui = guiToOpen.get();
+				guiToOpen = Optional.empty();
+			} else {
+				// Try to get the client side GUI from the id mapping
+				gui = idMappedFactories.get(id).build();
+			}
+			if (gui == null) {
+				throw new GuiException("Couldn't get client side instance for the provided GUI of id " + id + " !");
+			}
+
+			gui.bind(new BWEntity(player), new Vector3D(x, y, z));
+
+			MCGui nativeGui = (MCGui) gui.getNative();
+			nativeGui.newContainer();
+			return nativeGui.getGuiScreen();
+		}
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiPlayerInventory.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiPlayerInventory.java
old mode 100755
new mode 100644
similarity index 87%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiPlayerInventory.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiPlayerInventory.java
index dc58571..ef5d4c6
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiPlayerInventory.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiPlayerInventory.java
@@ -1,12 +1,12 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_11;
 
 import net.minecraft.inventory.IInventory;
+import nova.core.wrapper.mc.forge.v1_11.wrapper.inventory.BWInventory;
 import nova.gui.component.inventory.PlayerInventory;
 import nova.gui.nativeimpl.NativePlayerInventory;
 import nova.gui.render.Graphics;
-import nova.gui.wrapper.mc17.MCGui.MCContainer;
-import nova.gui.wrapper.mc17.MCGui.MCGuiScreen;
-import nova.wrapper.mc1710.wrapper.inventory.BWInventory;
+import nova.gui.wrapper.mc.forge.v1_11.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_11.MCGui.MCGuiScreen;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 
 import java.util.ArrayList;
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiSlot.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiSlot.java
new file mode 100644
index 0000000..11c8387
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/MCGuiSlot.java
@@ -0,0 +1,124 @@
+package nova.gui.wrapper.mc.forge.v1_11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import nova.core.wrapper.mc.forge.v1_11.wrapper.inventory.FWInventory;
+import nova.core.wrapper.mc.forge.v1_11.wrapper.item.ItemConverter;
+import nova.gui.component.inventory.Slot;
+import nova.gui.nativeimpl.NativeSlot;
+import nova.gui.render.Graphics;
+import nova.gui.wrapper.mc.forge.v1_11.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_11.MCGui.MCGuiScreen;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.lwjgl.opengl.GL11;
+
+import java.util.Optional;
+
+public class MCGuiSlot extends MCGuiComponent<Slot> implements NativeSlot, DrawableGuiComponent {
+
+	private MCSlot slot;
+
+	public MCGuiSlot(Slot component) {
+		super(component);
+	}
+
+	protected static void drawSlot(MCGuiScreen gui, MCSlot slot, int mouseX, int mouseY, boolean drawBackground) {
+		RenderHelper.enableGUIStandardItemLighting();
+
+		if (drawBackground) {
+			// Draw slot background
+			Minecraft.getMinecraft().renderEngine.bindTexture(GuiUtils.RESOURCE_GUI_CONTROLS);
+			GL11.glColor3f(1, 1, 1);
+			Gui.drawModalRectWithCustomSizedTexture(slot.xPos - 1, slot.yPos - 1, 0, 8, 18, 18, 32, 32);
+		}
+
+		// Translate item renderer back to the origin
+		GL11.glTranslatef(0, 0, -150);
+		gui.drawSlot(slot);
+		GL11.glTranslatef(0, 0, 150);
+
+		if (mouseX >= slot.xPos
+			&& mouseY >= slot.yPos
+			&& mouseX < slot.xPos + 18
+			&& mouseY < slot.yPos + 18
+			&& slot.canBeHovered()) {
+
+			gui.theSlot = slot;
+			GL11.glDisable(GL11.GL_LIGHTING);
+			GL11.glDisable(GL11.GL_DEPTH_TEST);
+			GL11.glColorMask(true, true, true, false);
+			gui.drawGradientRect(slot.xPos, slot.yPos, slot.xPos + 16, slot.yPos + 16, 0x80FFFFFF, 0x80FFFFFF);
+			GL11.glColorMask(true, true, true, true);
+			GL11.glEnable(GL11.GL_LIGHTING);
+			GL11.glEnable(GL11.GL_DEPTH_TEST);
+		}
+
+		RenderHelper.disableStandardItemLighting();
+	}
+
+	@Override
+	public Optional<Vector2D> getPreferredSize() {
+		return Optional.of(new Vector2D(18, 18));
+	}
+
+	@Override
+	public void draw(int mouseX, int mouseY, float partial, Graphics graphics) {
+		MCGuiScreen gui = getGui().getGuiScreen();
+		MCCanvas canvas = getCanvas();
+		slot.reset();
+		drawSlot(gui, slot, mouseX, mouseY, !getComponent().getBackground().isPresent());
+		slot.setPosition(canvas.getState().txi(), canvas.getState().tyi(), gui);
+		super.draw(mouseX, mouseY, partial, graphics);
+	}
+
+	@Override
+	public void onAddedToContainer(MCContainer container) {
+		IInventory inventory = new FWInventory(getComponent().getInventory());
+		slot = new MCSlot(inventory, getComponent().getSlotID(), 0, 0, getComponent());
+		container.addSlotToContainer(slot);
+	}
+
+	public static class MCSlot extends net.minecraft.inventory.Slot {
+
+		private final int xCoord;
+		private final int yCoord;
+		private final Slot slot;
+
+		public MCSlot(IInventory inventory, int id, int xCoord, int yCoord) {
+			this(inventory, id, xCoord, yCoord, null);
+		}
+
+		public MCSlot(IInventory inventory, int id, int xCoord, int yCoord, Slot slot) {
+			super(inventory, id, 0, 0);
+			this.xCoord = xCoord;
+			this.yCoord = yCoord;
+			this.slot = slot;
+		}
+
+		public void setPosition(int x, int y, MCGuiScreen gui) {
+			this.xPos = xCoord + x - gui.guiLeft();
+			this.yPos = yCoord + y - gui.guiTop();
+		}
+
+		public void reset() {
+			this.xPos = xCoord;
+			this.yPos = yCoord;
+		}
+
+		@Override
+		public boolean isItemValid(ItemStack stack) {
+			return slot == null || !slot.isReadOnly() && slot.accept(ItemConverter.instance().getNovaItem(stack));
+		}
+
+		@Override
+		public ItemStack decrStackSize(int size) {
+			if (slot == null || !slot.isReadOnly()) {
+				return super.decrStackSize(size);
+			}
+			return getStack();
+		}
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/dependency/GuiModule.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/dependency/GuiModule.java
old mode 100755
new mode 100644
similarity index 66%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/dependency/GuiModule.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/dependency/GuiModule.java
index d70baf9..e1980dd
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/dependency/GuiModule.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/dependency/GuiModule.java
@@ -1,9 +1,9 @@
-package nova.gui.wrapper.mc17.dependency;
+package nova.gui.wrapper.mc.forge.v1_11.dependency;
 
 import nova.gui.factory.GuiComponentFactory;
 import nova.gui.factory.GuiManager;
-import nova.gui.wrapper.mc17.MCGuiComponentFactory;
-import nova.gui.wrapper.mc17.MCGuiFactory;
+import nova.gui.wrapper.mc.forge.v1_11.MCGuiComponentFactory;
+import nova.gui.wrapper.mc.forge.v1_11.MCGuiFactory;
 import se.jbee.inject.bind.BinderModule;
 
 public class GuiModule extends BinderModule {
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/launch/NovaGuiWrapper.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/launch/NovaGuiWrapper.java
new file mode 100644
index 0000000..5f80c7d
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/launch/NovaGuiWrapper.java
@@ -0,0 +1,25 @@
+package nova.gui.wrapper.mc.forge.v1_11.launch;
+
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import nova.core.loader.Loadable;
+import nova.core.loader.Mod;
+import nova.core.wrapper.mc.forge.v1_11.launcher.NovaMinecraft;
+import nova.gui.wrapper.mc.forge.v1_11.MCGuiFactory;
+import nova.gui.wrapper.mc.forge.v1_11.dependency.GuiModule;
+
+/**
+ * The main class to initialize the Gui Plugin
+ *
+ * @author Calclavia
+ */
+@Mod(id = "nova-gui-wrapper", name = "NOVA-GUI", version = "0.0.1", modules = { GuiModule.class }, novaVersion = "0.1.0")
+public class NovaGuiWrapper implements Loadable {
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void preInit() {
+		NetworkRegistry.INSTANCE.registerGuiHandler(NovaMinecraft.instance, new MCGuiFactory.GuiHandler());
+	}
+}
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/network/PacketGui.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/network/PacketGui.java
new file mode 100644
index 0000000..3ddd432
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/network/PacketGui.java
@@ -0,0 +1,46 @@
+package nova.gui.wrapper.mc.forge.v1_11.network;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import net.minecraft.entity.player.EntityPlayer;
+import nova.core.network.Packet;
+import nova.core.wrapper.mc.forge.v1_11.network.MCPacket;
+import nova.core.wrapper.mc.forge.v1_11.network.discriminator.PacketAbstract;
+import nova.gui.GuiException;
+import nova.gui.wrapper.mc.forge.v1_11.MCGui.MCContainer;
+
+//TODO: This is NOT used. NO-OP
+public class PacketGui extends PacketAbstract {
+
+	private MCPacket wrapped;
+
+	public PacketGui() {
+
+	}
+
+	public PacketGui(Packet wrapped) {
+		this.wrapped = (MCPacket) wrapped;
+	}
+
+	@Override
+	public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {
+		wrapped.writeTo(buffer);
+	}
+
+	@Override
+	public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) {
+		ByteBuf packetBuffer = Unpooled.buffer();
+		packetBuffer.writeBytes(buffer);
+		wrapped = new MCPacket(packetBuffer);
+	}
+
+	@Override
+	public void handleServerSide(EntityPlayer player) {
+		if (player.openContainer instanceof MCContainer) {
+			((MCContainer) player.openContainer).getGui().onNetworkEvent(wrapped);
+		} else {
+			throw new GuiException("Received an invalid GUI event packet, server side not present!");
+		}
+	}
+}
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/AbstractParagraph.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/AbstractParagraph.java
similarity index 94%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/AbstractParagraph.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/AbstractParagraph.java
index 7248176..3950a09 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/AbstractParagraph.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/AbstractParagraph.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18.text;
+package nova.gui.wrapper.mc.forge.v1_11.text;
 
 import nova.gui.render.text.TextRenderer.RenderedText;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/IText.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/IText.java
similarity index 98%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/IText.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/IText.java
index 06460ae..295f909 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/IText.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/IText.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18.text;
+package nova.gui.wrapper.mc.forge.v1_11.text;
 
 import net.minecraft.client.gui.FontRenderer;
 import nova.gui.render.text.FormattedText.TextFormat;
diff --git a/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/MCTextRenderer.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/MCTextRenderer.java
new file mode 100644
index 0000000..db80203
--- /dev/null
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/MCTextRenderer.java
@@ -0,0 +1,104 @@
+package nova.gui.wrapper.mc.forge.v1_11.text;
+
+import net.minecraft.client.gui.FontRenderer;
+import nova.core.render.Color;
+import nova.core.util.math.MathUtil;
+import nova.gui.render.text.FormattedText;
+import nova.gui.render.text.TextRenderer;
+import nova.gui.wrapper.mc.forge.v1_11.MCCanvas;
+import nova.gui.wrapper.mc.forge.v1_11.text.IText.Text;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.lwjgl.opengl.GL11;
+
+import java.util.List;
+
+public class MCTextRenderer implements TextRenderer {
+
+	private final FontRenderer fontrenderer;
+	MCCanvas canvas;
+	int zIndex;
+
+	public MCTextRenderer(FontRenderer fontrenderer, MCCanvas canvas) {
+		this.fontrenderer = fontrenderer;
+		this.canvas = canvas;
+	}
+
+	public void setCanvas(MCCanvas canvas) {
+		this.canvas = canvas;
+	}
+
+	protected int drawText(List<Text> text, int x, int y, int xOffset, int yOffset) {
+		for (Text sub : text) {
+			drawText(sub, x, y, xOffset, yOffset);
+			xOffset += sub.getDimensions().getX() + 1;
+		}
+		return xOffset;
+	}
+
+	protected void drawText(Text text, int x, int y, int xOffset, int yOffset) {
+		float scale = text.format.size / (float) fontrenderer.FONT_HEIGHT;
+		if (text.format.size != fontrenderer.FONT_HEIGHT) {
+			GL11.glPushMatrix();
+			GL11.glTranslatef(x + xOffset, y - fontrenderer.FONT_HEIGHT * scale + scale * 2F + yOffset, 0);
+			GL11.glScalef(scale, scale, 0);
+			GL11.glTranslatef(-x - xOffset, -y, 0);
+
+			fontrenderer.drawString(text.text, x + xOffset, y, text.format.color.argb(), text.format.shadow);
+
+			GL11.glPopMatrix();
+		} else {
+			fontrenderer.drawString(text.text, x + xOffset, y - fontrenderer.FONT_HEIGHT + 2 + yOffset, text.format.color.argb(), text.format.shadow);
+		}
+	}
+
+	@Override
+	public void drawString(int x, int y, String str) {
+		GL11.glTranslatef(0, 0, zIndex);
+		fontrenderer.drawString(str.replaceAll("\u00A7", ""), x, y, Color.black.argb());
+		GL11.glTranslatef(0, 0, -zIndex);
+	}
+
+	@Override
+	public void drawString(int x, int y, String str, int width) {
+		GL11.glTranslatef(0, 0, zIndex);
+		fontrenderer.drawSplitString(str.replaceAll("\u00A7", "").replaceAll("%n", "\n"), x, y, width, Color.black.argb());
+		GL11.glTranslatef(0, 0, -zIndex);
+	}
+
+	@Override
+	public void drawCutString(int x, int y, String str, int width) {
+		// TODO implement
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void setZIndex(int zIndex) {
+		this.zIndex = zIndex;
+	}
+
+	@Override
+	public Vector2D getBounds(String str) {
+		int height = 0, width = 0;
+		for (String line : str.split("%n|\n")) {
+			width = MathUtil.max(width, fontrenderer.getStringWidth(line));
+			height += fontrenderer.FONT_HEIGHT;
+		}
+		return new Vector2D(width, height);
+	}
+
+	@Override
+	public RenderedText cacheString(FormattedText str) {
+		return new SimpleParagraph(str, fontrenderer);
+	}
+
+	@Override
+	public RenderedText cacheString(FormattedText str, int width) {
+		return new Paragraph(str, fontrenderer, width);
+	}
+
+	@Override
+	public RenderedText cacheCutString(FormattedText str, int width) {
+		// TODO: Implement this.
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/Paragraph.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/Paragraph.java
old mode 100755
new mode 100644
similarity index 96%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/Paragraph.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/Paragraph.java
index 115e520..6b15de5
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/Paragraph.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/Paragraph.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17.text;
+package nova.gui.wrapper.mc.forge.v1_11.text;
 
 import com.google.common.collect.Lists;
 import net.minecraft.client.gui.FontRenderer;
@@ -6,7 +6,7 @@
 import nova.gui.render.text.FormattedText.TextFormat;
 import nova.gui.render.text.TextRenderer;
 import nova.gui.render.text.TextRenderer.RenderedText;
-import nova.gui.wrapper.mc17.text.IText.Word;
+import nova.gui.wrapper.mc.forge.v1_11.text.IText.Word;
 import org.lwjgl.opengl.GL11;
 
 import java.util.List;
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/SimpleParagraph.java b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/SimpleParagraph.java
old mode 100755
new mode 100644
similarity index 94%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/SimpleParagraph.java
rename to minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/SimpleParagraph.java
index 73f21b6..787dba1
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/SimpleParagraph.java
+++ b/minecraft/1.11/src/main/java/nova/gui/wrapper/mc/forge/v1_11/text/SimpleParagraph.java
@@ -1,11 +1,11 @@
-package nova.gui.wrapper.mc17.text;
+package nova.gui.wrapper.mc.forge.v1_11.text;
 
 import net.minecraft.client.gui.FontRenderer;
 import nova.gui.render.text.FormattedText;
 import nova.gui.render.text.FormattedText.TextFormat;
 import nova.gui.render.text.TextRenderer;
 import nova.gui.render.text.TextRenderer.RenderedText;
-import nova.gui.wrapper.mc17.text.IText.Text;
+import nova.gui.wrapper.mc.forge.v1_11.text.IText.Text;
 import org.lwjgl.opengl.GL11;
 
 class SimpleParagraph extends AbstractParagraph<Text> implements RenderedText {
diff --git a/minecraft/1.11/src/main/resources/META-INF/nova_at.cfg b/minecraft/1.11/src/main/resources/META-INF/nova_at.cfg
new file mode 100644
index 0000000..49d7307
--- /dev/null
+++ b/minecraft/1.11/src/main/resources/META-INF/nova_at.cfg
@@ -0,0 +1,6 @@
+# NOVA Access Transformer configuration file
+
+# Gui
+public net.minecraft.client.gui.inventory.GuiContainer func_146977_a(Lnet/minecraft/inventory/Slot;)V # drawSlot
+public net.minecraft.client.gui.Gui func_73733_a(IIIIII)V # drawGradientRect
+public net.minecraft.client.gui.inventory.GuiContainer field_147006_u # theSlot
\ No newline at end of file
diff --git a/minecraft/1.7/build.gradle b/minecraft/1.7/build.gradle
index 11d6cbf..c2b452b 100755
--- a/minecraft/1.7/build.gradle
+++ b/minecraft/1.7/build.gradle
@@ -58,8 +58,8 @@ minecraft {
 
 dependencies {
 	compile rootProject
-	compile group: "nova.core", name: "NovaCore", version: property("novaVersion"), changing: true
-	compile "nova.wrapper.mc1710:NovaWrapper-MC1.7.10:0.1-SNAPSHOT:deobf"
+	compile group: "nova.core", name: "NOVA-Core", version: property("nova_version"), changing: true
+	compile "nova.core:NOVA-Core-Wrapper-MC1.7:0.1.0-SNAPSHOT:deobf"
 }
 
 processResources {
diff --git a/minecraft/1.7/gradle.properties b/minecraft/1.7/gradle.properties
index b7ea1f6..d502192 100755
--- a/minecraft/1.7/gradle.properties
+++ b/minecraft/1.7/gradle.properties
@@ -1,7 +1,10 @@
+group = nova.gui
+
 minecraft.version = 1.7.10
 forge.version = 10.13.4.1448-1.7.10
+forgeGradleVersion = 1.2-SNAPSHOT
 
 packaging = jar
 info.inceptionYear = 2015
-info.description = The NOVA-Minecraft Minecraft 1.7.10 wrapper.
+info.description = The NOVA-GUI Minecraft 1.7.10 wrapper.
 info.organization.name = NOVA
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/DrawableGuiComponent.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/DrawableGuiComponent.java
new file mode 100644
index 0000000..46f7ef6
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/DrawableGuiComponent.java
@@ -0,0 +1,21 @@
+package nova.gui.wrapper.mc.forge.v1_7_10;
+
+import nova.gui.nativeimpl.NativeGuiComponent;
+import nova.gui.render.Graphics;
+
+public interface DrawableGuiComponent extends NativeGuiComponent {
+
+	public void draw(int mouseX, int mouseY, float partial, Graphics graphics);
+
+	public default void onAddedToContainer(MCGui.MCContainer container) {
+
+	}
+
+	public default MCCanvas getCanvas() {
+		return getGui().getCanvas();
+	}
+
+	public default MCGui getGui() {
+		return (MCGui) getComponent().getParentGui().get().getNative();
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/GuiUtils.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/GuiUtils.java
old mode 100755
new mode 100644
similarity index 92%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/GuiUtils.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/GuiUtils.java
index 33b8e8c..ccd5a4d
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/GuiUtils.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/GuiUtils.java
@@ -1,9 +1,9 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_7_10;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.util.ResourceLocation;
-import nova.wrapper.mc1710.launcher.NovaMinecraft;
+import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft;
 import org.lwjgl.opengl.GL11;
 
 public class GuiUtils {
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCButton.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCButton.java
old mode 100755
new mode 100644
similarity index 98%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCButton.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCButton.java
index 34905f2..05c3b82
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCButton.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCButton.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_7_10;
 
 import cpw.mods.fml.client.config.GuiButtonExt;
 import cpw.mods.fml.common.FMLCommonHandler;
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCCanvas.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCCanvas.java
old mode 100755
new mode 100644
similarity index 98%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCCanvas.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCCanvas.java
index c47bafe..5154dec
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCCanvas.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCCanvas.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_7_10;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGui.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGui.java
old mode 100755
new mode 100644
similarity index 97%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGui.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGui.java
index 70ab313..e8fe82a
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGui.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGui.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_7_10;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -12,6 +12,7 @@
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import nova.core.network.Packet;
+import nova.core.wrapper.mc.forge.v17.network.netty.MCNetworkManager;
 import nova.gui.Gui;
 import nova.gui.GuiComponent;
 import nova.gui.GuiEvent.MouseEvent.EnumMouseButton;
@@ -20,10 +21,9 @@
 import nova.gui.render.Canvas;
 import nova.gui.render.Graphics;
 import nova.gui.render.text.TextMetrics;
-import nova.gui.wrapper.mc17.text.MCTextRenderer;
+import nova.gui.wrapper.mc.forge.v1_7_10.text.MCTextRenderer;
 import nova.internal.core.Game;
-import nova.gui.wrapper.mc17.network.PacketGui;
-import nova.wrapper.mc1710.network.netty.MCNetworkManager;
+import nova.gui.wrapper.mc.forge.v1_7_10.network.PacketGui;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiComponent.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiComponent.java
new file mode 100644
index 0000000..bca38b6
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiComponent.java
@@ -0,0 +1,42 @@
+package nova.gui.wrapper.mc.forge.v1_7_10;
+
+import nova.gui.GuiComponent;
+import nova.gui.Outline;
+import nova.gui.nativeimpl.NativeGuiComponent;
+import nova.gui.render.Graphics;
+
+// TODO Keyboard and mouse interaction
+public class MCGuiComponent<T extends GuiComponent<?, ?>> implements NativeGuiComponent, DrawableGuiComponent {
+
+	protected final T component;
+	protected Outline outline = Outline.empty;
+
+	public MCGuiComponent(T component) {
+		this.component = component;
+	}
+
+	@Override
+	public T getComponent() {
+		return component;
+	}
+
+	@Override
+	public Outline getOutline() {
+		return outline;
+	}
+
+	@Override
+	public void setOutline(Outline outline) {
+		this.outline = outline;
+	}
+
+	@Override
+	public void requestRender() {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public void draw(int mouseX, int mouseY, float partial, Graphics graphics) {
+		getComponent().getNative().render(mouseX, mouseY, graphics);
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiComponentFactory.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiComponentFactory.java
new file mode 100644
index 0000000..67251f8
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiComponentFactory.java
@@ -0,0 +1,33 @@
+package nova.gui.wrapper.mc.forge.v1_7_10;
+
+import nova.gui.AbstractGuiContainer;
+import nova.gui.Gui;
+import nova.gui.GuiComponent;
+import nova.gui.component.Button;
+import nova.gui.component.inventory.PlayerInventory;
+import nova.gui.component.inventory.Slot;
+import nova.gui.factory.GuiComponentFactory;
+import nova.gui.nativeimpl.NativeButton;
+import nova.gui.nativeimpl.NativeContainer;
+import nova.gui.nativeimpl.NativeGui;
+import nova.gui.nativeimpl.NativeGuiComponent;
+import nova.gui.nativeimpl.NativePlayerInventory;
+import nova.gui.nativeimpl.NativeSlot;
+
+public class MCGuiComponentFactory extends GuiComponentFactory {
+
+	public MCGuiComponentFactory() {
+		registerNativeComponent(NativeGui.class,
+			component -> new MCGui((Gui) component));
+		registerNativeComponent(NativeContainer.class,
+			component -> new MCGuiContainer((AbstractGuiContainer<?, ?>) component));
+		registerNativeComponent(NativeButton.class,
+			component -> new MCButton((Button) component));
+		registerNativeComponent(NativeGuiComponent.class,
+			component -> new MCGuiComponent<GuiComponent<?, ?>>(component));
+		registerNativeComponent(NativeSlot.class,
+			component -> new MCGuiSlot((Slot) component));
+		registerNativeComponent(NativePlayerInventory.class,
+			component -> new MCGuiPlayerInventory((PlayerInventory) component));
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiContainer.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiContainer.java
new file mode 100644
index 0000000..494decf
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiContainer.java
@@ -0,0 +1,55 @@
+package nova.gui.wrapper.mc.forge.v1_7_10;
+
+import nova.gui.AbstractGuiContainer;
+import nova.gui.GuiComponent;
+import nova.gui.Outline;
+import nova.gui.nativeimpl.NativeContainer;
+import nova.gui.render.Canvas;
+import nova.gui.render.Graphics;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGui.MCContainer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MCGuiContainer extends MCGuiComponent<AbstractGuiContainer<?, ?>> implements NativeContainer {
+
+	protected List<GuiComponent<?, ?>> components = new ArrayList<>();
+
+	public MCGuiContainer(AbstractGuiContainer<?, ?> component) {
+		super(component);
+	}
+
+	@Override
+	public void addElement(GuiComponent<?, ?> element) {
+		components.add(element);
+	}
+
+	@Override
+	public void removeElement(GuiComponent<?, ?> element) {
+		components.remove(element);
+	}
+
+	@Override
+	public void onAddedToContainer(MCContainer container) {
+		for (GuiComponent<?, ?> component : components) {
+			((DrawableGuiComponent) component.getNative()).onAddedToContainer(container);
+		}
+	}
+
+	// TODO This should be part of NovaCore -> Move to NativeContainer interface
+	@Override
+	public void draw(int mouseX, int mouseY, float partial, Graphics graphics) {
+		for (GuiComponent<?, ?> component : components) {
+			Outline outline = component.getOutline();
+			int width = outline.minXi(), height = outline.minYi();
+			Canvas canvas = graphics.getCanvas();
+
+			canvas.push();
+			canvas.setScissor(component.getOutline());
+			canvas.translate(width, height);
+			((DrawableGuiComponent) component.getNative()).draw(mouseX - width, mouseY - height, partial, graphics);
+			canvas.pop();
+		}
+		super.draw(mouseX, mouseY, partial, graphics);
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiFactory.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiFactory.java
old mode 100755
new mode 100644
similarity index 85%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiFactory.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiFactory.java
index 991c119..9881e88
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiFactory.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiFactory.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_7_10;
 
 import cpw.mods.fml.common.network.IGuiHandler;
 import net.minecraft.client.Minecraft;
@@ -8,14 +8,15 @@
 import net.minecraft.inventory.Container;
 import net.minecraft.world.World;
 import nova.core.entity.Entity;
+import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft;
+import nova.core.wrapper.mc.forge.v17.wrapper.entity.backward.BWEntity;
 import nova.gui.Gui;
 import nova.gui.GuiException;
 import nova.gui.factory.GuiFactory;
 import nova.gui.factory.GuiManager;
-import nova.gui.wrapper.mc17.MCGui.MCContainer;
-import nova.gui.wrapper.mc17.MCGui.MCGuiScreen;
-import nova.wrapper.mc1710.launcher.NovaMinecraft;
-import nova.wrapper.mc1710.wrapper.entity.BWEntity;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGui.MCGuiScreen;
+import nova.internal.core.Game;
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 
 import java.util.ArrayList;
@@ -27,6 +28,10 @@ public class MCGuiFactory extends GuiManager {
 	private static Optional<Gui> guiToOpen = Optional.empty();
 	private static List<GuiFactory> idMappedFactories = new ArrayList<>();
 
+	public MCGuiFactory() {
+		super(Game.events());
+	}
+
 	@Override
 	public GuiFactory register(GuiFactory factory) {
 		idMappedFactories.add(factory);
@@ -35,8 +40,8 @@ public GuiFactory register(GuiFactory factory) {
 
 	@Override
 	public void showGui(String identifier, Entity entity, Vector3D pos) {
-		GuiFactory factory = getFactory(identifier).orElseThrow(() -> new GuiException(String.format("No GUI called %s registered!", identifier)));
-		Gui gui = factory.makeGUI();
+		GuiFactory factory = registry.get(identifier).orElseThrow(() -> new GuiException(String.format("No GUI called %s registered!", identifier)));
+		Gui gui = factory.build();
 		showGui(gui, entity, pos, idMappedFactories.indexOf(factory));
 	}
 
@@ -104,7 +109,7 @@ public GuiContainer getClientGuiElement(int id, EntityPlayer player, World world
 				guiToOpen = Optional.empty();
 			} else {
 				// Try to get the client side GUI from the id mapping
-				gui = idMappedFactories.get(id).makeGUI();
+				gui = idMappedFactories.get(id).build();
 			}
 			if (gui == null) {
 				throw new GuiException("Couldn't get client side instance for the provided GUI of id " + id + " !");
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiPlayerInventory.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiPlayerInventory.java
new file mode 100644
index 0000000..d51ec67
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiPlayerInventory.java
@@ -0,0 +1,60 @@
+package nova.gui.wrapper.mc.forge.v1_7_10;
+
+import net.minecraft.inventory.IInventory;
+import nova.core.wrapper.mc.forge.v17.wrapper.inventory.BWInventory;
+import nova.gui.component.inventory.PlayerInventory;
+import nova.gui.nativeimpl.NativePlayerInventory;
+import nova.gui.render.Graphics;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGui.MCGuiScreen;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class MCGuiPlayerInventory extends MCGuiComponent<PlayerInventory> implements NativePlayerInventory {
+
+	List<MCGuiSlot.MCSlot> slots = new ArrayList<>();
+
+	public MCGuiPlayerInventory(PlayerInventory component) {
+		super(component);
+	}
+
+	@Override
+	public Optional<Vector2D> getPreferredSize() {
+		return Optional.of(new Vector2D(162, 80));
+	}
+
+	@Override
+	public void draw(int mouseX, int mouseY, float partial, Graphics graphics) {
+		MCCanvas canvas = getCanvas();
+		int x = canvas.getState().txi();
+		int y = canvas.getState().tyi();
+
+		MCGuiScreen gui = getGui().getGuiScreen();
+		for (MCGuiSlot.MCSlot slot : slots) {
+			slot.reset();
+			MCGuiSlot.drawSlot(gui, slot, mouseX, mouseY, !getComponent().getBackground().isPresent());
+			slot.setPosition(x, y, gui);
+		}
+		super.draw(mouseX, mouseY, partial, graphics);
+	}
+
+	@Override
+	public void onAddedToContainer(MCContainer container) {
+		IInventory inventory = ((BWInventory) getComponent().getInventory()).wrapped;
+		slots.clear();
+
+		for (int j = 0; j < 3; j++) {
+			for (int k = 0; k < 9; k++) {
+				slots.add(new MCGuiSlot.MCSlot(inventory, k + j * 9 + 9, k * 18, j * 18));
+			}
+		}
+		for (int i = 0; i < 9; i++) {
+			slots.add(new MCGuiSlot.MCSlot(inventory, i, i * 18, 62));
+		}
+
+		slots.forEach(container::addSlotToContainer);
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiSlot.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiSlot.java
old mode 100755
new mode 100644
similarity index 92%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiSlot.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiSlot.java
index 78c9a40..2a6e721
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/MCGuiSlot.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/MCGuiSlot.java
@@ -1,17 +1,17 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_7_10;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import nova.core.wrapper.mc.forge.v17.wrapper.inventory.FWInventory;
+import nova.core.wrapper.mc.forge.v17.wrapper.item.ItemConverter;
 import nova.gui.component.inventory.Slot;
 import nova.gui.nativeimpl.NativeSlot;
 import nova.gui.render.Graphics;
-import nova.gui.wrapper.mc17.MCGui.MCContainer;
-import nova.gui.wrapper.mc17.MCGui.MCGuiScreen;
-import nova.wrapper.mc1710.wrapper.inventory.FWInventory;
-import nova.wrapper.mc1710.wrapper.item.ItemConverter;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGui.MCGuiScreen;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 import org.lwjgl.opengl.GL11;
 
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/dependency/GuiModule.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/dependency/GuiModule.java
new file mode 100644
index 0000000..dc6ab03
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/dependency/GuiModule.java
@@ -0,0 +1,15 @@
+package nova.gui.wrapper.mc.forge.v1_7_10.dependency;
+
+import nova.gui.factory.GuiComponentFactory;
+import nova.gui.factory.GuiManager;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGuiComponentFactory;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGuiFactory;
+import se.jbee.inject.bind.BinderModule;
+
+public class GuiModule extends BinderModule {
+	@Override
+	protected void declare() {
+		bind(GuiComponentFactory.class).to(MCGuiComponentFactory.class);
+		bind(GuiManager.class).to(MCGuiFactory.class);
+	}
+}
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/launch/NovaGuiWrapper.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/launch/NovaGuiWrapper.java
old mode 100755
new mode 100644
similarity index 72%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/launch/NovaGuiWrapper.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/launch/NovaGuiWrapper.java
index 54da186..cba5cf8
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/launch/NovaGuiWrapper.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/launch/NovaGuiWrapper.java
@@ -1,13 +1,13 @@
-package nova.gui.wrapper.mc17.launch;
+package nova.gui.wrapper.mc.forge.v1_7_10.launch;
 
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import nova.core.loader.Loadable;
 import nova.core.loader.Mod;
-import nova.gui.wrapper.mc17.MCGuiFactory;
-import nova.gui.wrapper.mc17.dependency.GuiModule;
-import nova.wrapper.mc1710.launcher.NovaMinecraft;
+import nova.core.wrapper.mc.forge.v17.launcher.NovaMinecraft;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGuiFactory;
+import nova.gui.wrapper.mc.forge.v1_7_10.dependency.GuiModule;
 
 /**
  * The main class to initialize the Gui Plugin
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/network/PacketGui.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/network/PacketGui.java
old mode 100755
new mode 100644
similarity index 81%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/network/PacketGui.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/network/PacketGui.java
index 8310995..e85e42d
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/network/PacketGui.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/network/PacketGui.java
@@ -1,14 +1,14 @@
-package nova.gui.wrapper.mc17.network;
+package nova.gui.wrapper.mc.forge.v1_7_10.network;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.entity.player.EntityPlayer;
 import nova.core.network.Packet;
+import nova.core.wrapper.mc.forge.v17.network.MCPacket;
+import nova.core.wrapper.mc.forge.v17.network.discriminator.PacketAbstract;
 import nova.gui.GuiException;
-import nova.wrapper.mc1710.network.MCPacket;
-import nova.wrapper.mc1710.network.discriminator.PacketAbstract;
-import nova.gui.wrapper.mc17.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCGui.MCContainer;
 
 //TODO: Integrate withPriority NOVA
 public class PacketGui extends PacketAbstract {
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/AbstractParagraph.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/AbstractParagraph.java
new file mode 100644
index 0000000..f741d7b
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/AbstractParagraph.java
@@ -0,0 +1,32 @@
+package nova.gui.wrapper.mc.forge.v1_7_10.text;
+
+import nova.gui.render.text.TextRenderer.RenderedText;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+abstract class AbstractParagraph<T extends IText> implements IText, RenderedText {
+
+	protected static Pattern wordSOL = Pattern.compile("^\\b[^\\s\n]+");
+	protected static Pattern wordPattern = Pattern.compile("(%n|\n)|([^\\s]+(\\s|\n|%n))|\\s+|(.+)");
+
+	protected List<Line<T>> lines = new ArrayList<>();
+	protected Vector2D dimensions;
+
+	protected void createDimensions() {
+		double width = 0, height = 0;
+		for (IText t2 : lines) {
+			Vector2D dim = t2.getDimensions();
+			width = Math.max(height, dim.getX());
+			height += dim.getY();
+		}
+		dimensions = new Vector2D(width, height);
+	}
+
+	@Override
+	public Vector2D getDimensions() {
+		return dimensions;
+	}
+}
\ No newline at end of file
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/IText.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/IText.java
new file mode 100644
index 0000000..1c98a63
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/IText.java
@@ -0,0 +1,101 @@
+package nova.gui.wrapper.mc.forge.v1_7_10.text;
+
+import net.minecraft.client.gui.FontRenderer;
+import nova.gui.render.text.FormattedText.TextFormat;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+
+import java.util.ArrayList;
+import java.util.List;
+
+interface IText {
+
+	Vector2D getDimensions();
+
+	static class Text implements IText {
+
+		final TextFormat format;
+		String text;
+		Vector2D dimensions;
+
+		Text(String text, TextFormat format, FontRenderer fontrenderer) {
+			this.text = addFormat(text, format);
+			this.format = format;
+			float scale = format.size / (float) fontrenderer.FONT_HEIGHT;
+			this.dimensions = new Vector2D(fontrenderer.getStringWidth(this.text) * scale, fontrenderer.FONT_HEIGHT * scale);
+		}
+
+		Text append(String text, TextFormat format, FontRenderer fontrenderer) {
+			this.text += addFormat(text, format);
+			float scale = format.size / (float) fontrenderer.FONT_HEIGHT;
+			this.dimensions = new Vector2D(fontrenderer.getStringWidth(this.text) * scale, fontrenderer.FONT_HEIGHT * scale);
+			return this;
+		}
+
+		@Override
+		public Vector2D getDimensions() {
+			return dimensions;
+		}
+
+		private String addFormat(String text, TextFormat format) {
+			StringBuilder builder = new StringBuilder();
+			if (format.bold) {
+				builder.append("\u00A7l");
+			}
+			if (format.italic) {
+				builder.append("\u00A7o");
+			}
+			if (format.strikethrough) {
+				builder.append("\u00A7m");
+			}
+			if (format.underline) {
+				builder.append("\u00A7n");
+			}
+
+			builder.append(text);
+			builder.append("\u00A7r");
+			return builder.toString();
+		}
+	}
+
+	static class Line<T extends IText> implements IText {
+
+		List<T> text = new ArrayList<>();
+
+		Line<T> append(T text) {
+			this.text.add(text);
+			return this;
+		}
+
+		@Override
+		public Vector2D getDimensions() {
+			double width = 0, height = 0;
+			for (T text : this.text) {
+				Vector2D dim = text.getDimensions();
+				height = Math.max(height, dim.getY());
+				width += dim.getX();
+			}
+			return new Vector2D(width, height);
+		}
+	}
+
+	static class Word implements IText {
+
+		List<Text> text = new ArrayList<>();
+
+		Word append(Text text) {
+			this.text.add(text);
+			return this;
+		}
+
+		@Override
+		public Vector2D getDimensions() {
+			double width = 0, height = 0;
+			for (Text text : this.text) {
+				Vector2D dim = text.getDimensions();
+				height = Math.max(height, dim.getY());
+				width += dim.getX();
+			}
+			return new Vector2D(width, height);
+		}
+	}
+}
\ No newline at end of file
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/MCTextRenderer.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/MCTextRenderer.java
old mode 100755
new mode 100644
similarity index 94%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/MCTextRenderer.java
rename to minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/MCTextRenderer.java
index 2a3fd5a..08a356d
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/MCTextRenderer.java
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/MCTextRenderer.java
@@ -1,12 +1,12 @@
-package nova.gui.wrapper.mc17.text;
+package nova.gui.wrapper.mc.forge.v1_7_10.text;
 
 import net.minecraft.client.gui.FontRenderer;
 import nova.core.render.Color;
 import nova.core.util.math.MathUtil;
 import nova.gui.render.text.FormattedText;
 import nova.gui.render.text.TextRenderer;
-import nova.gui.wrapper.mc17.MCCanvas;
-import nova.gui.wrapper.mc17.text.IText.Text;
+import nova.gui.wrapper.mc.forge.v1_7_10.MCCanvas;
+import nova.gui.wrapper.mc.forge.v1_7_10.text.IText.Text;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 import org.lwjgl.opengl.GL11;
 
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/Paragraph.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/Paragraph.java
new file mode 100644
index 0000000..645fe2d
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/Paragraph.java
@@ -0,0 +1,114 @@
+package nova.gui.wrapper.mc.forge.v1_7_10.text;
+
+import com.google.common.collect.Lists;
+import net.minecraft.client.gui.FontRenderer;
+import nova.gui.render.text.FormattedText;
+import nova.gui.render.text.FormattedText.TextFormat;
+import nova.gui.render.text.TextRenderer;
+import nova.gui.render.text.TextRenderer.RenderedText;
+import nova.gui.wrapper.mc.forge.v1_7_10.text.IText.Word;
+import org.lwjgl.opengl.GL11;
+
+import java.util.List;
+import java.util.regex.Matcher;
+
+class Paragraph extends AbstractParagraph<Word> implements RenderedText {
+
+	public Paragraph(FormattedText text, FontRenderer fontRenderer, int width) {
+
+		List<FormattedText> list = Lists.newArrayList(text);
+		Line<Word> currentLine = new Line<>();
+		lines.add(currentLine);
+
+		float xOffset = 0;
+
+		for (int i = 0; i < list.size(); i++) {
+
+			FormattedText current = list.get(i);
+			TextFormat format = current.getFormat();
+			String string = current.getText();
+			Matcher matcher = AbstractParagraph.wordPattern.matcher(string);
+
+			while (matcher.find()) {
+				if (matcher.group(1) != null) {
+					xOffset = 0;
+					currentLine = new Line<>();
+					lines.add(currentLine);
+				} else {
+					boolean flag = false;
+					String string2 = matcher.group(2);
+					if (string2 == null) {
+						flag = true;
+						string2 = matcher.group(4);
+						if (string2 == null) {
+							continue;
+						}
+					}
+
+					Word word = new Word().append(new Text(string2, format, fontRenderer));
+
+					if (flag) {
+						FormattedText next;
+						int j = i;
+						while (++j < list.size()) {
+							next = list.get(j);
+							String string3 = next.getText();
+							Matcher matcher2 = AbstractParagraph.wordSOL.matcher(string3);
+
+							if (matcher2.matches()) {
+								i++;
+								word.append(new Text(next.getText(), next.getFormat(), fontRenderer));
+								continue;
+							} else {
+								matcher2.reset();
+
+								if (matcher2.find()) {
+									word.append(new Text(matcher2.group(), next.getFormat(), fontRenderer));
+									list.set(j, new FormattedText(string3.substring(matcher2.end(), string3.length()), next.getFormat()));
+								}
+								break;
+							}
+						}
+						word.text.get(word.text.size() - 1).append(" ", format, fontRenderer);
+					}
+
+					double wordWidth = word.getDimensions().getX();
+					if (xOffset + wordWidth > width) {
+						xOffset = 0;
+						currentLine = new Line<>();
+						lines.add(currentLine);
+					}
+					xOffset += wordWidth;
+					currentLine.append(word);
+				}
+			}
+		}
+		createDimensions();
+	}
+
+	@Override
+	public void draw(int x, int y, TextRenderer renderer) {
+		MCTextRenderer textRenderer = (MCTextRenderer) renderer;
+		GL11.glTranslatef(0, 0, textRenderer.zIndex);
+
+		int xOffset = 0;
+		int yOffset = 0;
+
+		for (int i = 0; i < lines.size(); i++) {
+			Line<Word> line = lines.get(i);
+			if (i == 0) {
+				yOffset += line.getDimensions().getY();
+			}
+			for (Word word : line.text) {
+				xOffset = textRenderer.drawText(word.text, x, y, xOffset, yOffset);
+			}
+
+			if (i + 1 < lines.size()) {
+				yOffset += lines.get(i + 1).getDimensions().getY() + 1;
+				xOffset = 0;
+			}
+		}
+
+		GL11.glTranslatef(0, 0, -textRenderer.zIndex);
+	}
+}
\ No newline at end of file
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/SimpleParagraph.java b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/SimpleParagraph.java
new file mode 100644
index 0000000..b054667
--- /dev/null
+++ b/minecraft/1.7/src/main/java/nova/gui/wrapper/mc/forge/v1_7_10/text/SimpleParagraph.java
@@ -0,0 +1,64 @@
+package nova.gui.wrapper.mc.forge.v1_7_10.text;
+
+import net.minecraft.client.gui.FontRenderer;
+import nova.gui.render.text.FormattedText;
+import nova.gui.render.text.FormattedText.TextFormat;
+import nova.gui.render.text.TextRenderer;
+import nova.gui.render.text.TextRenderer.RenderedText;
+import nova.gui.wrapper.mc.forge.v1_7_10.text.IText.Text;
+import org.lwjgl.opengl.GL11;
+
+class SimpleParagraph extends AbstractParagraph<Text> implements RenderedText {
+
+	public SimpleParagraph(FormattedText text, FontRenderer fontRenderer) {
+
+		Line<Text> currentLine = new Line<>();
+		lines.add(currentLine);
+
+		Text converted = null;
+		TextFormat format = new TextFormat();
+
+		for (FormattedText sub : text) {
+			TextFormat nextFormat = sub.getFormat();
+			String[] split = sub.getText().split("%n|\n", -1);
+
+			for (int i = 0; i < split.length; i++) {
+				if (i != 0 || converted == null || nextFormat.shadow != format.shadow || nextFormat.size != format.size || nextFormat.color != format.color) {
+					if (i > 0) {
+						currentLine = new Line<>();
+						lines.add(currentLine);
+					}
+					converted = new Text(split[i], nextFormat, fontRenderer);
+					currentLine.append(converted);
+				} else {
+					converted.append(sub.getText(), nextFormat, fontRenderer);
+				}
+			}
+			format = nextFormat;
+		}
+		createDimensions();
+	}
+
+	@Override
+	public void draw(int x, int y, TextRenderer renderer) {
+		MCTextRenderer textRenderer = (MCTextRenderer) renderer;
+
+		GL11.glTranslatef(0, 0, textRenderer.zIndex);
+		int xOffset = 0;
+		int yOffset = 0;
+
+		for (int i = 0; i < lines.size(); i++) {
+			Line<Text> line = lines.get(i);
+			if (i == 0) {
+				yOffset += line.getDimensions().getY();
+			}
+			xOffset = textRenderer.drawText(line.text, x, y, xOffset, yOffset);
+			if (i + 1 < lines.size()) {
+				yOffset += lines.get(i + 1).getDimensions().getY() + 1;
+				xOffset = 0;
+			}
+		}
+
+		GL11.glTranslatef(0, 0, -textRenderer.zIndex);
+	}
+}
\ No newline at end of file
diff --git a/minecraft/1.8/build.gradle b/minecraft/1.8/build.gradle
index 5cdba31..a25ae6b 100644
--- a/minecraft/1.8/build.gradle
+++ b/minecraft/1.8/build.gradle
@@ -42,8 +42,8 @@ minecraft {
 
 dependencies {
 	compile rootProject
-	compile group: "nova.core", name: "NovaCore", version: property("novaVersion"), changing: true
-	compile "nova.wrapper.mc18:NovaWrapper-MC1.8:0.1-SNAPSHOT:deobf"
+	compile group: "nova.core", name: "NOVA-Core", version: property("nova_version"), changing: true
+	compile "nova.core:NOVA-Core-Wrapper-MC1.8:0.1.0-SNAPSHOT:deobf"
 }
 
 processResources {
diff --git a/minecraft/1.8/gradle.properties b/minecraft/1.8/gradle.properties
index 583a1a8..210e104 100644
--- a/minecraft/1.8/gradle.properties
+++ b/minecraft/1.8/gradle.properties
@@ -1,7 +1,10 @@
+group = nova.gui
+
 minecraft.version = 1.8
 forge.version = 11.14.3.1491
+forgeGradleVersion = 1.2-SNAPSHOT
 
 packaging = jar
 info.inceptionYear = 2015
-info.description = The NOVA-Minecraft Minecraft 1.8 wrapper.
+info.description = The NOVA-GUI Minecraft 1.8 wrapper.
 info.organization.name = NOVA
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/DrawableGuiComponent.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/DrawableGuiComponent.java
old mode 100755
new mode 100644
similarity index 92%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/DrawableGuiComponent.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/DrawableGuiComponent.java
index 091a9eb..3d00618
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/DrawableGuiComponent.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/DrawableGuiComponent.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import nova.gui.nativeimpl.NativeGuiComponent;
 import nova.gui.render.Graphics;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/GuiUtils.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/GuiUtils.java
similarity index 93%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/GuiUtils.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/GuiUtils.java
index d4e6b2c..8d4bf43 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/GuiUtils.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/GuiUtils.java
@@ -1,9 +1,9 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.util.ResourceLocation;
-import nova.wrapper.mc18.launcher.NovaMinecraft;
+import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft;
 import org.lwjgl.opengl.GL11;
 
 public class GuiUtils {
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCButton.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCButton.java
similarity index 98%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCButton.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCButton.java
index a1bd637..a649f61 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCButton.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCButton.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCCanvas.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCCanvas.java
similarity index 98%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCCanvas.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCCanvas.java
index a678d7c..bbe61b1 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCCanvas.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCCanvas.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGui.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGui.java
old mode 100755
new mode 100644
similarity index 97%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGui.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGui.java
index 776801a..4a784ec
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGui.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGui.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
@@ -12,6 +12,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import nova.core.network.Packet;
+import nova.core.wrapper.mc.forge.v18.network.netty.MCNetworkManager;
 import nova.gui.Gui;
 import nova.gui.GuiComponent;
 import nova.gui.GuiEvent.MouseEvent.EnumMouseButton;
@@ -20,10 +21,9 @@
 import nova.gui.render.Canvas;
 import nova.gui.render.Graphics;
 import nova.gui.render.text.TextMetrics;
-import nova.gui.wrapper.mc18.text.MCTextRenderer;
+import nova.gui.wrapper.mc.forge.v1_8.text.MCTextRenderer;
 import nova.internal.core.Game;
-import nova.gui.wrapper.mc18.network.PacketGui;
-import nova.wrapper.mc18.network.netty.MCNetworkManager;
+import nova.gui.wrapper.mc.forge.v1_8.network.PacketGui;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiComponent.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiComponent.java
similarity index 95%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiComponent.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiComponent.java
index 41376d6..34087b3 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiComponent.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiComponent.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import nova.gui.GuiComponent;
 import nova.gui.Outline;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiComponentFactory.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiComponentFactory.java
similarity index 96%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiComponentFactory.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiComponentFactory.java
index c1d8ce2..6edd12c 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiComponentFactory.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiComponentFactory.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import nova.gui.AbstractGuiContainer;
 import nova.gui.Gui;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiContainer.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiContainer.java
similarity index 94%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiContainer.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiContainer.java
index 0025e67..787f071 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiContainer.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiContainer.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import nova.gui.AbstractGuiContainer;
 import nova.gui.GuiComponent;
@@ -6,7 +6,7 @@
 import nova.gui.nativeimpl.NativeContainer;
 import nova.gui.render.Canvas;
 import nova.gui.render.Graphics;
-import nova.gui.wrapper.mc18.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_8.MCGui.MCContainer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiFactory.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiFactory.java
similarity index 85%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiFactory.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiFactory.java
index 2420f9b..41fb007 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiFactory.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiFactory.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
@@ -8,14 +8,15 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.network.IGuiHandler;
 import nova.core.entity.Entity;
+import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft;
+import nova.core.wrapper.mc.forge.v18.wrapper.entity.backward.BWEntity;
 import nova.gui.Gui;
 import nova.gui.GuiException;
 import nova.gui.factory.GuiFactory;
 import nova.gui.factory.GuiManager;
-import nova.gui.wrapper.mc18.MCGui.MCContainer;
-import nova.gui.wrapper.mc18.MCGui.MCGuiScreen;
-import nova.wrapper.mc18.launcher.NovaMinecraft;
-import nova.wrapper.mc18.wrapper.entity.BWEntity;
+import nova.gui.wrapper.mc.forge.v1_8.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_8.MCGui.MCGuiScreen;
+import nova.internal.core.Game;
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 
 import java.util.ArrayList;
@@ -27,6 +28,10 @@ public class MCGuiFactory extends GuiManager {
 	private static Optional<Gui> guiToOpen = Optional.empty();
 	private static List<GuiFactory> idMappedFactories = new ArrayList<>();
 
+	public MCGuiFactory() {
+		super(Game.events());
+	}
+
 	@Override
 	public GuiFactory register(GuiFactory factory) {
 		idMappedFactories.add(factory);
@@ -35,8 +40,8 @@ public GuiFactory register(GuiFactory factory) {
 
 	@Override
 	public void showGui(String identifier, Entity entity, Vector3D pos) {
-		GuiFactory factory = getFactory(identifier).orElseThrow(() -> new GuiException(String.format("No GUI called %s registered!", identifier)));
-		Gui gui = factory.makeGUI();
+		GuiFactory factory = registry.get(identifier).orElseThrow(() -> new GuiException(String.format("No GUI called %s registered!", identifier)));
+		Gui gui = factory.build();
 		showGui(gui, entity, pos, idMappedFactories.indexOf(factory));
 	}
 
@@ -105,7 +110,7 @@ public GuiContainer getClientGuiElement(int id, EntityPlayer player, World world
 				guiToOpen = Optional.empty();
 			} else {
 				// Try to get the client side GUI from the id mapping
-				gui = idMappedFactories.get(id).makeGUI();
+				gui = idMappedFactories.get(id).build();
 			}
 			if (gui == null) {
 				throw new GuiException("Couldn't get client side instance for the provided GUI of id " + id + " !");
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiPlayerInventory.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiPlayerInventory.java
similarity index 87%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiPlayerInventory.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiPlayerInventory.java
index 7a81323..40231bf 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiPlayerInventory.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiPlayerInventory.java
@@ -1,12 +1,12 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import net.minecraft.inventory.IInventory;
+import nova.core.wrapper.mc.forge.v18.wrapper.inventory.BWInventory;
 import nova.gui.component.inventory.PlayerInventory;
 import nova.gui.nativeimpl.NativePlayerInventory;
 import nova.gui.render.Graphics;
-import nova.gui.wrapper.mc18.MCGui.MCContainer;
-import nova.gui.wrapper.mc18.MCGui.MCGuiScreen;
-import nova.wrapper.mc18.wrapper.inventory.BWInventory;
+import nova.gui.wrapper.mc.forge.v1_8.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_8.MCGui.MCGuiScreen;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 
 import java.util.ArrayList;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiSlot.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiSlot.java
similarity index 92%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiSlot.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiSlot.java
index bd7c588..7b1ffa1 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/MCGuiSlot.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/MCGuiSlot.java
@@ -1,17 +1,17 @@
-package nova.gui.wrapper.mc18;
+package nova.gui.wrapper.mc.forge.v1_8;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import nova.core.wrapper.mc.forge.v18.wrapper.inventory.FWInventory;
+import nova.core.wrapper.mc.forge.v18.wrapper.item.ItemConverter;
 import nova.gui.component.inventory.Slot;
 import nova.gui.nativeimpl.NativeSlot;
 import nova.gui.render.Graphics;
-import nova.gui.wrapper.mc18.MCGui.MCContainer;
-import nova.gui.wrapper.mc18.MCGui.MCGuiScreen;
-import nova.wrapper.mc18.wrapper.inventory.FWInventory;
-import nova.wrapper.mc18.wrapper.item.ItemConverter;
+import nova.gui.wrapper.mc.forge.v1_8.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_8.MCGui.MCGuiScreen;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 import org.lwjgl.opengl.GL11;
 
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/dependency/GuiModule.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/dependency/GuiModule.java
similarity index 66%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/dependency/GuiModule.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/dependency/GuiModule.java
index b7757d9..046d83f 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/dependency/GuiModule.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/dependency/GuiModule.java
@@ -1,9 +1,9 @@
-package nova.gui.wrapper.mc18.dependency;
+package nova.gui.wrapper.mc.forge.v1_8.dependency;
 
 import nova.gui.factory.GuiComponentFactory;
 import nova.gui.factory.GuiManager;
-import nova.gui.wrapper.mc18.MCGuiComponentFactory;
-import nova.gui.wrapper.mc18.MCGuiFactory;
+import nova.gui.wrapper.mc.forge.v1_8.MCGuiComponentFactory;
+import nova.gui.wrapper.mc.forge.v1_8.MCGuiFactory;
 import se.jbee.inject.bind.BinderModule;
 
 public class GuiModule extends BinderModule {
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/launch/NovaGuiWrapper.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/launch/NovaGuiWrapper.java
old mode 100755
new mode 100644
similarity index 74%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/launch/NovaGuiWrapper.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/launch/NovaGuiWrapper.java
index 68b7219..43c856e
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/launch/NovaGuiWrapper.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/launch/NovaGuiWrapper.java
@@ -1,13 +1,13 @@
-package nova.gui.wrapper.mc18.launch;
+package nova.gui.wrapper.mc.forge.v1_8.launch;
 
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import nova.core.loader.Loadable;
 import nova.core.loader.Mod;
-import nova.gui.wrapper.mc18.MCGuiFactory;
-import nova.gui.wrapper.mc18.dependency.GuiModule;
-import nova.wrapper.mc18.launcher.NovaMinecraft;
+import nova.core.wrapper.mc.forge.v18.launcher.NovaMinecraft;
+import nova.gui.wrapper.mc.forge.v1_8.MCGuiFactory;
+import nova.gui.wrapper.mc.forge.v1_8.dependency.GuiModule;
 
 /**
  * The main class to initialize the Gui Plugin
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/network/PacketGui.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/network/PacketGui.java
old mode 100755
new mode 100644
similarity index 81%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/network/PacketGui.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/network/PacketGui.java
index a477f30..2f8ac05
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/network/PacketGui.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/network/PacketGui.java
@@ -1,14 +1,14 @@
-package nova.gui.wrapper.mc18.network;
+package nova.gui.wrapper.mc.forge.v1_8.network;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.entity.player.EntityPlayer;
 import nova.core.network.Packet;
+import nova.core.wrapper.mc.forge.v18.network.MCPacket;
+import nova.core.wrapper.mc.forge.v18.network.discriminator.PacketAbstract;
 import nova.gui.GuiException;
-import nova.wrapper.mc18.network.MCPacket;
-import nova.wrapper.mc18.network.discriminator.PacketAbstract;
-import nova.gui.wrapper.mc18.MCGui.MCContainer;
+import nova.gui.wrapper.mc.forge.v1_8.MCGui.MCContainer;
 
 //TODO: This is NOT used. NO-OP
 public class PacketGui extends PacketAbstract {
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/AbstractParagraph.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/AbstractParagraph.java
old mode 100755
new mode 100644
similarity index 95%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/AbstractParagraph.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/AbstractParagraph.java
index 3aa85a2..c305533
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/AbstractParagraph.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/AbstractParagraph.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17.text;
+package nova.gui.wrapper.mc.forge.v1_8.text;
 
 import nova.gui.render.text.TextRenderer.RenderedText;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
diff --git a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/IText.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/IText.java
old mode 100755
new mode 100644
similarity index 98%
rename from minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/IText.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/IText.java
index 58aa5ee..6af3204
--- a/minecraft/1.7/src/main/java/nova/gui/wrapper/mc17/text/IText.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/IText.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc17.text;
+package nova.gui.wrapper.mc.forge.v1_8.text;
 
 import net.minecraft.client.gui.FontRenderer;
 import nova.gui.render.text.FormattedText.TextFormat;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/MCTextRenderer.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/MCTextRenderer.java
similarity index 95%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/MCTextRenderer.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/MCTextRenderer.java
index 5e4ad7f..817a609 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/MCTextRenderer.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/MCTextRenderer.java
@@ -1,12 +1,12 @@
-package nova.gui.wrapper.mc18.text;
+package nova.gui.wrapper.mc.forge.v1_8.text;
 
 import net.minecraft.client.gui.FontRenderer;
 import nova.core.render.Color;
 import nova.core.util.math.MathUtil;
 import nova.gui.render.text.FormattedText;
 import nova.gui.render.text.TextRenderer;
-import nova.gui.wrapper.mc18.MCCanvas;
-import nova.gui.wrapper.mc18.text.IText.Text;
+import nova.gui.wrapper.mc.forge.v1_8.MCCanvas;
+import nova.gui.wrapper.mc.forge.v1_8.text.IText.Text;
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 import org.lwjgl.opengl.GL11;
 
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/Paragraph.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/Paragraph.java
similarity index 96%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/Paragraph.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/Paragraph.java
index 1dcfcec..6d3d559 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/Paragraph.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/Paragraph.java
@@ -1,4 +1,4 @@
-package nova.gui.wrapper.mc18.text;
+package nova.gui.wrapper.mc.forge.v1_8.text;
 
 import com.google.common.collect.Lists;
 import net.minecraft.client.gui.FontRenderer;
@@ -6,7 +6,7 @@
 import nova.gui.render.text.FormattedText.TextFormat;
 import nova.gui.render.text.TextRenderer;
 import nova.gui.render.text.TextRenderer.RenderedText;
-import nova.gui.wrapper.mc18.text.IText.Word;
+import nova.gui.wrapper.mc.forge.v1_8.text.IText.Word;
 import org.lwjgl.opengl.GL11;
 
 import java.util.List;
diff --git a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/SimpleParagraph.java b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/SimpleParagraph.java
similarity index 94%
rename from minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/SimpleParagraph.java
rename to minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/SimpleParagraph.java
index 2717818..4532eda 100644
--- a/minecraft/1.8/src/main/java/nova/gui/wrapper/mc18/text/SimpleParagraph.java
+++ b/minecraft/1.8/src/main/java/nova/gui/wrapper/mc/forge/v1_8/text/SimpleParagraph.java
@@ -1,11 +1,11 @@
-package nova.gui.wrapper.mc18.text;
+package nova.gui.wrapper.mc.forge.v1_8.text;
 
 import net.minecraft.client.gui.FontRenderer;
 import nova.gui.render.text.FormattedText;
 import nova.gui.render.text.FormattedText.TextFormat;
 import nova.gui.render.text.TextRenderer;
 import nova.gui.render.text.TextRenderer.RenderedText;
-import nova.gui.wrapper.mc18.text.IText.Text;
+import nova.gui.wrapper.mc.forge.v1_8.text.IText.Text;
 import org.lwjgl.opengl.GL11;
 
 class SimpleParagraph extends AbstractParagraph<Text> implements RenderedText {
diff --git a/minecraft/build.gradle b/minecraft/build.gradle
index 2f4e064..905f27d 100644
--- a/minecraft/build.gradle
+++ b/minecraft/build.gradle
@@ -1,16 +1,19 @@
-buildscript{
-	repositories{
-		mavenCentral()
-		maven {
-			name "forge"
-			url "http://files.minecraftforge.net/maven"
+subprojects {
+	buildscript {
+		repositories {
+			mavenCentral()
+			maven {
+				name "forge"
+				url "http://files.minecraftforge.net/maven"
+			}
+			maven {
+				name "sonatype"
+				url "https://oss.sonatype.org/content/repositories/snapshots/"
+			}
 		}
-		maven {
-			name "sonatype"
-			url "https://oss.sonatype.org/content/repositories/snapshots/"
+		dependencies {
+			// Minecraft 1.11 requires newer ForgeGradle, while 1.7 and 1.8 require older.
+			classpath 'net.minecraftforge.gradle:ForgeGradle:' + property('forgeGradleVersion')
 		}
 	}
-	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-	}
 }
diff --git a/settings.gradle b/settings.gradle
index c233ed6..fdfe01a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 rootProject.name = "NOVA-GUI"
 
+include "minecraft:1.11"
 include "minecraft:1.8"
 include "minecraft:1.7"
diff --git a/src/main/java/nova/gui/AbstractGuiContainer.java b/src/main/java/nova/gui/AbstractGuiContainer.java
index fde7bd6..21de0a4 100644
--- a/src/main/java/nova/gui/AbstractGuiContainer.java
+++ b/src/main/java/nova/gui/AbstractGuiContainer.java
@@ -184,6 +184,7 @@ public O add(GuiComponent<?, ?> component, Object... properties) {
 	/**
 	 * Resets the GuiContainer, removing all the components and layouts
 	 */
+	@SuppressWarnings("unchecked")
 	public void reset() {
 		((HashMap<String, GuiComponent<?, ?>>) children.clone()).values().forEach(this::removeElement);
 	}
@@ -202,7 +203,7 @@ public O removeElement(GuiComponent<?, ?> component) {
 			throw new GuiComponentException("Component couldn't be removed from parent container as it wasn't a child.");
 		}
 		component.triggerEvent(new ComponentEvent.RemoveEvent(component, this));
-		children.remove(component);
+		children.remove(component.getID());
 		layout.remove(component);
 		component.updateQualifiedName();
 		getNative().removeElement(component);
diff --git a/src/main/java/nova/gui/ComponentEvent.java b/src/main/java/nova/gui/ComponentEvent.java
index 8102e96..f6a177c 100644
--- a/src/main/java/nova/gui/ComponentEvent.java
+++ b/src/main/java/nova/gui/ComponentEvent.java
@@ -1,8 +1,8 @@
 package nova.gui;
 
-import nova.core.event.CancelableEvent;
-import nova.core.event.EventListener;
-import nova.core.event.SidedEventBus.SidedEvent;
+import nova.core.event.bus.CancelableEvent;
+import nova.core.event.bus.EventListener;
+import nova.core.event.bus.SidedEventBus.SidedEvent;
 import nova.core.network.NetworkTarget.Side;
 import nova.core.network.Sync;
 import nova.gui.factory.GuiEventFactory;
@@ -10,7 +10,7 @@
 /**
  * Event created by {@link GuiComponent}. These events, opposed to
  * {@link GuiEvent}, aren't propagated to the child components.
- * 
+ *
  * @see SidedComponentEvent
  * @see ComponentEventListener
  * @see GuiComponent#triggerEvent(ComponentEvent)
@@ -30,7 +30,7 @@ public ComponentEvent(GuiComponent<?, ?> component) {
 	/**
 	 * Specify to indicate which id {@link Sync} will use when getting
 	 * serialized to a packet.
-	 * 
+	 *
 	 * @return sync id
 	 */
 	public int getSyncID() {
@@ -40,9 +40,9 @@ public int getSyncID() {
 	/**
 	 * {@link EventListener} interface used by {@link GuiComponent} to specify
 	 * the component type. Preferred over using {@link #component} directly.
-	 * 
+	 *
 	 * @author Vic Nightfall
-	 * 
+	 *
 	 * @param <EVENT>
 	 * @param <T>
 	 * @see GuiComponent#onEvent(ComponentEventListener, Class)
@@ -65,7 +65,7 @@ public default void onEvent(EVENT event) {
 	 * {@link ComponentEvent} which can be sent over the network. Has to be
 	 * registered with
 	 * {@link GuiEventFactory#registerNetworkEvent(java.util.function.Function)}
-	 * 
+	 *
 	 * @author Vic Nightfall
 	 */
 	public static class SidedComponentEvent extends ComponentEvent implements SidedEvent {
diff --git a/src/main/java/nova/gui/Gui.java b/src/main/java/nova/gui/Gui.java
index 91634b0..e28d6cb 100644
--- a/src/main/java/nova/gui/Gui.java
+++ b/src/main/java/nova/gui/Gui.java
@@ -2,8 +2,8 @@
 
 import nova.core.entity.Entity;
 import nova.core.entity.component.Player;
-import nova.core.inventory.Inventory;
-import nova.core.inventory.component.InventoryPlayer;
+import nova.core.component.inventory.Inventory;
+import nova.core.component.inventory.InventoryPlayer;
 import nova.core.network.NetworkTarget.Side;
 import nova.core.network.Packet;
 import nova.gui.component.inventory.Slot;
@@ -81,7 +81,7 @@ protected void dispatchNetworkEvent(ComponentEvent.SidedComponentEvent event, Gu
 	 */
 	public void bind(Entity entity, Vector3D position) {
 		inventoryMap.clear();
-		playerInventory = entity.get(Player.class).getInventory();
+		playerInventory = entity.components.get(Player.class).getInventory();
 		onEvent(new GuiEvent.BindEvent(this, entity, position));
 		repaint();
 	}
diff --git a/src/main/java/nova/gui/GuiComponent.java b/src/main/java/nova/gui/GuiComponent.java
index 678d14b..0949184 100644
--- a/src/main/java/nova/gui/GuiComponent.java
+++ b/src/main/java/nova/gui/GuiComponent.java
@@ -1,9 +1,9 @@
 package nova.gui;
 
-import nova.core.event.EventBus;
-import nova.core.event.EventListener;
-import nova.core.event.SidedEventBus;
-import nova.core.event.SidedEventBus.SidedEvent;
+import nova.core.event.bus.EventBus;
+import nova.core.event.bus.EventListener;
+import nova.core.event.bus.SidedEventBus;
+import nova.core.event.bus.SidedEventBus.SidedEvent;
 import nova.core.network.NetworkTarget.Side;
 import nova.core.network.Syncable;
 import nova.core.util.Identifiable;
@@ -318,7 +318,7 @@ public void triggerEvent(ComponentEvent event) {
 
 	// Internal listener
 	public <EVENT extends GuiEvent> O onGuiEvent(EventListener<EVENT> listener, Class<EVENT> clazz) {
-		guiEventBus.add(listener, clazz);
+		guiEventBus.on(clazz).bind(listener);
 		return (O) this;
 	}
 
@@ -328,7 +328,7 @@ public <EVENT extends ComponentEvent> O onEvent(ComponentEvent.ComponentEventLis
 		if (side == Side.SERVER && !hasIdentifierRecursive()) {
 			throw new GuiComponentException("Components without unique identifier can't recieve events on the server side!");
 		}
-		componentEventBus.add(listener, clazz, side);
+		componentEventBus.on(clazz).bind(listener);
 		return (O) this;
 	}
 
@@ -340,7 +340,7 @@ public <EVENT extends ComponentEvent> O onEvent(EventListener<EVENT> listener, C
 		if (side == Side.SERVER && !hasIdentifierRecursive()) {
 			throw new GuiComponentException("Components without unique identifier can't recieve events on the server side!");
 		}
-		componentEventBus.add(listener, clazz, side);
+		componentEventBus.on(clazz).bind(listener);
 		return (O) this;
 	}
 
diff --git a/src/main/java/nova/gui/GuiComponentException.java b/src/main/java/nova/gui/GuiComponentException.java
index 2467db6..249f056 100644
--- a/src/main/java/nova/gui/GuiComponentException.java
+++ b/src/main/java/nova/gui/GuiComponentException.java
@@ -1,6 +1,8 @@
 package nova.gui;
 
 public class GuiComponentException extends GuiException {
+	private static final long serialVersionUID = 2017_01_22L;
+
 	public GuiComponentException() {
 		super();
 	}
diff --git a/src/main/java/nova/gui/GuiEvent.java b/src/main/java/nova/gui/GuiEvent.java
index 264207c..351073a 100644
--- a/src/main/java/nova/gui/GuiEvent.java
+++ b/src/main/java/nova/gui/GuiEvent.java
@@ -3,7 +3,7 @@
 import nova.core.block.Block;
 import nova.core.entity.Entity;
 import nova.core.entity.component.Player;
-import nova.core.event.CancelableEvent;
+import nova.core.event.bus.CancelableEvent;
 import nova.core.game.InputManager;
 import nova.core.world.World;
 import nova.gui.render.Graphics;
@@ -100,7 +100,7 @@ public BindEvent(Gui gui, Entity entity, Vector3D position) {
 			this.gui = gui;
 			this.entity = entity;
 			this.position = position;
-			this.player = entity.get(Player.class);
+			this.player = entity.components.get(Player.class);
 			this.world = entity.world();
 			this.block = world.getBlock(position);
 		}
diff --git a/src/main/java/nova/gui/GuiException.java b/src/main/java/nova/gui/GuiException.java
index e86fb7a..ba2b7b2 100644
--- a/src/main/java/nova/gui/GuiException.java
+++ b/src/main/java/nova/gui/GuiException.java
@@ -1,8 +1,10 @@
 package nova.gui;
 
-import nova.core.util.NovaException;
+import nova.core.util.exception.NovaException;
 
 public class GuiException extends NovaException {
+	private static final long serialVersionUID = 2017_01_22L;
+
 	public GuiException() {
 		super();
 	}
diff --git a/src/main/java/nova/gui/component/Button.java b/src/main/java/nova/gui/component/Button.java
index fbf14df..59a83fa 100644
--- a/src/main/java/nova/gui/component/Button.java
+++ b/src/main/java/nova/gui/component/Button.java
@@ -34,6 +34,7 @@ private void onMousePressed(GuiEvent.MouseEvent event) {
 				if (isMouseOver()) {
 					triggerEvent(new ComponentEvent.ActionEvent(this));
 				}
+				break;
 			default:
 				break;
 		}
diff --git a/src/main/java/nova/gui/component/inventory/PlayerInventory.java b/src/main/java/nova/gui/component/inventory/PlayerInventory.java
index 80edafa..0ffc551 100644
--- a/src/main/java/nova/gui/component/inventory/PlayerInventory.java
+++ b/src/main/java/nova/gui/component/inventory/PlayerInventory.java
@@ -1,6 +1,6 @@
 package nova.gui.component.inventory;
 
-import nova.core.inventory.component.InventoryPlayer;
+import nova.core.component.inventory.InventoryPlayer;
 import nova.gui.GuiComponent;
 import nova.gui.GuiEvent;
 import nova.gui.nativeimpl.NativePlayerInventory;
@@ -9,7 +9,7 @@
  * Defines the standard player inventory. It automatically gets wrapped to the
  * player inventory and its appearance, size, and other properties might differ
  * from wrapper to wrapper.
- * 
+ *
  * @author Vic Nightfall
  */
 public class PlayerInventory extends GuiComponent<PlayerInventory, NativePlayerInventory> {
diff --git a/src/main/java/nova/gui/component/inventory/Slot.java b/src/main/java/nova/gui/component/inventory/Slot.java
index 806a62f..98bebff 100644
--- a/src/main/java/nova/gui/component/inventory/Slot.java
+++ b/src/main/java/nova/gui/component/inventory/Slot.java
@@ -1,8 +1,8 @@
 package nova.gui.component.inventory;
 
-import nova.core.inventory.Inventory;
-import nova.core.inventory.InventoryException;
-import nova.core.inventory.ItemFilter;
+import nova.core.component.inventory.Inventory;
+import nova.core.component.inventory.InventoryException;
+import nova.core.component.inventory.ItemFilter;
 import nova.core.item.Item;
 import nova.gui.Gui;
 import nova.gui.GuiComponent;
diff --git a/src/main/java/nova/gui/factory/GuiEventFactory.java b/src/main/java/nova/gui/factory/GuiEventFactory.java
index 526feee..1501af5 100644
--- a/src/main/java/nova/gui/factory/GuiEventFactory.java
+++ b/src/main/java/nova/gui/factory/GuiEventFactory.java
@@ -1,6 +1,6 @@
 package nova.gui.factory;
 
-import nova.core.event.EventException;
+import nova.core.event.bus.EventException;
 import nova.core.network.Packet;
 import nova.gui.ComponentEvent;
 import nova.gui.Gui;
diff --git a/src/main/java/nova/gui/factory/GuiFactory.java b/src/main/java/nova/gui/factory/GuiFactory.java
index 7d9c047..c617b59 100644
--- a/src/main/java/nova/gui/factory/GuiFactory.java
+++ b/src/main/java/nova/gui/factory/GuiFactory.java
@@ -1,22 +1,23 @@
 package nova.gui.factory;
 
-import nova.core.util.Factory;
+import nova.core.util.registry.Factory;
 import nova.gui.Gui;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class GuiFactory extends Factory<Gui> {
+public class GuiFactory extends Factory<GuiFactory, Gui> {
 
-	public GuiFactory(Function<Object[], Gui> constructor) {
-		super(constructor);
+	public GuiFactory(String id, Supplier<Gui> constructor) {
+		super(id, constructor);
 	}
 
-	public GuiFactory(Supplier<Gui> supplier) {
-		super(o -> supplier.get());
+	public GuiFactory(String id, Supplier<Gui> constructor, Function<Gui, Gui> processor) {
+		super(id, constructor, processor);
 	}
 
-	public Gui makeGUI(Object... args) {
-		return constructor.apply(args);
+	@Override
+	protected GuiFactory selfConstructor(String id, Supplier<Gui> constructor, Function<Gui, Gui> processor) {
+		return new GuiFactory(id, constructor, processor);
 	}
 }
diff --git a/src/main/java/nova/gui/factory/GuiManager.java b/src/main/java/nova/gui/factory/GuiManager.java
index 6f07779..b17f5fd 100755
--- a/src/main/java/nova/gui/factory/GuiManager.java
+++ b/src/main/java/nova/gui/factory/GuiManager.java
@@ -1,13 +1,14 @@
 package nova.gui.factory;
 
 import nova.core.entity.Entity;
+import nova.core.event.bus.GlobalEvents;
 import nova.core.loader.Mod;
 import nova.core.network.NetworkTarget.IllegalSideException;
 import nova.core.network.NetworkTarget.Side;
 import nova.core.network.Sided;
-import nova.core.util.Manager;
-import nova.core.util.RegistrationException;
-import nova.core.util.Registry;
+import nova.core.util.exception.RegistrationException;
+import nova.core.util.registry.FactoryManager;
+import nova.core.util.registry.Registry;
 import nova.gui.Gui;
 import nova.gui.GuiEvent;
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
@@ -19,13 +20,15 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public abstract class GuiManager extends Manager<Gui, GuiFactory> {
+public abstract class GuiManager extends FactoryManager<GuiManager, Gui, GuiFactory> {
 
 	// TODO Move this into a seperate manager
 	protected EnumMap<GuiType, List<Gui>> overlayRegistry = new EnumMap<>(GuiType.class);
+	private final GlobalEvents events;
 
-	public GuiManager() {
+	public GuiManager(GlobalEvents events) {
 		super(new Registry<>());
+		this.events = events;
 	}
 
 	@Deprecated
@@ -36,14 +39,13 @@ public void registerOverlay(Gui gui, GuiType guiType) {
 		overlayRegistry.get(guiType).add(gui);
 	}
 
-	public GuiFactory register(Supplier<Gui> supplier) {
-		return register(new GuiFactory(supplier));
+	@Override
+	public GuiFactory register(String id, Supplier<Gui> constructor) {
+		return register(new GuiFactory(id, constructor));
 	}
 
-	@Override
-	@Deprecated
-	public GuiFactory register(Function<Object[], Gui> constructor) {
-		return register(new GuiFactory(constructor));
+	public GuiFactory register(String id, Supplier<Gui> constructor, Function<Gui, Gui> processor) {
+		return register(new GuiFactory(id, constructor, processor));
 	}
 
 	/**
@@ -63,8 +65,8 @@ public GuiFactory register(Function<Object[], Gui> constructor) {
 	 * @see #showGui(Gui, Entity, Vector3D)
 	 */
 	public void showGui(String identifier, Entity entity, Vector3D position) {
-		GuiFactory factory = getFactory(identifier).orElseThrow(() -> new RegistrationException(String.format("No GUI called %s registered!", identifier)));
-		showGui(factory.makeGUI(), entity, position);
+		GuiFactory factory = registry.get(identifier).orElseThrow(() -> new RegistrationException(String.format("No GUI called %s registered!", identifier)));
+		showGui(factory.build(), entity, position);
 	}
 
 	/**
@@ -149,6 +151,17 @@ public GuiType getActiveGuiType() {
 		return getActiveGui().isPresent() ? GuiType.CUSTOM : GuiType.NATIVE;
 	}
 
+	@Override
+	public void init() {
+		this.events.publish(new Init(this));
+	}
+
+	public class Init extends ManagerEvent<GuiManager> {
+		public Init(GuiManager manager) {
+			super(manager);
+		}
+	}
+
 	public static enum GuiType {
 		INGAME, TITLE, OPTIONS, INGAME_OPTIONS, CRAFTING, NATIVE, CUSTOM
 	}
diff --git a/src/main/java/nova/gui/launch/NovaGui.java b/src/main/java/nova/gui/launch/NovaGui.java
index c5e4c06..d79c317 100755
--- a/src/main/java/nova/gui/launch/NovaGui.java
+++ b/src/main/java/nova/gui/launch/NovaGui.java
@@ -3,7 +3,7 @@
 import nova.core.game.InputManager;
 import nova.core.loader.Mod;
 import nova.core.network.NetworkManager;
-import nova.core.util.LanguageManager;
+import nova.core.util.registry.LanguageManager;
 import nova.gui.factory.GuiComponentFactory;
 
 /**
diff --git a/src/main/java/nova/gui/layout/LayoutException.java b/src/main/java/nova/gui/layout/LayoutException.java
index 8dbe25a..3a09fb7 100644
--- a/src/main/java/nova/gui/layout/LayoutException.java
+++ b/src/main/java/nova/gui/layout/LayoutException.java
@@ -1,8 +1,10 @@
 package nova.gui.layout;
 
-import nova.core.util.NovaException;
+import nova.core.util.exception.NovaException;
 
 public class LayoutException extends NovaException {
+	private static final long serialVersionUID = 2017_01_22L;
+
 	public LayoutException() {
 		super();
 	}
diff --git a/src/main/java/nova/gui/render/Vertex2D.java b/src/main/java/nova/gui/render/Vertex2D.java
index 2c06586..450892c 100644
--- a/src/main/java/nova/gui/render/Vertex2D.java
+++ b/src/main/java/nova/gui/render/Vertex2D.java
@@ -3,6 +3,7 @@
 import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
 
 public class Vertex2D extends Vector2D {
+	private static final long serialVersionUID = 2017_01_22L;
 
 	public final boolean uv;
 	public final double u, v;