diff --git a/src/main/java/electroblob/wizardry/client/GuiArcaneWorkbench.java b/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java
similarity index 91%
rename from src/main/java/electroblob/wizardry/client/GuiArcaneWorkbench.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java
index 453b71ee..a560abd5 100644
--- a/src/main/java/electroblob/wizardry/client/GuiArcaneWorkbench.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import org.lwjgl.input.Keyboard;
 
@@ -54,8 +54,8 @@ public class GuiArcaneWorkbench extends GuiContainer {
 	public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_){
 
 		// Tests if there is a wand in the workbench and edits the positioning accordingly
-		if(this.inventorySlots.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getHasStack() && this.inventorySlots
-				.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getStack().getItem() instanceof ItemWand){
+		if(this.inventorySlots.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getHasStack() && this.inventorySlots
+				.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getStack().getItem() instanceof ItemWand){
 			xSize = xSizeNoTip + tooltipWidth;
 			guiLeft = (this.width - this.xSize) / 2;
 			this.applyBtn.x = (this.width - tooltipWidth) / 2 + 48;
@@ -65,7 +65,7 @@ public class GuiArcaneWorkbench extends GuiContainer {
 			this.applyBtn.x = this.width / 2 + 48;
 		}
 
-		if(this.inventorySlots.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getHasStack()){
+		if(this.inventorySlots.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getHasStack()){
 			this.applyBtn.enabled = true;
 		}else{
 			this.applyBtn.enabled = false;
@@ -94,8 +94,8 @@ public class GuiArcaneWorkbench extends GuiContainer {
 		}
 
 		// Tooltip only drawn if there is a wand
-		if(this.inventorySlots.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getHasStack() && this.inventorySlots
-				.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getStack().getItem() instanceof ItemWand){
+		if(this.inventorySlots.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getHasStack() && this.inventorySlots
+				.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getStack().getItem() instanceof ItemWand){
 
 			// Tooltip box
 			drawTexturedModalRect(guiLeft + xSizeNoTip, guiTop, xSizeNoTip, 0, 256 - xSizeNoTip - 4, ySize);
@@ -103,7 +103,7 @@ public class GuiArcaneWorkbench extends GuiContainer {
 			drawTexturedModalRect(guiLeft + xSize - (256 - xSizeNoTip - 4), guiTop, xSizeNoTip + 4, 0,
 					256 - xSizeNoTip - 4, ySize);
 
-			ItemStack wand = this.inventorySlots.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getStack();
+			ItemStack wand = this.inventorySlots.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getStack();
 
 			Spell[] spells = WandHelper.getSpells(wand);
 
@@ -161,10 +161,10 @@ public class GuiArcaneWorkbench extends GuiContainer {
 		this.fontRenderer.drawString(this.playerInventory.hasCustomName() ? this.playerInventory.getName()
 				: I18n.format(this.playerInventory.getName()), 8, this.ySize - 96 + 2, 4210752);
 
-		if(this.inventorySlots.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getHasStack() && this.inventorySlots
-				.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getStack().getItem() instanceof ItemWand){
+		if(this.inventorySlots.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getHasStack() && this.inventorySlots
+				.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getStack().getItem() instanceof ItemWand){
 
-			ItemStack wand = this.inventorySlots.getSlot(ContainerArcaneWorkbench.WAND_SLOT).getStack();
+			ItemStack wand = this.inventorySlots.getSlot(ContainerArcaneWorkbench.CENTRE_SLOT).getStack();
 
 			this.fontRenderer.drawStringWithShadow("\u00A7f" + wand.getDisplayName(), xSizeNoTip + 6, 6, 0);
 			this.fontRenderer.drawStringWithShadow(
diff --git a/src/main/java/electroblob/wizardry/client/GuiButtonApply.java b/src/main/java/electroblob/wizardry/client/gui/GuiButtonApply.java
similarity index 96%
rename from src/main/java/electroblob/wizardry/client/GuiButtonApply.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiButtonApply.java
index 195327e8..a18d9668 100644
--- a/src/main/java/electroblob/wizardry/client/GuiButtonApply.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiButtonApply.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.util.WizardryUtilities;
diff --git a/src/main/java/electroblob/wizardry/client/GuiButtonInvisible.java b/src/main/java/electroblob/wizardry/client/gui/GuiButtonInvisible.java
similarity index 93%
rename from src/main/java/electroblob/wizardry/client/GuiButtonInvisible.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiButtonInvisible.java
index 70e9c2e4..c80db3af 100644
--- a/src/main/java/electroblob/wizardry/client/GuiButtonInvisible.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiButtonInvisible.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
diff --git a/src/main/java/electroblob/wizardry/client/GuiButtonTurnPage.java b/src/main/java/electroblob/wizardry/client/gui/GuiButtonTurnPage.java
similarity index 97%
rename from src/main/java/electroblob/wizardry/client/GuiButtonTurnPage.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiButtonTurnPage.java
index 2bdeb44e..f9c7a8cd 100644
--- a/src/main/java/electroblob/wizardry/client/GuiButtonTurnPage.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiButtonTurnPage.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.util.WizardryUtilities;
diff --git a/src/main/java/electroblob/wizardry/client/GuiConfigWizardry.java b/src/main/java/electroblob/wizardry/client/gui/GuiConfigWizardry.java
similarity index 99%
rename from src/main/java/electroblob/wizardry/client/GuiConfigWizardry.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiConfigWizardry.java
index 4da979bf..7e7fc01e 100644
--- a/src/main/java/electroblob/wizardry/client/GuiConfigWizardry.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiConfigWizardry.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/electroblob/wizardry/client/GuiPortableCrafting.java b/src/main/java/electroblob/wizardry/client/gui/GuiPortableCrafting.java
similarity index 97%
rename from src/main/java/electroblob/wizardry/client/GuiPortableCrafting.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiPortableCrafting.java
index 5fc05f3a..88162dbf 100644
--- a/src/main/java/electroblob/wizardry/client/GuiPortableCrafting.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiPortableCrafting.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
diff --git a/src/main/java/electroblob/wizardry/client/GuiSpellBook.java b/src/main/java/electroblob/wizardry/client/gui/GuiSpellBook.java
similarity index 99%
rename from src/main/java/electroblob/wizardry/client/GuiSpellBook.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiSpellBook.java
index fcfb2366..2d78b219 100644
--- a/src/main/java/electroblob/wizardry/client/GuiSpellBook.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiSpellBook.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import org.lwjgl.input.Keyboard;
 
diff --git a/src/main/java/electroblob/wizardry/client/GuiSpellDisplay.java b/src/main/java/electroblob/wizardry/client/gui/GuiSpellDisplay.java
similarity index 99%
rename from src/main/java/electroblob/wizardry/client/GuiSpellDisplay.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiSpellDisplay.java
index 0f905882..10088ab2 100644
--- a/src/main/java/electroblob/wizardry/client/GuiSpellDisplay.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiSpellDisplay.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import java.util.List;
 
diff --git a/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java b/src/main/java/electroblob/wizardry/client/gui/GuiWizardHandbook.java
similarity index 99%
rename from src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java
rename to src/main/java/electroblob/wizardry/client/gui/GuiWizardHandbook.java
index 98fa241e..b3e5d884 100644
--- a/src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiWizardHandbook.java
@@ -1,4 +1,4 @@
-package electroblob.wizardry.client;
+package electroblob.wizardry.client.gui;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -13,6 +13,7 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
 import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.client.ClientProxy;
 import electroblob.wizardry.constants.Constants;
 import electroblob.wizardry.constants.Element;
 import electroblob.wizardry.constants.Tier;