diff --git a/li/cil/oc/common/gui/GuiComputer.scala b/li/cil/oc/client/gui/GuiComputer.scala
similarity index 98%
rename from li/cil/oc/common/gui/GuiComputer.scala
rename to li/cil/oc/client/gui/GuiComputer.scala
index 261dc354b..c40ab34fe 100644
--- a/li/cil/oc/common/gui/GuiComputer.scala
+++ b/li/cil/oc/client/gui/GuiComputer.scala
@@ -1,7 +1,6 @@
-package li.cil.oc.common.gui
+package li.cil.oc.client.gui
 
 import org.lwjgl.opengl.GL11
-
 import li.cil.oc.common.container.ContainerComputer
 import li.cil.oc.common.tileentity.TileEntityComputer
 import net.minecraft.client.gui.GuiButton
diff --git a/li/cil/oc/common/gui/GuiScreen.scala b/li/cil/oc/client/gui/GuiScreen.scala
similarity index 97%
rename from li/cil/oc/common/gui/GuiScreen.scala
rename to li/cil/oc/client/gui/GuiScreen.scala
index d8403726b..d3d890f04 100644
--- a/li/cil/oc/common/gui/GuiScreen.scala
+++ b/li/cil/oc/client/gui/GuiScreen.scala
@@ -1,4 +1,4 @@
-package li.cil.oc.common.gui
+package li.cil.oc.client.gui
 
 import li.cil.oc.common.tileentity.TileEntityScreen
 import net.minecraft.client.gui.Gui
diff --git a/li/cil/oc/common/gui/GuiHandler.scala b/li/cil/oc/common/GuiHandler.scala
similarity index 91%
rename from li/cil/oc/common/gui/GuiHandler.scala
rename to li/cil/oc/common/GuiHandler.scala
index 2dfc55dca..ab47feb7a 100644
--- a/li/cil/oc/common/gui/GuiHandler.scala
+++ b/li/cil/oc/common/GuiHandler.scala
@@ -1,4 +1,4 @@
-package li.cil.oc.common.gui
+package li.cil.oc.common
 
 import cpw.mods.fml.common.network.IGuiHandler
 import li.cil.oc.common.container.ContainerComputer
@@ -6,6 +6,8 @@ import li.cil.oc.common.tileentity.TileEntityComputer
 import li.cil.oc.common.tileentity.TileEntityScreen
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.world.World
+import li.cil.oc.client.gui.GuiScreen
+import li.cil.oc.client.gui.GuiComputer
 
 object GuiType extends Enumeration {
   val Computer = Value("Computer")
diff --git a/li/cil/oc/common/Proxy.scala b/li/cil/oc/common/Proxy.scala
index 9df94704f..239f043a2 100644
--- a/li/cil/oc/common/Proxy.scala
+++ b/li/cil/oc/common/Proxy.scala
@@ -7,7 +7,6 @@ import cpw.mods.fml.common.registry.LanguageRegistry
 import li.cil.oc._
 import li.cil.oc.OpenComputers
 import li.cil.oc.api.OpenComputersAPI
-import li.cil.oc.common.gui.GuiHandler
 import li.cil.oc.server.computer.Drivers
 import li.cil.oc.server.drivers._
 
@@ -33,7 +32,7 @@ class Proxy {
     // TODO Figure out how resource pack based localization works.
     LanguageRegistry.addName(Blocks.computer, "Computer")
 
-    NetworkRegistry.instance().registerGuiHandler(OpenComputers, new GuiHandler());
+    NetworkRegistry.instance.registerGuiHandler(OpenComputers, new GuiHandler)
 
     OpenComputersAPI.addDriver(GraphicsCardDriver)
     OpenComputersAPI.addDriver(ScreenDriver)
diff --git a/li/cil/oc/common/block/BlockComputer.scala b/li/cil/oc/common/block/BlockComputer.scala
index 961e6d39a..f3b73074b 100644
--- a/li/cil/oc/common/block/BlockComputer.scala
+++ b/li/cil/oc/common/block/BlockComputer.scala
@@ -4,7 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry
 import li.cil.oc.Config
 import li.cil.oc.CreativeTab
 import li.cil.oc.OpenComputers
-import li.cil.oc.common.gui.GuiType
+import li.cil.oc.common.GuiType
 import li.cil.oc.common.tileentity.TileEntityComputer
 import net.minecraft.block.Block
 import net.minecraft.block.material.Material
@@ -15,6 +15,7 @@ import net.minecraft.util.MathHelper
 import net.minecraft.world.IBlockAccess
 import net.minecraft.world.World
 import net.minecraftforge.common.ForgeDirection
+import li.cil.oc.common.GuiType
 
 class BlockComputer extends Block(Config.blockComputerId, Material.iron) {
   // ----------------------------------------------------------------------- //
diff --git a/li/cil/oc/common/block/BlockScreen.scala b/li/cil/oc/common/block/BlockScreen.scala
index 86790a421..14927909f 100644
--- a/li/cil/oc/common/block/BlockScreen.scala
+++ b/li/cil/oc/common/block/BlockScreen.scala
@@ -4,12 +4,13 @@ import cpw.mods.fml.common.registry.GameRegistry
 import li.cil.oc.Config
 import li.cil.oc.CreativeTab
 import li.cil.oc.OpenComputers
-import li.cil.oc.common.gui.GuiType
+import li.cil.oc.common.GuiType
 import li.cil.oc.common.tileentity.TileEntityScreen
 import net.minecraft.block.Block
 import net.minecraft.block.material.Material
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.world.World
+import li.cil.oc.common.GuiType
 
 class BlockScreen extends Block(Config.blockScreenId, Material.iron) {
   // ----------------------------------------------------------------------- //
diff --git a/li/cil/oc/common/tileentity/TileEntityScreen.scala b/li/cil/oc/common/tileentity/TileEntityScreen.scala
index bab00b203..89e8434c7 100644
--- a/li/cil/oc/common/tileentity/TileEntityScreen.scala
+++ b/li/cil/oc/common/tileentity/TileEntityScreen.scala
@@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher._
 import li.cil.oc.client.{ PacketSender => ClientPacketSender }
 import li.cil.oc.common.components.IScreenEnvironment
 import li.cil.oc.common.components.Screen
-import li.cil.oc.common.gui.GuiScreen
+import li.cil.oc.client.gui.GuiScreen
 import li.cil.oc.server.{ PacketSender => ServerPacketSender }
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.tileentity.TileEntity