diff --git a/src/main/java/appeng/client/me/FluidRepo.java b/src/main/java/appeng/client/me/FluidRepo.java
index 1fb622d3d..f8b72779a 100644
--- a/src/main/java/appeng/client/me/FluidRepo.java
+++ b/src/main/java/appeng/client/me/FluidRepo.java
@@ -37,7 +37,7 @@ import appeng.api.storage.data.IItemList;
 import appeng.client.gui.widgets.IScrollSource;
 import appeng.client.gui.widgets.ISortSource;
 import appeng.core.AEConfig;
-import appeng.util.FluidSorters;
+import appeng.fluids.util.FluidSorters;
 import appeng.util.Platform;
 import appeng.util.prioritylist.IPartitionList;
 
diff --git a/src/main/java/appeng/core/api/ApiStorage.java b/src/main/java/appeng/core/api/ApiStorage.java
index b60fd18a7..f8c4e410d 100644
--- a/src/main/java/appeng/core/api/ApiStorage.java
+++ b/src/main/java/appeng/core/api/ApiStorage.java
@@ -47,10 +47,10 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.crafting.CraftingLink;
+import appeng.fluids.util.AEFluidStack;
+import appeng.fluids.util.FluidList;
 import appeng.util.Platform;
-import appeng.util.item.AEFluidStack;
 import appeng.util.item.AEItemStack;
-import appeng.util.item.FluidList;
 import appeng.util.item.ItemList;
 
 
