diff --git a/src/main/java/electroblob/wizardry/WizardryGuiFactory.java b/src/main/java/electroblob/wizardry/WizardryGuiFactory.java
index 19951840..169c473e 100644
--- a/src/main/java/electroblob/wizardry/WizardryGuiFactory.java
+++ b/src/main/java/electroblob/wizardry/WizardryGuiFactory.java
@@ -2,7 +2,7 @@ package electroblob.wizardry;
 
 import java.util.Set;
 
-import electroblob.wizardry.client.GuiConfigWizardry;
+import electroblob.wizardry.client.gui.GuiConfigWizardry;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraftforge.fml.client.IModGuiFactory;
diff --git a/src/main/java/electroblob/wizardry/WizardryGuiHandler.java b/src/main/java/electroblob/wizardry/WizardryGuiHandler.java
index f3dffaa6..13cfaaa6 100644
--- a/src/main/java/electroblob/wizardry/WizardryGuiHandler.java
+++ b/src/main/java/electroblob/wizardry/WizardryGuiHandler.java
@@ -40,20 +40,20 @@ public class WizardryGuiHandler implements IGuiHandler {
 		if(id == ARCANE_WORKBENCH){
 			TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z));
 			if(tileEntity instanceof TileEntityArcaneWorkbench){
-				return new electroblob.wizardry.client.GuiArcaneWorkbench(player.inventory,
+				return new electroblob.wizardry.client.gui.GuiArcaneWorkbench(player.inventory,
 						(TileEntityArcaneWorkbench)tileEntity);
 			}
 		}else if(id == WIZARD_HANDBOOK && (player.getHeldItemMainhand().getItem() instanceof ItemWizardHandbook
 				|| player.getHeldItemOffhand().getItem() instanceof ItemWizardHandbook)){
-			return new electroblob.wizardry.client.GuiWizardHandbook();
+			return new electroblob.wizardry.client.gui.GuiWizardHandbook();
 		}else if(id == SPELL_BOOK){
 			if(player.getHeldItemMainhand().getItem() instanceof ItemSpellBook){
-				return new electroblob.wizardry.client.GuiSpellBook(Spell.get(player.getHeldItemMainhand().getItemDamage()));
+				return new electroblob.wizardry.client.gui.GuiSpellBook(Spell.get(player.getHeldItemMainhand().getItemDamage()));
 			}else if(player.getHeldItemOffhand().getItem() instanceof ItemSpellBook){
-				return new electroblob.wizardry.client.GuiSpellBook(Spell.get(player.getHeldItemOffhand().getItemDamage()));
+				return new electroblob.wizardry.client.gui.GuiSpellBook(Spell.get(player.getHeldItemOffhand().getItemDamage()));
 			}
 		}else if(id == PORTABLE_CRAFTING){
-			return new electroblob.wizardry.client.GuiPortableCrafting(player.inventory, world, new BlockPos(x, y, z));
+			return new electroblob.wizardry.client.gui.GuiPortableCrafting(player.inventory, world, new BlockPos(x, y, z));
 		}
 		return null;
 	}
diff --git a/src/main/java/electroblob/wizardry/client/ClientProxy.java b/src/main/java/electroblob/wizardry/client/ClientProxy.java
index 5e978c33..cd68ad7c 100644
--- a/src/main/java/electroblob/wizardry/client/ClientProxy.java
+++ b/src/main/java/electroblob/wizardry/client/ClientProxy.java
@@ -10,6 +10,8 @@ import electroblob.wizardry.CommonProxy;
 import electroblob.wizardry.SpellGlyphData;
 import electroblob.wizardry.WizardData;
 import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.client.gui.GuiSpellDisplay;
+import electroblob.wizardry.client.gui.GuiWizardHandbook;
 import electroblob.wizardry.client.model.ModelWizardArmour;
 import electroblob.wizardry.client.particle.ParticleBlizzard;
 import electroblob.wizardry.client.particle.ParticleBuff;