diff --git a/src/java/cr0s/warpdrive/data/CloakManager.java b/src/java/cr0s/warpdrive/data/CloakManager.java
index 8512dc47..a9874028 100644
--- a/src/java/cr0s/warpdrive/data/CloakManager.java
+++ b/src/java/cr0s/warpdrive/data/CloakManager.java
@@ -8,10 +8,9 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.Packet;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
+import cr0s.warpdrive.network.PacketHandler;
 
 /**
  * Cloak manager stores cloaking devices covered areas
diff --git a/src/java/cr0s/warpdrive/data/CloakedArea.java b/src/java/cr0s/warpdrive/data/CloakedArea.java
index 387373c4..98413181 100644
--- a/src/java/cr0s/warpdrive/data/CloakedArea.java
+++ b/src/java/cr0s/warpdrive/data/CloakedArea.java
@@ -11,7 +11,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
-import cr0s.warpdrive.PacketHandler;
+import cr0s.warpdrive.network.PacketHandler;
 
 public class CloakedArea {
 	public int dimensionId = -666;
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityAbstractMiner.java b/src/java/cr0s/warpdrive/machines/TileEntityAbstractMiner.java
index 65088f66..77e1b520 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityAbstractMiner.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityAbstractMiner.java
@@ -11,10 +11,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.IFluidBlock;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
+import cr0s.warpdrive.network.PacketHandler;
 
 public abstract class TileEntityAbstractMiner extends TileEntityAbstractLaser
 {
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityCamera.java b/src/java/cr0s/warpdrive/machines/TileEntityCamera.java
index be920c19..c8589408 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityCamera.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityCamera.java
@@ -7,8 +7,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.ChunkPosition;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
+import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityLaser.java b/src/java/cr0s/warpdrive/machines/TileEntityLaser.java
index 0e0ace27..678592a8 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityLaser.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityLaser.java
@@ -20,10 +20,10 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.ChunkPosition;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
+import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityLaserReactorMonitor.java b/src/java/cr0s/warpdrive/machines/TileEntityLaserReactorMonitor.java
index c1c7ff97..71c34eb6 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityLaserReactorMonitor.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityLaserReactorMonitor.java
@@ -12,10 +12,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLCommonHandler;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.item.ItemReactorLaserFocus;
+import cr0s.warpdrive.network.PacketHandler;
 
 public class TileEntityLaserReactorMonitor extends TileEntityAbstractLaser {
 	private final int workRate = 10;
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityLift.java b/src/java/cr0s/warpdrive/machines/TileEntityLift.java
index 42599dfa..fcdf9356 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityLift.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityLift.java
@@ -13,10 +13,10 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
+import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityMiningLaser.java b/src/java/cr0s/warpdrive/machines/TileEntityMiningLaser.java
index 0712a298..5b6eb134 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityMiningLaser.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityMiningLaser.java
@@ -17,10 +17,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.FluidRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
+import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityMonitor.java b/src/java/cr0s/warpdrive/machines/TileEntityMonitor.java
index 299df34e..108be487 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityMonitor.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityMonitor.java
@@ -6,8 +6,8 @@ import li.cil.oc.api.machine.Context;
 import net.minecraft.nbt.NBTTagCompound;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
+import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityPowerLaser.java b/src/java/cr0s/warpdrive/machines/TileEntityPowerLaser.java
index e30efb9b..04fea030 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityPowerLaser.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityPowerLaser.java
@@ -3,10 +3,10 @@ package cr0s.warpdrive.machines;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.IBlockUpdateDetector;
 import cr0s.warpdrive.data.Vector3;
+import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
diff --git a/src/java/cr0s/warpdrive/machines/TileEntityShipScanner.java b/src/java/cr0s/warpdrive/machines/TileEntityShipScanner.java
index d41310bc..7e6be4fc 100644
--- a/src/java/cr0s/warpdrive/machines/TileEntityShipScanner.java
+++ b/src/java/cr0s/warpdrive/machines/TileEntityShipScanner.java
@@ -22,11 +22,11 @@ import net.minecraft.util.MathHelper;
 import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.WarpDriveConfig;
 import cr0s.warpdrive.data.JumpBlock;
 import cr0s.warpdrive.data.Vector3;
+import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 
diff --git a/src/java/cr0s/warpdrive/render/EntityCamera.java b/src/java/cr0s/warpdrive/render/EntityCamera.java
index 89ef142c..754b98e1 100644
--- a/src/java/cr0s/warpdrive/render/EntityCamera.java
+++ b/src/java/cr0s/warpdrive/render/EntityCamera.java
@@ -15,8 +15,8 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import cr0s.warpdrive.PacketHandler;
 import cr0s.warpdrive.WarpDrive;
+import cr0s.warpdrive.network.PacketHandler;
 
 public final class EntityCamera extends EntityLivingBase
 {