diff --git a/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java
index cdacdb7dd..b82628214 100644
--- a/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java
+++ b/src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java
@@ -44,7 +44,7 @@ import appeng.core.AELog;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.fluids.client.gui.GuiFluidTerminal;
-import appeng.util.item.AEFluidStack;
+import appeng.fluids.util.AEFluidStack;
 
 
 /**
diff --git a/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java b/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java
index ac0360fa0..017e18338 100644
--- a/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java
+++ b/src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java
@@ -28,7 +28,7 @@ import appeng.core.AELog;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.fluids.container.ContainerFluidTerminal;
-import appeng.util.item.AEFluidStack;
+import appeng.fluids.util.AEFluidStack;
 
 
 /**
diff --git a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java
index c6f17196e..19451e5f2 100644
--- a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java
+++ b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java
@@ -64,12 +64,12 @@ import appeng.core.sync.packets.PacketMEFluidInventoryUpdate;
 import appeng.core.sync.packets.PacketTargetFluidStack;
 import appeng.core.sync.packets.PacketValueConfig;
 import appeng.fluids.parts.PartFluidTerminal;
+import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.InventoryAction;
 import appeng.me.helpers.ChannelPowerSrc;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
-import appeng.util.item.AEFluidStack;
 
 
 /**
diff --git a/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java b/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java
index 67de8eba9..ad531097b 100644
--- a/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java
+++ b/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java
@@ -41,10 +41,10 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
+import appeng.fluids.util.AEFluidStack;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
-import appeng.util.item.AEFluidStack;
 
 
 /**
diff --git a/src/main/java/appeng/fluids/parts/PartFluidExportBus.java b/src/main/java/appeng/fluids/parts/PartFluidExportBus.java
index ca469f094..64f5085cf 100644
--- a/src/main/java/appeng/fluids/parts/PartFluidExportBus.java
+++ b/src/main/java/appeng/fluids/parts/PartFluidExportBus.java
@@ -47,11 +47,11 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
+import appeng.fluids.util.AEFluidStack;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.parts.PartModel;
-import appeng.util.item.AEFluidStack;
 
 
 /**
diff --git a/src/main/java/appeng/fluids/parts/PartFluidImportBus.java b/src/main/java/appeng/fluids/parts/PartFluidImportBus.java
index f643a902b..97a914ce5 100644
--- a/src/main/java/appeng/fluids/parts/PartFluidImportBus.java
+++ b/src/main/java/appeng/fluids/parts/PartFluidImportBus.java
@@ -47,11 +47,11 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
+import appeng.fluids.util.AEFluidStack;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.parts.PartModel;
-import appeng.util.item.AEFluidStack;
 
 
 /**
diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
index 0a7a6650e..dd8b90b52 100644
--- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
+++ b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
@@ -71,6 +71,7 @@ import appeng.capabilities.Capabilities;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
 import appeng.core.sync.GuiBridge;
+import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.IInterfaceHost;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
@@ -82,7 +83,6 @@ import appeng.parts.misc.PartSharedStorageBus;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.util.Platform;
 import appeng.util.inv.InvOperation;
-import appeng.util.item.AEFluidStack;
 import appeng.util.prioritylist.FuzzyPriorityList;
 import appeng.util.prioritylist.PrecisePriorityList;
 
diff --git a/src/main/java/appeng/fluids/storage/FluidCellInventory.java b/src/main/java/appeng/fluids/storage/FluidCellInventory.java
index 2bd514331..f187a0dc6 100644
--- a/src/main/java/appeng/fluids/storage/FluidCellInventory.java
+++ b/src/main/java/appeng/fluids/storage/FluidCellInventory.java
@@ -36,8 +36,8 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.AEConfig;
 import appeng.core.AELog;
+import appeng.fluids.util.AEFluidStack;
 import appeng.me.storage.AbstractCellInventory;
-import appeng.util.item.AEFluidStack;
 
 
 /**
diff --git a/src/main/java/appeng/fluids/storage/FluidCellInventoryHandler.java b/src/main/java/appeng/fluids/storage/FluidCellInventoryHandler.java
index a45953c93..49d6092a3 100644
--- a/src/main/java/appeng/fluids/storage/FluidCellInventoryHandler.java
+++ b/src/main/java/appeng/fluids/storage/FluidCellInventoryHandler.java
@@ -27,8 +27,8 @@ import appeng.api.storage.IMEInventory;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.fluids.items.FluidDummyItem;
+import appeng.fluids.util.AEFluidStack;
 import appeng.me.storage.AbstractCellInventoryHandler;
-import appeng.util.item.AEFluidStack;
 
 
 public class FluidCellInventoryHandler extends AbstractCellInventoryHandler<IAEFluidStack>
diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/fluids/util/AEFluidStack.java
similarity index 99%
rename from src/main/java/appeng/util/item/AEFluidStack.java
rename to src/main/java/appeng/fluids/util/AEFluidStack.java
index 282378010..bb0980ba8 100644
--- a/src/main/java/appeng/util/item/AEFluidStack.java
+++ b/src/main/java/appeng/fluids/util/AEFluidStack.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.item;
+package appeng.fluids.util;
 
 
 import java.io.ByteArrayInputStream;
@@ -42,6 +42,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.util.Platform;
+import appeng.util.item.AEStack;
 
 
 public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFluidStack, Comparable<AEFluidStack>
diff --git a/src/main/java/appeng/util/item/FluidList.java b/src/main/java/appeng/fluids/util/FluidList.java
similarity index 99%
rename from src/main/java/appeng/util/item/FluidList.java
rename to src/main/java/appeng/fluids/util/FluidList.java
index 4bef3aeff..bc3ffaf3e 100644
--- a/src/main/java/appeng/util/item/FluidList.java
+++ b/src/main/java/appeng/fluids/util/FluidList.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.item;
+package appeng.fluids.util;
 
 
 import java.util.Collection;
diff --git a/src/main/java/appeng/util/FluidSorters.java b/src/main/java/appeng/fluids/util/FluidSorters.java
similarity index 98%
rename from src/main/java/appeng/util/FluidSorters.java
rename to src/main/java/appeng/fluids/util/FluidSorters.java
index cb8284859..ec98c7b58 100644
--- a/src/main/java/appeng/util/FluidSorters.java
+++ b/src/main/java/appeng/fluids/util/FluidSorters.java
@@ -16,14 +16,14 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util;
+package appeng.fluids.util;
 
 
 import java.util.Comparator;
 
 import appeng.api.config.SortDir;
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.util.item.AEFluidStack;
+import appeng.util.Platform;
 
 
 /**
diff --git a/src/main/java/appeng/util/item/MeaningfulFluidIterator.java b/src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java
similarity index 98%
rename from src/main/java/appeng/util/item/MeaningfulFluidIterator.java
rename to src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java
index 768fdbb46..b92e7f6bc 100644
--- a/src/main/java/appeng/util/item/MeaningfulFluidIterator.java
+++ b/src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.item;
+package appeng.fluids.util;
 
 
 import java.util.Iterator;
diff --git a/src/main/java/appeng/tile/misc/CondenserFluidInventory.java b/src/main/java/appeng/tile/misc/CondenserFluidInventory.java
index 2419baf1e..28bbcc3a2 100644
--- a/src/main/java/appeng/tile/misc/CondenserFluidInventory.java
+++ b/src/main/java/appeng/tile/misc/CondenserFluidInventory.java
@@ -29,7 +29,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
-import appeng.util.item.FluidList;
+import appeng.fluids.util.FluidList;
 
 
 class CondenserFluidInventory implements IMEMonitor<IAEFluidStack>
diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java
index b0b945b25..5b8c96ab0 100644
--- a/src/main/java/appeng/tile/storage/TileChest.java
+++ b/src/main/java/appeng/tile/storage/TileChest.java
@@ -85,6 +85,7 @@ import appeng.api.storage.data.IAEStack;
 import appeng.api.util.AEColor;
 import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
+import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.IPriorityHost;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MEMonitorHandler;
@@ -99,7 +100,6 @@ import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperChainedItemHandler;
 import appeng.util.inv.filter.IAEItemFilter;
-import appeng.util.item.AEFluidStack;
 
 
 public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, ITickable
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
index c8e6ea523..f17c6a46d 100644
--- a/src/main/java/appeng/util/Platform.java
+++ b/src/main/java/appeng/util/Platform.java
@@ -116,6 +116,7 @@ import appeng.core.features.AEFeature;
 import appeng.core.stats.Stats;
 import appeng.core.sync.GuiBridge;
 import appeng.core.sync.GuiHostType;
+import appeng.fluids.util.AEFluidStack;
 import appeng.hooks.TickHandler;
 import appeng.integration.Integrations;
 import appeng.me.GridAccessException;
@@ -123,7 +124,6 @@ import appeng.me.GridNode;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.util.helpers.ItemComparisonHelper;
 import appeng.util.helpers.P2PHelper;
-import appeng.util.item.AEFluidStack;
 import appeng.util.item.AEItemStack;
 import appeng.util.prioritylist.IPartitionList;
 
diff --git a/src/main/java/appeng/util/item/AEStack.java b/src/main/java/appeng/util/item/AEStack.java
index 569d02df0..f2b42351d 100644
--- a/src/main/java/appeng/util/item/AEStack.java
+++ b/src/main/java/appeng/util/item/AEStack.java
@@ -31,7 +31,7 @@ public abstract class AEStack<StackType extends IAEStack<StackType>> implements
 	private long stackSize;
 	private long countRequestable;
 
-	static long getPacketValue( final byte type, final ByteBuf tag )
+	protected static long getPacketValue( final byte type, final ByteBuf tag )
 	{
 		if( type == 0 )
 		{
@@ -162,7 +162,7 @@ public abstract class AEStack<StackType extends IAEStack<StackType>> implements
 		}
 	}
 
-	abstract boolean hasTagCompound();
+	protected abstract boolean hasTagCompound();
 
 	protected void putPacketValue( final ByteBuf tag, final long num )
 	{