diff --git a/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java b/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java
index f1ceec51..afd22c9d 100644
--- a/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java
+++ b/buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java
@@ -13,9 +13,9 @@ import net.minecraft.src.Item;
 import net.minecraft.src.ItemBlock;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.RenderBlocks;
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.IPipe.WireColor;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
+import net.minecraft.src.buildcraft.api.transport.IPipe.WireColor;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.MinecraftForgeClient;
diff --git a/common/net/minecraft/src/BuildCraftTransport.java b/common/net/minecraft/src/BuildCraftTransport.java
index 2099fe6c..19a01933 100644
--- a/common/net/minecraft/src/BuildCraftTransport.java
+++ b/common/net/minecraft/src/BuildCraftTransport.java
@@ -14,11 +14,11 @@ import java.util.List;
 import java.util.ListIterator;
 
 import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.gates.Action;
 import net.minecraft.src.buildcraft.api.gates.ActionManager;
 import net.minecraft.src.buildcraft.api.gates.Trigger;
 import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 import net.minecraft.src.buildcraft.core.CoreProxy;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.ItemBuildCraft;
diff --git a/common/net/minecraft/src/buildcraft/api/gates/ActionManager.java b/common/net/minecraft/src/buildcraft/api/gates/ActionManager.java
index f4d3a137..964e303e 100644
--- a/common/net/minecraft/src/buildcraft/api/gates/ActionManager.java
+++ b/common/net/minecraft/src/buildcraft/api/gates/ActionManager.java
@@ -4,7 +4,7 @@ import java.util.LinkedList;
 
 import net.minecraft.src.Block;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IPipe;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 
 public class ActionManager {
 
diff --git a/common/net/minecraft/src/buildcraft/api/gates/ITriggerProvider.java b/common/net/minecraft/src/buildcraft/api/gates/ITriggerProvider.java
index bd83dc47..ddbf21e3 100644
--- a/common/net/minecraft/src/buildcraft/api/gates/ITriggerProvider.java
+++ b/common/net/minecraft/src/buildcraft/api/gates/ITriggerProvider.java
@@ -13,7 +13,7 @@ import java.util.LinkedList;
 
 import net.minecraft.src.Block;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IPipe;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 
 public interface ITriggerProvider {
 
diff --git a/common/net/minecraft/src/buildcraft/api/IPassiveItemContribution.java b/common/net/minecraft/src/buildcraft/api/transport/IPassiveItemContribution.java
similarity index 90%
rename from common/net/minecraft/src/buildcraft/api/IPassiveItemContribution.java
rename to common/net/minecraft/src/buildcraft/api/transport/IPassiveItemContribution.java
index 049f44ec..840a93cf 100644
--- a/common/net/minecraft/src/buildcraft/api/IPassiveItemContribution.java
+++ b/common/net/minecraft/src/buildcraft/api/transport/IPassiveItemContribution.java
@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.transport;
 
 import net.minecraft.src.NBTTagCompound;
 
diff --git a/common/net/minecraft/src/buildcraft/api/IPipe.java b/common/net/minecraft/src/buildcraft/api/transport/IPipe.java
similarity index 94%
rename from common/net/minecraft/src/buildcraft/api/IPipe.java
rename to common/net/minecraft/src/buildcraft/api/transport/IPipe.java
index 328635b1..3e3cfa99 100644
--- a/common/net/minecraft/src/buildcraft/api/IPipe.java
+++ b/common/net/minecraft/src/buildcraft/api/transport/IPipe.java
@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.transport;
 
 import net.minecraft.src.TileEntity;
 
diff --git a/common/net/minecraft/src/buildcraft/api/IPipeConnection.java b/common/net/minecraft/src/buildcraft/api/transport/IPipeConnection.java
similarity index 77%
rename from common/net/minecraft/src/buildcraft/api/IPipeConnection.java
rename to common/net/minecraft/src/buildcraft/api/transport/IPipeConnection.java
index 8b2a5c88..53c2e043 100644
--- a/common/net/minecraft/src/buildcraft/api/IPipeConnection.java
+++ b/common/net/minecraft/src/buildcraft/api/transport/IPipeConnection.java
@@ -7,7 +7,9 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.transport;
+
+import net.minecraft.src.buildcraft.api.Orientations;
 
 public interface IPipeConnection {
 
diff --git a/common/net/minecraft/src/buildcraft/api/IPipeEntry.java b/common/net/minecraft/src/buildcraft/api/transport/IPipeEntry.java
similarity index 82%
rename from common/net/minecraft/src/buildcraft/api/IPipeEntry.java
rename to common/net/minecraft/src/buildcraft/api/transport/IPipeEntry.java
index 99653391..c7b59894 100644
--- a/common/net/minecraft/src/buildcraft/api/IPipeEntry.java
+++ b/common/net/minecraft/src/buildcraft/api/transport/IPipeEntry.java
@@ -7,9 +7,9 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.transport;
 
-import net.minecraft.src.buildcraft.api.transport.IPipedItem;
+import net.minecraft.src.buildcraft.api.Orientations;
 
 /**
  * Interface used to put objects into pipes, implemented by pipe tile entities.
diff --git a/common/net/minecraft/src/buildcraft/api/IPipeTile.java b/common/net/minecraft/src/buildcraft/api/transport/IPipeTile.java
similarity index 85%
rename from common/net/minecraft/src/buildcraft/api/IPipeTile.java
rename to common/net/minecraft/src/buildcraft/api/transport/IPipeTile.java
index bb6d025e..3823bd62 100644
--- a/common/net/minecraft/src/buildcraft/api/IPipeTile.java
+++ b/common/net/minecraft/src/buildcraft/api/transport/IPipeTile.java
@@ -1,17 +1,18 @@
-/** 
- * Copyright (c) SpaceToad, 2011
- * http://www.mod-buildcraft.com
- * 
- * BuildCraft is distributed under the terms of the Minecraft Mod Public 
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
- */
-
-package net.minecraft.src.buildcraft.api;
-
-public interface IPipeTile {
-
-	IPipe getPipe();
-
-	boolean isInitialized();
-}
+/** 
+ * Copyright (c) SpaceToad, 2011
+ * http://www.mod-buildcraft.com
+ * 
+ * BuildCraft is distributed under the terms of the Minecraft Mod Public 
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ */
+
+package net.minecraft.src.buildcraft.api.transport;
+
+
+public interface IPipeTile {
+
+	IPipe getPipe();
+
+	boolean isInitialized();
+}
diff --git a/common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java b/common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java
index 811a3a7c..9d5a4b82 100644
--- a/common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java
+++ b/common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java
@@ -5,7 +5,6 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.IPassiveItemContribution;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.SafeTimeTracker;
diff --git a/common/net/minecraft/src/buildcraft/api/transport/PipeManager.java b/common/net/minecraft/src/buildcraft/api/transport/PipeManager.java
new file mode 100644
index 00000000..8696740c
--- /dev/null
+++ b/common/net/minecraft/src/buildcraft/api/transport/PipeManager.java
@@ -0,0 +1,11 @@
+package net.minecraft.src.buildcraft.api.transport;
+
+import java.util.TreeMap;
+
+import net.minecraft.src.buildcraft.core.EntityPassiveItem;
+
+public class PipeManager {
+
+	public static TreeMap<Integer, EntityPassiveItem> allEntities = new TreeMap<Integer, EntityPassiveItem>();
+
+}
diff --git a/common/net/minecraft/src/buildcraft/core/DefaultTriggerProvider.java b/common/net/minecraft/src/buildcraft/core/DefaultTriggerProvider.java
index 7530044b..8b716f5c 100644
--- a/common/net/minecraft/src/buildcraft/core/DefaultTriggerProvider.java
+++ b/common/net/minecraft/src/buildcraft/core/DefaultTriggerProvider.java
@@ -11,7 +11,7 @@ import net.minecraft.src.buildcraft.api.gates.ITrigger;
 import net.minecraft.src.buildcraft.api.gates.ITriggerProvider;
 import net.minecraft.src.buildcraft.api.gates.Trigger;
 import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
-import net.minecraft.src.buildcraft.api.IPipe;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 
 public class DefaultTriggerProvider implements ITriggerProvider {
 
diff --git a/common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java b/common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java
index acef563c..a27185eb 100644
--- a/common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java
+++ b/common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java
@@ -20,17 +20,16 @@ import net.minecraft.src.NBTTagList;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IPassiveItemContribution;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.transport.IPassiveItemContribution;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;
+import net.minecraft.src.buildcraft.api.transport.PipeManager;
 
 public class EntityPassiveItem implements IPipedItem {
 
 	private static TreeMap<String, IPassiveItemContribution> contributions = new TreeMap<String, IPassiveItemContribution>();
-	public static TreeMap<Integer, EntityPassiveItem> allEntities = new TreeMap<Integer, EntityPassiveItem>();
-
 	protected static int maxId = 0;
 	protected World worldObj;
 
@@ -53,7 +52,7 @@ public class EntityPassiveItem implements IPipedItem {
 
 	public EntityPassiveItem(World world, int id) {
 		setEntityId(id);
-		allEntities.put(getEntityId(), this);
+		PipeManager.allEntities.put(getEntityId(), this);
 		worldObj = world;
 	}
 
@@ -70,8 +69,8 @@ public class EntityPassiveItem implements IPipedItem {
 
 	/* CREATING & CACHING */
 	public static IPipedItem getOrCreate(World world, int id) {
-		if (allEntities.containsKey(id)) {
-			return allEntities.get(id);
+		if (PipeManager.allEntities.containsKey(id)) {
+			return PipeManager.allEntities.get(id);
 		} else {
 			return new EntityPassiveItem(world, id);
 		}
@@ -82,8 +81,8 @@ public class EntityPassiveItem implements IPipedItem {
 	 */
 	@Override
 	public void remove() {
-		if (allEntities.containsKey(getEntityId())) {
-			allEntities.remove(getEntityId());
+		if (PipeManager.allEntities.containsKey(getEntityId())) {
+			PipeManager.allEntities.remove(getEntityId());
 		}
 	}
 
diff --git a/common/net/minecraft/src/buildcraft/core/Utils.java b/common/net/minecraft/src/buildcraft/core/Utils.java
index 50bb5ba9..87fa7aa6 100644
--- a/common/net/minecraft/src/buildcraft/core/Utils.java
+++ b/common/net/minecraft/src/buildcraft/core/Utils.java
@@ -26,12 +26,12 @@ import net.minecraft.src.TileEntityChest;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.api.IAreaProvider;
-import net.minecraft.src.buildcraft.api.IPipeConnection;
-import net.minecraft.src.buildcraft.api.IPipeEntry;
 import net.minecraft.src.buildcraft.api.LaserKind;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.liquids.ILiquid;
+import net.minecraft.src.buildcraft.api.transport.IPipeConnection;
+import net.minecraft.src.buildcraft.api.transport.IPipeEntry;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;
 import net.minecraft.src.buildcraft.core.network.ISynchronizedTile;
 import net.minecraft.src.buildcraft.core.network.PacketUpdate;
diff --git a/common/net/minecraft/src/buildcraft/energy/TileEngine.java b/common/net/minecraft/src/buildcraft/energy/TileEngine.java
index 8f3aa466..2206f564 100644
--- a/common/net/minecraft/src/buildcraft/energy/TileEngine.java
+++ b/common/net/minecraft/src/buildcraft/energy/TileEngine.java
@@ -20,7 +20,6 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IPipeConnection;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.gates.IOverrideDefaultTriggers;
@@ -34,6 +33,7 @@ import net.minecraft.src.buildcraft.api.power.IPowerProvider;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
 import net.minecraft.src.buildcraft.api.power.PowerFramework;
 import net.minecraft.src.buildcraft.api.power.PowerProvider;
+import net.minecraft.src.buildcraft.api.transport.IPipeConnection;
 import net.minecraft.src.buildcraft.core.IBuilderInventory;
 import net.minecraft.src.buildcraft.core.TileBuildCraft;
 import net.minecraft.src.buildcraft.core.network.PacketUpdate;
diff --git a/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java b/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java
index ee3156d9..267e82a7 100644
--- a/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java
+++ b/common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java
@@ -12,9 +12,9 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.mod_BuildCraftSilicon;
-import net.minecraft.src.buildcraft.api.IPipeConnection;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe;
+import net.minecraft.src.buildcraft.api.transport.IPipeConnection;
 import net.minecraft.src.buildcraft.core.CoreProxy;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.IMachine;
diff --git a/common/net/minecraft/src/buildcraft/factory/TileMiningWell.java b/common/net/minecraft/src/buildcraft/factory/TileMiningWell.java
index 4169c0e3..9872092c 100644
--- a/common/net/minecraft/src/buildcraft/factory/TileMiningWell.java
+++ b/common/net/minecraft/src/buildcraft/factory/TileMiningWell.java
@@ -17,12 +17,12 @@ import net.minecraft.src.BuildCraftFactory;
 import net.minecraft.src.EntityItem;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.IPipeConnection;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.power.IPowerProvider;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
 import net.minecraft.src.buildcraft.api.power.PowerFramework;
 import net.minecraft.src.buildcraft.api.power.PowerProvider;
+import net.minecraft.src.buildcraft.api.transport.IPipeConnection;
 import net.minecraft.src.buildcraft.core.IMachine;
 import net.minecraft.src.buildcraft.core.StackUtil;
 import net.minecraft.src.buildcraft.core.Utils;
diff --git a/common/net/minecraft/src/buildcraft/factory/TileQuarry.java b/common/net/minecraft/src/buildcraft/factory/TileQuarry.java
index cd19807b..af8fcc30 100644
--- a/common/net/minecraft/src/buildcraft/factory/TileQuarry.java
+++ b/common/net/minecraft/src/buildcraft/factory/TileQuarry.java
@@ -23,13 +23,13 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.api.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.IAreaProvider;
-import net.minecraft.src.buildcraft.api.IPipeConnection;
 import net.minecraft.src.buildcraft.api.LaserKind;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.power.IPowerProvider;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
 import net.minecraft.src.buildcraft.api.power.PowerFramework;
 import net.minecraft.src.buildcraft.api.power.PowerProvider;
+import net.minecraft.src.buildcraft.api.transport.IPipeConnection;
 import net.minecraft.src.buildcraft.core.Box;
 import net.minecraft.src.buildcraft.core.BptBlueprint;
 import net.minecraft.src.buildcraft.core.BptBuilderBase;
diff --git a/common/net/minecraft/src/buildcraft/transport/ActionSignalOutput.java b/common/net/minecraft/src/buildcraft/transport/ActionSignalOutput.java
index ebd441e8..01899b8f 100644
--- a/common/net/minecraft/src/buildcraft/transport/ActionSignalOutput.java
+++ b/common/net/minecraft/src/buildcraft/transport/ActionSignalOutput.java
@@ -9,8 +9,8 @@
 
 package net.minecraft.src.buildcraft.transport;
 
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.gates.Action;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class ActionSignalOutput extends Action {
diff --git a/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java b/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java
index a665c473..a518b4ad 100644
--- a/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java
+++ b/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java
@@ -27,8 +27,8 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.Vec3D;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 import net.minecraft.src.buildcraft.core.BlockIndex;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
diff --git a/common/net/minecraft/src/buildcraft/transport/GateVanilla.java b/common/net/minecraft/src/buildcraft/transport/GateVanilla.java
index 649ac15a..b4c12b7d 100644
--- a/common/net/minecraft/src/buildcraft/transport/GateVanilla.java
+++ b/common/net/minecraft/src/buildcraft/transport/GateVanilla.java
@@ -10,12 +10,12 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftTransport;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.gates.Action;
 import net.minecraft.src.buildcraft.api.gates.IAction;
 import net.minecraft.src.buildcraft.api.gates.ITrigger;
 import net.minecraft.src.buildcraft.api.gates.Trigger;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.buildcraft.core.Utils;
diff --git a/common/net/minecraft/src/buildcraft/transport/Pipe.java b/common/net/minecraft/src/buildcraft/transport/Pipe.java
index 0ecb0f63..1bf09ad8 100644
--- a/common/net/minecraft/src/buildcraft/transport/Pipe.java
+++ b/common/net/minecraft/src/buildcraft/transport/Pipe.java
@@ -24,7 +24,6 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.SafeTimeTracker;
 import net.minecraft.src.buildcraft.api.gates.Action;
@@ -35,6 +34,7 @@ import net.minecraft.src.buildcraft.api.gates.ITrigger;
 import net.minecraft.src.buildcraft.api.gates.ITriggerParameter;
 import net.minecraft.src.buildcraft.api.gates.Trigger;
 import net.minecraft.src.buildcraft.api.gates.TriggerParameter;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 import net.minecraft.src.buildcraft.core.ActionRedstoneOutput;
 import net.minecraft.src.buildcraft.core.IDropControlInventory;
 import net.minecraft.src.buildcraft.core.Utils;
diff --git a/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java b/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java
index 46ccae1e..2c6c5122 100644
--- a/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java
+++ b/common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java
@@ -13,10 +13,10 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.Item;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IPipeEntry;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;
+import net.minecraft.src.buildcraft.api.transport.IPipeEntry;
 
 public class PipeLogicIron extends PipeLogic {
 
diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java b/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java
index 3dde75a1..df3accc5 100644
--- a/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java
+++ b/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java
@@ -26,10 +26,10 @@ import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.mod_BuildCraftTransport;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IPipeEntry;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.gates.ITrigger;
+import net.minecraft.src.buildcraft.api.transport.IPipeEntry;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;
 import net.minecraft.src.buildcraft.core.CoreProxy;
 import net.minecraft.src.buildcraft.core.DefaultProps;
diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java b/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java
index 4edb8d71..337b9f54 100644
--- a/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java
+++ b/common/net/minecraft/src/buildcraft/transport/PipeTransportLiquids.java
@@ -15,7 +15,6 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.mod_BuildCraftCore;
 import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.IPipeEntry;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.SafeTimeTracker;
 import net.minecraft.src.buildcraft.api.gates.ITrigger;
@@ -23,6 +22,7 @@ import net.minecraft.src.buildcraft.api.liquids.ILiquidTank;
 import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
 import net.minecraft.src.buildcraft.api.liquids.LiquidTank;
+import net.minecraft.src.buildcraft.api.transport.IPipeEntry;
 import net.minecraft.src.buildcraft.core.CoreProxy;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.IMachine;
diff --git a/common/net/minecraft/src/buildcraft/transport/PipeTriggerProvider.java b/common/net/minecraft/src/buildcraft/transport/PipeTriggerProvider.java
index 964edf8e..f4d714e5 100644
--- a/common/net/minecraft/src/buildcraft/transport/PipeTriggerProvider.java
+++ b/common/net/minecraft/src/buildcraft/transport/PipeTriggerProvider.java
@@ -5,11 +5,11 @@ import java.util.LinkedList;
 import net.minecraft.src.Block;
 import net.minecraft.src.BuildCraftTransport;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.gates.IOverrideDefaultTriggers;
 import net.minecraft.src.buildcraft.api.gates.ITrigger;
 import net.minecraft.src.buildcraft.api.gates.ITriggerProvider;
 import net.minecraft.src.buildcraft.api.gates.Trigger;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 
 public class PipeTriggerProvider implements ITriggerProvider {
 
diff --git a/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java b/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
index a3ba8eff..7a80204b 100644
--- a/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
+++ b/common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
@@ -20,11 +20,6 @@ import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.mod_BuildCraftCore;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IPipe;
-import net.minecraft.src.buildcraft.api.IPipe.WireColor;
-import net.minecraft.src.buildcraft.api.IPipeConnection;
-import net.minecraft.src.buildcraft.api.IPipeEntry;
-import net.minecraft.src.buildcraft.api.IPipeTile;
 import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.SafeTimeTracker;
@@ -36,7 +31,12 @@ import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
 import net.minecraft.src.buildcraft.api.power.IPowerProvider;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
+import net.minecraft.src.buildcraft.api.transport.IPipeConnection;
+import net.minecraft.src.buildcraft.api.transport.IPipeEntry;
+import net.minecraft.src.buildcraft.api.transport.IPipeTile;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;
+import net.minecraft.src.buildcraft.api.transport.IPipe.WireColor;
 import net.minecraft.src.buildcraft.core.CoreProxy;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.IDropControlInventory;
diff --git a/common/net/minecraft/src/buildcraft/transport/TriggerPipeSignal.java b/common/net/minecraft/src/buildcraft/transport/TriggerPipeSignal.java
index 14d335d3..d833be26 100644
--- a/common/net/minecraft/src/buildcraft/transport/TriggerPipeSignal.java
+++ b/common/net/minecraft/src/buildcraft/transport/TriggerPipeSignal.java
@@ -9,9 +9,9 @@
 
 package net.minecraft.src.buildcraft.transport;
 
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.gates.ITriggerParameter;
 import net.minecraft.src.buildcraft.api.gates.Trigger;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class TriggerPipeSignal extends Trigger implements ITriggerPipe {
diff --git a/common/net/minecraft/src/buildcraft/transport/utils/WireMatrix.java b/common/net/minecraft/src/buildcraft/transport/utils/WireMatrix.java
index 76deb92b..6a5a530e 100644
--- a/common/net/minecraft/src/buildcraft/transport/utils/WireMatrix.java
+++ b/common/net/minecraft/src/buildcraft/transport/utils/WireMatrix.java
@@ -4,8 +4,8 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import net.minecraft.src.buildcraft.api.IPipe;
 import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.transport.IPipe;
 
 public class WireMatrix {