diff --git a/common/buildcraft/core/network/v2/IClientState.java b/common/buildcraft/core/network/IClientState.java
similarity index 93%
rename from common/buildcraft/core/network/v2/IClientState.java
rename to common/buildcraft/core/network/IClientState.java
index 9ec71c93..a4b93703 100644
--- a/common/buildcraft/core/network/v2/IClientState.java
+++ b/common/buildcraft/core/network/IClientState.java
@@ -1,4 +1,4 @@
-package buildcraft.core.network.v2;
+package buildcraft.core.network;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/common/buildcraft/core/network/v2/ISyncedTile.java b/common/buildcraft/core/network/ISyncedTile.java
similarity index 92%
rename from common/buildcraft/core/network/v2/ISyncedTile.java
rename to common/buildcraft/core/network/ISyncedTile.java
index e081bb87..2d23f1f9 100644
--- a/common/buildcraft/core/network/v2/ISyncedTile.java
+++ b/common/buildcraft/core/network/ISyncedTile.java
@@ -1,4 +1,4 @@
-package buildcraft.core.network.v2;
+package buildcraft.core.network;
 
 /**
  * Implemented by TileEntites
diff --git a/common/buildcraft/core/network/PacketHandler.java b/common/buildcraft/core/network/PacketHandler.java
index f07623a0..d0f5690b 100644
--- a/common/buildcraft/core/network/PacketHandler.java
+++ b/common/buildcraft/core/network/PacketHandler.java
@@ -8,8 +8,6 @@ import net.minecraft.src.NetworkManager;
 import net.minecraft.src.Packet250CustomPayload;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import buildcraft.core.network.v2.ISyncedTile;
-import buildcraft.core.network.v2.PacketTileState;
 import cpw.mods.fml.common.network.IPacketHandler;
 import cpw.mods.fml.common.network.Player;
 
diff --git a/common/buildcraft/core/network/v2/PacketTileState.java b/common/buildcraft/core/network/PacketTileState.java
similarity index 92%
rename from common/buildcraft/core/network/v2/PacketTileState.java
rename to common/buildcraft/core/network/PacketTileState.java
index a3b35f30..86f840de 100644
--- a/common/buildcraft/core/network/v2/PacketTileState.java
+++ b/common/buildcraft/core/network/PacketTileState.java
@@ -1,4 +1,4 @@
-package buildcraft.core.network.v2;
+package buildcraft.core.network;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -6,8 +6,6 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-import buildcraft.core.network.PacketCoordinates;
-import buildcraft.core.network.PacketIds;
 
 public class PacketTileState extends PacketCoordinates {
 	
diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java
index d6902b8a..6add1d29 100644
--- a/common/buildcraft/transport/PipeRenderState.java
+++ b/common/buildcraft/transport/PipeRenderState.java
@@ -5,7 +5,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 import buildcraft.core.DefaultProps;
-import buildcraft.core.network.v2.IClientState;
+import buildcraft.core.network.IClientState;
 import buildcraft.transport.utils.ConnectionMatrix;
 import buildcraft.transport.utils.FacadeMatrix;
 import buildcraft.transport.utils.TextureMatrix;
diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java
index 1277145e..91034661 100644
--- a/common/buildcraft/transport/TileGenericPipe.java
+++ b/common/buildcraft/transport/TileGenericPipe.java
@@ -36,9 +36,9 @@ import buildcraft.core.EntityPassiveItem;
 import buildcraft.core.IDropControlInventory;
 import buildcraft.core.ITileBufferHolder;
 import buildcraft.core.TileBuffer;
-import buildcraft.core.network.v2.IClientState;
-import buildcraft.core.network.v2.ISyncedTile;
-import buildcraft.core.network.v2.PacketTileState;
+import buildcraft.core.network.IClientState;
+import buildcraft.core.network.ISyncedTile;
+import buildcraft.core.network.PacketTileState;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.Gate.GateKind;
 import buildcraft.transport.network.PipeRenderStatePacket;