diff --git a/common/buildcraft/transport/EntityData.java b/common/buildcraft/transport/EntityData.java
index ba945314..4474a5ae 100644
--- a/common/buildcraft/transport/EntityData.java
+++ b/common/buildcraft/transport/EntityData.java
@@ -1,6 +1,5 @@
 package buildcraft.transport;
 
-import buildcraft.api.transport.IPipedItem;
 import buildcraft.core.utils.EnumColor;
 import java.util.EnumSet;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/common/buildcraft/core/EntityPassiveItem.java b/common/buildcraft/transport/EntityPassiveItem.java
similarity index 99%
rename from common/buildcraft/core/EntityPassiveItem.java
rename to common/buildcraft/transport/EntityPassiveItem.java
index 24f54cf5..0224adf6 100644
--- a/common/buildcraft/core/EntityPassiveItem.java
+++ b/common/buildcraft/transport/EntityPassiveItem.java
@@ -7,12 +7,11 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.core;
+package buildcraft.transport;
 
 import buildcraft.BuildCraftCore;
 import buildcraft.api.core.Position;
 import buildcraft.api.transport.IPassiveItemContribution;
-import buildcraft.api.transport.IPipedItem;
 import buildcraft.core.proxy.CoreProxy;
 import java.util.TreeMap;
 import net.minecraft.entity.item.EntityItem;
diff --git a/common/buildcraft/transport/IPipeTransportItemsHook.java b/common/buildcraft/transport/IPipeTransportItemsHook.java
index c1666d60..d3e73464 100644
--- a/common/buildcraft/transport/IPipeTransportItemsHook.java
+++ b/common/buildcraft/transport/IPipeTransportItemsHook.java
@@ -10,7 +10,6 @@
 package buildcraft.transport;
 
 import buildcraft.api.core.Position;
-import buildcraft.api.transport.IPipedItem;
 import java.util.LinkedList;
 import net.minecraftforge.common.ForgeDirection;
 
diff --git a/common/buildcraft/api/transport/IPipedItem.java b/common/buildcraft/transport/IPipedItem.java
similarity index 95%
rename from common/buildcraft/api/transport/IPipedItem.java
rename to common/buildcraft/transport/IPipedItem.java
index bbb853e3..d0d74343 100644
--- a/common/buildcraft/api/transport/IPipedItem.java
+++ b/common/buildcraft/transport/IPipedItem.java
@@ -1,6 +1,7 @@
-package buildcraft.api.transport;
+package buildcraft.transport;
 
 import buildcraft.api.core.Position;
+import buildcraft.api.transport.IPassiveItemContribution;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java
index e48a6c33..92b1913a 100644
--- a/common/buildcraft/transport/PipeTransportItems.java
+++ b/common/buildcraft/transport/PipeTransportItems.java
@@ -13,9 +13,7 @@ import buildcraft.api.core.Position;
 import buildcraft.api.gates.ITrigger;
 import buildcraft.api.inventory.ISpecialInventory;
 import buildcraft.api.transport.IPipeTile.PipeType;
-import buildcraft.api.transport.IPipedItem;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.EntityPassiveItem;
 import buildcraft.core.IMachine;
 import buildcraft.core.inventory.Transactor;
 import buildcraft.core.network.PacketIds;
diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java
index 9ef7fb10..cef080ad 100644
--- a/common/buildcraft/transport/TileGenericPipe.java
+++ b/common/buildcraft/transport/TileGenericPipe.java
@@ -21,7 +21,6 @@ import buildcraft.api.transport.IPipe;
 import buildcraft.api.transport.IPipeTile;
 import buildcraft.api.transport.ISolidSideTile;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.EntityPassiveItem;
 import buildcraft.core.IDropControlInventory;
 import buildcraft.core.ITileBufferHolder;
 import buildcraft.core.TileBuffer;
diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java
index 77cff2ef..980a071b 100644
--- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java
+++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java
@@ -10,7 +10,7 @@ package buildcraft.transport.pipes;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.Position;
-import buildcraft.api.transport.IPipedItem;
+import buildcraft.transport.IPipedItem;
 import buildcraft.core.GuiIds;
 import buildcraft.core.inventory.SimpleInventory;
 import buildcraft.core.network.IClientState;
diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java
index 5e69f9a6..2b905e81 100644
--- a/common/buildcraft/transport/pipes/PipeItemsGold.java
+++ b/common/buildcraft/transport/pipes/PipeItemsGold.java
@@ -10,7 +10,7 @@ package buildcraft.transport.pipes;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.Position;
-import buildcraft.api.transport.IPipedItem;
+import buildcraft.transport.IPipedItem;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.IPipeTransportItemsHook;
 import buildcraft.transport.Pipe;
diff --git a/common/buildcraft/transport/pipes/PipeItemsLapis.java b/common/buildcraft/transport/pipes/PipeItemsLapis.java
index 5819deee..a11a1015 100644
--- a/common/buildcraft/transport/pipes/PipeItemsLapis.java
+++ b/common/buildcraft/transport/pipes/PipeItemsLapis.java
@@ -12,7 +12,7 @@ import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.Position;
 import buildcraft.api.gates.IAction;
 import buildcraft.api.tools.IToolWrench;
-import buildcraft.api.transport.IPipedItem;
+import buildcraft.transport.IPipedItem;
 import buildcraft.core.utils.EnumColor;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.EntityData;
diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java
index ef35a65f..92357cc4 100644
--- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java
+++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java
@@ -14,8 +14,8 @@ import buildcraft.api.power.IPowerReceptor;
 import buildcraft.api.power.PowerHandler;
 import buildcraft.api.power.PowerHandler.PowerReceiver;
 import buildcraft.api.power.PowerHandler.Type;
-import buildcraft.api.transport.IPipedItem;
-import buildcraft.core.EntityPassiveItem;
+import buildcraft.transport.IPipedItem;
+import buildcraft.transport.EntityPassiveItem;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.Pipe;
diff --git a/common/buildcraft/transport/pipes/PipeItemsQuartz.java b/common/buildcraft/transport/pipes/PipeItemsQuartz.java
index 514c23a1..f91d7061 100644
--- a/common/buildcraft/transport/pipes/PipeItemsQuartz.java
+++ b/common/buildcraft/transport/pipes/PipeItemsQuartz.java
@@ -10,7 +10,7 @@ package buildcraft.transport.pipes;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.Position;
-import buildcraft.api.transport.IPipedItem;
+import buildcraft.transport.IPipedItem;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.IPipeTransportItemsHook;
 import buildcraft.transport.Pipe;
diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java
index 0bcb1974..ec7a68c6 100644
--- a/common/buildcraft/transport/pipes/PipeItemsStone.java
+++ b/common/buildcraft/transport/pipes/PipeItemsStone.java
@@ -10,7 +10,7 @@ package buildcraft.transport.pipes;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.Position;
-import buildcraft.api.transport.IPipedItem;
+import buildcraft.transport.IPipedItem;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.IPipeTransportItemsHook;
 import buildcraft.transport.Pipe;
diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java
index 334c6e4b..e9dd50bc 100644
--- a/common/buildcraft/transport/pipes/PipeItemsWood.java
+++ b/common/buildcraft/transport/pipes/PipeItemsWood.java
@@ -15,9 +15,9 @@ import buildcraft.api.power.IPowerReceptor;
 import buildcraft.api.power.PowerHandler;
 import buildcraft.api.power.PowerHandler.PowerReceiver;
 import buildcraft.api.power.PowerHandler.Type;
-import buildcraft.api.transport.IPipedItem;
+import buildcraft.transport.IPipedItem;
 import buildcraft.api.transport.PipeManager;
-import buildcraft.core.EntityPassiveItem;
+import buildcraft.transport.EntityPassiveItem;
 import buildcraft.core.inventory.InventoryWrapper;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.Pipe;
diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java
index 14e26af3..1c6592ed 100644
--- a/common/buildcraft/transport/render/RenderPipe.java
+++ b/common/buildcraft/transport/render/RenderPipe.java
@@ -10,7 +10,7 @@ package buildcraft.transport.render;
 import buildcraft.BuildCraftCore;
 import buildcraft.BuildCraftCore.RenderMode;
 import buildcraft.BuildCraftTransport;
-import buildcraft.api.transport.IPipedItem;
+import buildcraft.transport.IPipedItem;
 import buildcraft.core.render.RenderEntityBlock;
 import buildcraft.core.render.RenderEntityBlock.BlockInterface;
 import buildcraft.core.utils.EnumColor;