diff --git a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java b/src/main/java/appeng/block/misc/FluidInterfaceBlock.java
similarity index 94%
rename from src/main/java/appeng/fluids/block/FluidInterfaceBlock.java
rename to src/main/java/appeng/block/misc/FluidInterfaceBlock.java
index 443e56b47..92e873e4b 100644
--- a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java
+++ b/src/main/java/appeng/block/misc/FluidInterfaceBlock.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.block;
+package appeng.block.misc;
 
 import javax.annotation.Nullable;
 
@@ -33,8 +33,8 @@ import net.minecraft.world.World;
 import appeng.block.AEBaseTileBlock;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.tile.FluidInterfaceTileEntity;
+import appeng.container.implementations.FluidInterfaceContainer;
+import appeng.tile.misc.FluidInterfaceTileEntity;
 import appeng.util.Platform;
 
 public class FluidInterfaceBlock extends AEBaseTileBlock<FluidInterfaceTileEntity> {
diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java
index d0d6e11a9..709961313 100644
--- a/src/main/java/appeng/client/gui/AEBaseScreen.java
+++ b/src/main/java/appeng/client/gui/AEBaseScreen.java
@@ -70,6 +70,7 @@ import appeng.client.gui.widgets.Scrollbar;
 import appeng.client.me.InternalSlotME;
 import appeng.client.me.SlotDisconnected;
 import appeng.client.me.SlotME;
+import appeng.client.render.FluidStackSizeRenderer;
 import appeng.client.render.StackSizeRenderer;
 import appeng.container.AEBaseContainer;
 import appeng.container.slot.AppEngCraftingSlot;
@@ -78,6 +79,7 @@ import appeng.container.slot.AppEngSlot.CalculatedValidity;
 import appeng.container.slot.CraftingTermSlot;
 import appeng.container.slot.DisabledSlot;
 import appeng.container.slot.FakeSlot;
+import appeng.container.slot.IMEFluidSlot;
 import appeng.container.slot.IOptionalSlot;
 import appeng.container.slot.InaccessibleSlot;
 import appeng.container.slot.OutputSlot;
@@ -88,8 +90,6 @@ import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.InventoryActionPacket;
 import appeng.core.sync.packets.SwapSlotsPacket;
-import appeng.fluids.client.render.FluidStackSizeRenderer;
-import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 
 public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerScreen<T> {
diff --git a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java b/src/main/java/appeng/client/gui/implementations/FluidFormationPlaneScreen.java
similarity index 88%
rename from src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java
rename to src/main/java/appeng/client/gui/implementations/FluidFormationPlaneScreen.java
index 6ee197b30..4c91d8b27 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/FluidFormationPlaneScreen.java
@@ -1,19 +1,19 @@
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidFormationPlaneContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidFormationPlaneScreen extends UpgradeableScreen<FluidFormationPlaneContainer> {
     public FluidFormationPlaneScreen(FluidFormationPlaneContainer container, PlayerInventory playerInventory,
diff --git a/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java b/src/main/java/appeng/client/gui/implementations/FluidIOScreen.java
similarity index 89%
rename from src/main/java/appeng/fluids/client/gui/FluidIOScreen.java
rename to src/main/java/appeng/client/gui/implementations/FluidIOScreen.java
index 04e8f0003..9546ec411 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/FluidIOScreen.java
@@ -16,18 +16,18 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
+import appeng.container.implementations.FluidIOContainer;
 import appeng.core.localization.GuiText;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidIOContainer;
-import appeng.fluids.parts.FluidImportBusPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.FluidImportBusPart;
+import appeng.util.fluid.IAEFluidTank;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java b/src/main/java/appeng/client/gui/implementations/FluidInterfaceScreen.java
similarity index 92%
rename from src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java
rename to src/main/java/appeng/client/gui/implementations/FluidInterfaceScreen.java
index 7aac566ed..f5731b3b0 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/FluidInterfaceScreen.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -25,16 +25,16 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.FluidTankWidget;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.FluidTankWidget;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.helpers.DualityFluidInterface;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidInterfaceScreen extends UpgradeableScreen<FluidInterfaceContainer> {
     public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory,
diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/client/gui/implementations/FluidLevelEmitterScreen.java
similarity index 94%
rename from src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
rename to src/main/java/appeng/client/gui/implementations/FluidLevelEmitterScreen.java
index 33b09ea85..50ec7e23e 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/FluidLevelEmitterScreen.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -11,12 +11,12 @@ import appeng.api.config.Settings;
 import appeng.client.gui.NumberEntryType;
 import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
+import appeng.container.implementations.FluidLevelEmitterContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.container.FluidLevelEmitterContainer;
 
 public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitterContainer> {
 
diff --git a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java b/src/main/java/appeng/client/gui/implementations/FluidStorageBusScreen.java
similarity index 95%
rename from src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java
rename to src/main/java/appeng/client/gui/implementations/FluidStorageBusScreen.java
index b1a3f5294..c9e46c2a5 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/FluidStorageBusScreen.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -30,18 +30,18 @@ import appeng.api.config.Settings;
 import appeng.api.config.StorageFilter;
 import appeng.client.gui.implementations.UpgradeableScreen;
 import appeng.client.gui.widgets.ActionButton;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/FluidTerminalScreen.java
similarity index 98%
rename from src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
rename to src/main/java/appeng/client/gui/implementations/FluidTerminalScreen.java
index 02c637b2f..222774475 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/FluidTerminalScreen.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
@@ -51,14 +51,14 @@ import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.me.FluidRepo;
 import appeng.client.me.InternalFluidSlotME;
 import appeng.client.me.SlotFluidME;
+import appeng.container.implementations.FluidTerminalContainer;
+import appeng.container.slot.IMEFluidSlot;
 import appeng.core.AELog;
 import appeng.core.AppEng;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.InventoryActionPacket;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java b/src/main/java/appeng/client/gui/widgets/FluidSlotWidget.java
similarity index 97%
rename from src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
rename to src/main/java/appeng/client/gui/widgets/FluidSlotWidget.java
index 86e825b2e..fe66c34c1 100644
--- a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
+++ b/src/main/java/appeng/client/gui/widgets/FluidSlotWidget.java
@@ -1,4 +1,4 @@
-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;
 
 import java.util.Collections;
 
@@ -24,8 +24,8 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.client.gui.widgets.CustomSlotWidget;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidSlotWidget extends CustomSlotWidget {
     private final IAEFluidTank fluids;
diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java b/src/main/java/appeng/client/gui/widgets/FluidTankWidget.java
similarity index 98%
rename from src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java
rename to src/main/java/appeng/client/gui/widgets/FluidTankWidget.java
index e0eda6b9b..9e6078578 100644
--- a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java
+++ b/src/main/java/appeng/client/gui/widgets/FluidTankWidget.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidAttributes;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.AEColor;
 import appeng.client.gui.widgets.ITooltip;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 @OnlyIn(Dist.CLIENT)
 public class FluidTankWidget extends Widget implements ITooltip {
diff --git a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java b/src/main/java/appeng/client/gui/widgets/OptionalFluidSlotWidget.java
similarity index 95%
rename from src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
rename to src/main/java/appeng/client/gui/widgets/OptionalFluidSlotWidget.java
index b006d2f46..e4669c21b 100644
--- a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
+++ b/src/main/java/appeng/client/gui/widgets/OptionalFluidSlotWidget.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
@@ -7,7 +7,7 @@ import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.container.slot.IOptionalSlotHost;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 public class OptionalFluidSlotWidget extends FluidSlotWidget {
     private final IOptionalSlotHost containerBus;
diff --git a/src/main/java/appeng/client/me/FluidRepo.java b/src/main/java/appeng/client/me/FluidRepo.java
index e1fce58b2..915ee7917 100644
--- a/src/main/java/appeng/client/me/FluidRepo.java
+++ b/src/main/java/appeng/client/me/FluidRepo.java
@@ -37,8 +37,8 @@ import appeng.client.gui.widgets.IScrollSource;
 import appeng.client.gui.widgets.ISortSource;
 import appeng.core.AEConfig;
 import appeng.core.Api;
-import appeng.fluids.util.FluidSorters;
 import appeng.util.Platform;
+import appeng.util.fluid.FluidSorters;
 import appeng.util.prioritylist.IPartitionList;
 
 public class FluidRepo {
diff --git a/src/main/java/appeng/client/me/SlotFluidME.java b/src/main/java/appeng/client/me/SlotFluidME.java
index 0b8f28f9a..d196344c6 100644
--- a/src/main/java/appeng/client/me/SlotFluidME.java
+++ b/src/main/java/appeng/client/me/SlotFluidME.java
@@ -27,7 +27,7 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.fluids.container.slots.IMEFluidSlot;
+import appeng.container.slot.IMEFluidSlot;
 
 public class SlotFluidME extends Slot implements IMEFluidSlot {
 
diff --git a/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java b/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
index ff6c1f661..b47ddf621 100644
--- a/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
+++ b/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
@@ -45,7 +45,7 @@ import net.minecraftforge.client.model.ItemLayerModel;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
 
-import appeng.fluids.items.FluidDummyItem;
+import appeng.items.misc.FluidDummyItem;
 
 /**
  * This baked model class is used as a dispatcher to redirect the renderer to
diff --git a/src/main/java/appeng/fluids/items/FluidDummyItemColor.java b/src/main/java/appeng/client/render/FluidDummyItemColor.java
similarity index 91%
rename from src/main/java/appeng/fluids/items/FluidDummyItemColor.java
rename to src/main/java/appeng/client/render/FluidDummyItemColor.java
index f0ef7658e..b4d97b50a 100644
--- a/src/main/java/appeng/fluids/items/FluidDummyItemColor.java
+++ b/src/main/java/appeng/client/render/FluidDummyItemColor.java
@@ -1,4 +1,4 @@
-package appeng.fluids.items;
+package appeng.client.render;
 
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.item.Item;
@@ -7,6 +7,8 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fluids.FluidStack;
 
+import appeng.items.misc.FluidDummyItem;
+
 @OnlyIn(Dist.CLIENT)
 public class FluidDummyItemColor implements IItemColor {
 
diff --git a/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java b/src/main/java/appeng/client/render/FluidStackSizeRenderer.java
similarity index 99%
rename from src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java
rename to src/main/java/appeng/client/render/FluidStackSizeRenderer.java
index e7b5f91f0..9433e9a3a 100644
--- a/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java
+++ b/src/main/java/appeng/client/render/FluidStackSizeRenderer.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.render;
+package appeng.client.render;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
diff --git a/src/main/java/appeng/fluids/helper/FluidSyncHelper.java b/src/main/java/appeng/container/guisync/FluidSyncHelper.java
similarity index 95%
rename from src/main/java/appeng/fluids/helper/FluidSyncHelper.java
rename to src/main/java/appeng/container/guisync/FluidSyncHelper.java
index bcf7cd988..aa697fc73 100644
--- a/src/main/java/appeng/fluids/helper/FluidSyncHelper.java
+++ b/src/main/java/appeng/container/guisync/FluidSyncHelper.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.helper;
+package appeng.container.guisync;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,8 @@ import net.minecraft.inventory.container.IContainerListener;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidSyncHelper {
     private final IAEFluidTank inv;
diff --git a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java b/src/main/java/appeng/container/implementations/FluidConfigurableContainer.java
similarity index 93%
rename from src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
rename to src/main/java/appeng/container/implementations/FluidConfigurableContainer.java
index 0204b1267..1d1ad36fa 100644
--- a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
+++ b/src/main/java/appeng/container/implementations/FluidConfigurableContainer.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Collections;
 import java.util.Map;
@@ -15,11 +15,12 @@ import net.minecraftforge.fluids.FluidUtil;
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.guisync.FluidSyncHelper;
 import appeng.container.implementations.UpgradeableContainer;
-import appeng.fluids.helper.FluidSyncHelper;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.container.interfaces.IFluidSyncContainer;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.IAEFluidTank;
 
 public abstract class FluidConfigurableContainer extends UpgradeableContainer implements IFluidSyncContainer {
     private FluidSyncHelper sync = null;
diff --git a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java b/src/main/java/appeng/container/implementations/FluidFormationPlaneContainer.java
similarity index 95%
rename from src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java
rename to src/main/java/appeng/container/implementations/FluidFormationPlaneContainer.java
index efe5bdfba..48fabb7b4 100644
--- a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java
+++ b/src/main/java/appeng/container/implementations/FluidFormationPlaneContainer.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -11,10 +11,9 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.config.Upgrades;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
 import appeng.container.slot.RestrictedInputSlot;
-import appeng.fluids.parts.FluidFormationPlanePart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.FluidFormationPlanePart;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidFormationPlaneContainer extends FluidConfigurableContainer {
 
diff --git a/src/main/java/appeng/fluids/container/FluidIOContainer.java b/src/main/java/appeng/container/implementations/FluidIOContainer.java
similarity index 92%
rename from src/main/java/appeng/fluids/container/FluidIOContainer.java
rename to src/main/java/appeng/container/implementations/FluidIOContainer.java
index fa0c345ad..6e142eb5f 100644
--- a/src/main/java/appeng/fluids/container/FluidIOContainer.java
+++ b/src/main/java/appeng/container/implementations/FluidIOContainer.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -25,9 +25,8 @@ import net.minecraft.network.PacketBuffer;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
-import appeng.fluids.parts.SharedFluidBusPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.SharedFluidBusPart;
+import appeng.util.fluid.IAEFluidTank;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java b/src/main/java/appeng/container/implementations/FluidInterfaceContainer.java
similarity index 93%
rename from src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
rename to src/main/java/appeng/container/implementations/FluidInterfaceContainer.java
index 19fa46dd2..b40ef9006 100644
--- a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java
+++ b/src/main/java/appeng/container/implementations/FluidInterfaceContainer.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Collections;
 import java.util.Map;
@@ -31,12 +31,11 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.helper.FluidSyncHelper;
-import appeng.fluids.helper.IFluidInterfaceHost;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.container.guisync.FluidSyncHelper;
+import appeng.helpers.DualityFluidInterface;
+import appeng.helpers.IFluidInterfaceHost;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidInterfaceContainer extends FluidConfigurableContainer {
 
diff --git a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java b/src/main/java/appeng/container/implementations/FluidLevelEmitterContainer.java
similarity index 94%
rename from src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
rename to src/main/java/appeng/container/implementations/FluidLevelEmitterContainer.java
index bbe2b5063..5f85063ea 100644
--- a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java
+++ b/src/main/java/appeng/container/implementations/FluidLevelEmitterContainer.java
@@ -1,4 +1,4 @@
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -13,10 +13,9 @@ import appeng.api.config.Settings;
 import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerHelper;
-import appeng.fluids.parts.FluidLevelEmitterPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.FluidLevelEmitterPart;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
     public static ContainerType<FluidLevelEmitterContainer> TYPE;
diff --git a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java b/src/main/java/appeng/container/implementations/FluidStorageBusContainer.java
similarity index 97%
rename from src/main/java/appeng/fluids/container/FluidStorageBusContainer.java
rename to src/main/java/appeng/container/implementations/FluidStorageBusContainer.java
index 655d13633..205972936 100644
--- a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java
+++ b/src/main/java/appeng/container/implementations/FluidStorageBusContainer.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Iterator;
 
@@ -38,12 +38,11 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerHelper;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
-import appeng.fluids.parts.FluidStorageBusPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.misc.FluidStorageBusPart;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 import appeng.util.iterators.NullIterator;
 
 /**
diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/main/java/appeng/container/implementations/FluidTerminalContainer.java
similarity index 99%
rename from src/main/java/appeng/fluids/container/FluidTerminalContainer.java
rename to src/main/java/appeng/container/implementations/FluidTerminalContainer.java
index 6cd449a40..4039f4da2 100644
--- a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java
+++ b/src/main/java/appeng/container/implementations/FluidTerminalContainer.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.io.IOException;
 import java.nio.BufferOverflowException;
@@ -63,19 +63,18 @@ import appeng.api.util.IConfigurableObject;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerHelper;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.MEFluidInventoryUpdatePacket;
 import appeng.core.sync.packets.TargetFluidStackPacket;
-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.fluid.AEFluidStack;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/fluids/container/IFluidSyncContainer.java b/src/main/java/appeng/container/interfaces/IFluidSyncContainer.java
similarity index 83%
rename from src/main/java/appeng/fluids/container/IFluidSyncContainer.java
rename to src/main/java/appeng/container/interfaces/IFluidSyncContainer.java
index c07a0fe8c..c95cee35e 100644
--- a/src/main/java/appeng/fluids/container/IFluidSyncContainer.java
+++ b/src/main/java/appeng/container/interfaces/IFluidSyncContainer.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.container;
+package appeng.container.interfaces;
 
 import java.util.Map;
 
diff --git a/src/main/java/appeng/fluids/container/slots/IMEFluidSlot.java b/src/main/java/appeng/container/slot/IMEFluidSlot.java
similarity index 96%
rename from src/main/java/appeng/fluids/container/slots/IMEFluidSlot.java
rename to src/main/java/appeng/container/slot/IMEFluidSlot.java
index d13504f78..b5f4c9512 100644
--- a/src/main/java/appeng/fluids/container/slots/IMEFluidSlot.java
+++ b/src/main/java/appeng/container/slot/IMEFluidSlot.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container.slots;
+package appeng.container.slot;
 
 import appeng.api.storage.data.IAEFluidStack;
 
diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java
index 882e56df1..c0fdf7395 100644
--- a/src/main/java/appeng/core/Registration.java
+++ b/src/main/java/appeng/core/Registration.java
@@ -100,6 +100,12 @@ import appeng.client.gui.implementations.CraftingCPUScreen;
 import appeng.client.gui.implementations.CraftingStatusScreen;
 import appeng.client.gui.implementations.CraftingTermScreen;
 import appeng.client.gui.implementations.DriveScreen;
+import appeng.client.gui.implementations.FluidFormationPlaneScreen;
+import appeng.client.gui.implementations.FluidIOScreen;
+import appeng.client.gui.implementations.FluidInterfaceScreen;
+import appeng.client.gui.implementations.FluidLevelEmitterScreen;
+import appeng.client.gui.implementations.FluidStorageBusScreen;
+import appeng.client.gui.implementations.FluidTerminalScreen;
 import appeng.client.gui.implementations.FormationPlaneScreen;
 import appeng.client.gui.implementations.GrinderScreen;
 import appeng.client.gui.implementations.IOPortScreen;
@@ -159,6 +165,12 @@ import appeng.container.implementations.CraftingCPUContainer;
 import appeng.container.implementations.CraftingStatusContainer;
 import appeng.container.implementations.CraftingTermContainer;
 import appeng.container.implementations.DriveContainer;
+import appeng.container.implementations.FluidFormationPlaneContainer;
+import appeng.container.implementations.FluidIOContainer;
+import appeng.container.implementations.FluidInterfaceContainer;
+import appeng.container.implementations.FluidLevelEmitterContainer;
+import appeng.container.implementations.FluidStorageBusContainer;
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.container.implementations.FormationPlaneContainer;
 import appeng.container.implementations.GrinderContainer;
 import appeng.container.implementations.IOPortContainer;
@@ -186,24 +198,12 @@ import appeng.container.implementations.WirelessTermContainer;
 import appeng.core.features.registries.P2PTunnelRegistry;
 import appeng.core.features.registries.PartModels;
 import appeng.core.features.registries.cell.BasicCellHandler;
+import appeng.core.features.registries.cell.BasicFluidCellGuiHandler;
 import appeng.core.features.registries.cell.BasicItemCellGuiHandler;
 import appeng.core.features.registries.cell.CreativeCellHandler;
 import appeng.core.localization.GuiText;
 import appeng.core.stats.AdvancementTriggers;
 import appeng.core.stats.AeStats;
-import appeng.fluids.client.gui.FluidFormationPlaneScreen;
-import appeng.fluids.client.gui.FluidIOScreen;
-import appeng.fluids.client.gui.FluidInterfaceScreen;
-import appeng.fluids.client.gui.FluidLevelEmitterScreen;
-import appeng.fluids.client.gui.FluidStorageBusScreen;
-import appeng.fluids.client.gui.FluidTerminalScreen;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.container.FluidIOContainer;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.container.FluidLevelEmitterContainer;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.registries.BasicFluidCellGuiHandler;
 import appeng.items.parts.FacadeItem;
 import appeng.me.cache.CraftingGridCache;
 import appeng.me.cache.EnergyGridCache;
diff --git a/src/main/java/appeng/core/api/ApiStorage.java b/src/main/java/appeng/core/api/ApiStorage.java
index 7d7168b63..8d91ce6fc 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.items.FluidDummyItem;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.FluidList;
+import appeng.items.misc.FluidDummyItem;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.FluidList;
 import appeng.util.item.AEItemStack;
 import appeng.util.item.ItemList;
 
diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
index 95b90b645..71994872a 100644
--- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java
+++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
@@ -22,7 +22,6 @@ import static appeng.block.AEBaseBlock.defaultProps;
 
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.block.SoundType;
@@ -52,6 +51,7 @@ import appeng.block.grindstone.GrinderBlock;
 import appeng.block.misc.CellWorkbenchBlock;
 import appeng.block.misc.ChargerBlock;
 import appeng.block.misc.CondenserBlock;
+import appeng.block.misc.FluidInterfaceBlock;
 import appeng.block.misc.InscriberBlock;
 import appeng.block.misc.InscriberRendering;
 import appeng.block.misc.InterfaceBlock;
@@ -123,8 +123,6 @@ import appeng.decorative.solid.QuartzPillarBlock;
 import appeng.decorative.solid.SkyStoneBlock;
 import appeng.decorative.solid.SkyStoneBlock.SkystoneType;
 import appeng.entity.TinyTNTPrimedEntity;
-import appeng.fluids.block.FluidInterfaceBlock;
-import appeng.fluids.tile.FluidInterfaceTileEntity;
 import appeng.hooks.TinyTNTDispenseItemBehavior;
 import appeng.tile.crafting.CraftingMonitorTileEntity;
 import appeng.tile.crafting.CraftingStorageTileEntity;
@@ -136,6 +134,7 @@ import appeng.tile.grindstone.GrinderTileEntity;
 import appeng.tile.misc.CellWorkbenchTileEntity;
 import appeng.tile.misc.ChargerTileEntity;
 import appeng.tile.misc.CondenserTileEntity;
+import appeng.tile.misc.FluidInterfaceTileEntity;
 import appeng.tile.misc.InscriberTileEntity;
 import appeng.tile.misc.InterfaceTileEntity;
 import appeng.tile.misc.LightDetectorTileEntity;
diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java
index e28d72876..736308c0a 100644
--- a/src/main/java/appeng/core/api/definitions/ApiItems.java
+++ b/src/main/java/appeng/core/api/definitions/ApiItems.java
@@ -39,6 +39,7 @@ import appeng.bootstrap.FeatureFactory;
 import appeng.bootstrap.IItemRendering;
 import appeng.bootstrap.ItemRenderingCustomizer;
 import appeng.bootstrap.components.IClientSetupComponent;
+import appeng.client.render.FluidDummyItemColor;
 import appeng.core.AppEng;
 import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;
@@ -49,18 +50,17 @@ import appeng.debug.EraserItem;
 import appeng.debug.MeteoritePlacerItem;
 import appeng.debug.ReplicatorCardItem;
 import appeng.entity.GrowingCrystalEntity;
-import appeng.fluids.items.BasicFluidStorageCell;
-import appeng.fluids.items.FluidDummyItem;
-import appeng.fluids.items.FluidDummyItemColor;
 import appeng.hooks.BlockToolDispenseItemBehavior;
 import appeng.hooks.MatterCannonDispenseItemBehavior;
 import appeng.items.materials.MaterialType;
 import appeng.items.misc.CrystalSeedItem;
 import appeng.items.misc.CrystalSeedRendering;
 import appeng.items.misc.EncodedPatternItem;
+import appeng.items.misc.FluidDummyItem;
 import appeng.items.misc.PaintBallItem;
 import appeng.items.misc.PaintBallItemRendering;
 import appeng.items.parts.FacadeItem;
+import appeng.items.storage.BasicFluidStorageCell;
 import appeng.items.storage.BasicStorageCellItem;
 import appeng.items.storage.CreativeStorageCellItem;
 import appeng.items.storage.SpatialStorageCellItem;
diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java
index f22e847ba..e5f27af50 100644
--- a/src/main/java/appeng/core/api/definitions/ApiParts.java
+++ b/src/main/java/appeng/core/api/definitions/ApiParts.java
@@ -33,25 +33,24 @@ import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;
 import appeng.core.features.ItemStackSrc;
 import appeng.core.features.registries.PartModels;
-import appeng.fluids.parts.FluidAnnihilationPlanePart;
-import appeng.fluids.parts.FluidExportBusPart;
-import appeng.fluids.parts.FluidFormationPlanePart;
-import appeng.fluids.parts.FluidImportBusPart;
-import appeng.fluids.parts.FluidInterfacePart;
-import appeng.fluids.parts.FluidLevelEmitterPart;
-import appeng.fluids.parts.FluidStorageBusPart;
-import appeng.fluids.parts.FluidTerminalPart;
 import appeng.items.parts.ColoredPartItem;
 import appeng.items.parts.PartItem;
 import appeng.items.parts.PartItemRendering;
 import appeng.items.parts.PartModelsHelper;
 import appeng.parts.automation.AnnihilationPlanePart;
 import appeng.parts.automation.ExportBusPart;
+import appeng.parts.automation.FluidAnnihilationPlanePart;
+import appeng.parts.automation.FluidExportBusPart;
+import appeng.parts.automation.FluidFormationPlanePart;
+import appeng.parts.automation.FluidImportBusPart;
+import appeng.parts.automation.FluidLevelEmitterPart;
 import appeng.parts.automation.FormationPlanePart;
 import appeng.parts.automation.IdentityAnnihilationPlanePart;
 import appeng.parts.automation.ImportBusPart;
 import appeng.parts.automation.LevelEmitterPart;
 import appeng.parts.misc.CableAnchorPart;
+import appeng.parts.misc.FluidInterfacePart;
+import appeng.parts.misc.FluidStorageBusPart;
 import appeng.parts.misc.InterfacePart;
 import appeng.parts.misc.InvertedToggleBusPart;
 import appeng.parts.misc.StorageBusPart;
@@ -71,6 +70,7 @@ import appeng.parts.p2p.RedstoneP2PTunnelPart;
 import appeng.parts.reporting.ConversionMonitorPart;
 import appeng.parts.reporting.CraftingTerminalPart;
 import appeng.parts.reporting.DarkPanelPart;
+import appeng.parts.reporting.FluidTerminalPart;
 import appeng.parts.reporting.InterfaceTerminalPart;
 import appeng.parts.reporting.PanelPart;
 import appeng.parts.reporting.PatternTerminalPart;
diff --git a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicFluidCellGuiHandler.java
similarity index 94%
rename from src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java
rename to src/main/java/appeng/core/features/registries/cell/BasicFluidCellGuiHandler.java
index ac8a69698..270bc0157 100644
--- a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java
+++ b/src/main/java/appeng/core/features/registries/cell/BasicFluidCellGuiHandler.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.registries;
+package appeng.core.features.registries.cell;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -31,8 +31,8 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidTerminalContainer;
 
 public class BasicFluidCellGuiHandler implements ICellGuiHandler {
 
diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
index 5a3bbca36..d60efa6b2 100644
--- a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
+++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java
@@ -38,6 +38,8 @@ import appeng.container.implementations.CellWorkbenchContainer;
 import appeng.container.implementations.CraftConfirmContainer;
 import appeng.container.implementations.CraftingCPUContainer;
 import appeng.container.implementations.CraftingStatusContainer;
+import appeng.container.implementations.FluidLevelEmitterContainer;
+import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.container.implementations.LevelEmitterContainer;
 import appeng.container.implementations.NetworkToolContainer;
 import appeng.container.implementations.PatternTermContainer;
@@ -47,8 +49,6 @@ import appeng.container.implementations.SecurityStationContainer;
 import appeng.container.implementations.StorageBusContainer;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.fluids.container.FluidLevelEmitterContainer;
-import appeng.fluids.container.FluidStorageBusContainer;
 import appeng.helpers.IMouseWheelItem;
 
 public class ConfigValuePacket extends BasePacket {
diff --git a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java
index b397ac282..c3917e01e 100644
--- a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java
+++ b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java
@@ -29,10 +29,10 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.PacketBuffer;
 
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.interfaces.IFluidSyncContainer;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.fluids.container.IFluidSyncContainer;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.AEFluidStack;
 
 public class FluidSlotPacket extends BasePacket {
     private final Map<Integer, IAEFluidStack> list;
diff --git a/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java b/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java
index 1f79b1af4..1ef2e38ce 100644
--- a/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java
+++ b/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java
@@ -37,10 +37,10 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.NetworkDirection;
 
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.client.gui.implementations.FluidTerminalScreen;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.fluids.client.gui.FluidTerminalScreen;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.AEFluidStack;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java b/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java
index 6cc693a79..8801e823e 100644
--- a/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java
+++ b/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java
@@ -23,11 +23,11 @@ import io.netty.buffer.Unpooled;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketBuffer;
 
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.AELog;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.AEFluidStack;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java b/src/main/java/appeng/helpers/DualityFluidInterface.java
similarity index 99%
rename from src/main/java/appeng/fluids/helper/DualityFluidInterface.java
rename to src/main/java/appeng/helpers/DualityFluidInterface.java
index a37983362..b09aea78a 100644
--- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java
+++ b/src/main/java/appeng/helpers/DualityFluidInterface.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.helper;
+package appeng.helpers;
 
 import java.util.Optional;
 
@@ -59,9 +59,6 @@ import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
 import appeng.core.Api;
 import appeng.core.settings.TickRates;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.MachineSource;
@@ -71,6 +68,9 @@ import appeng.me.storage.NullInventory;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 
 public class DualityFluidInterface
         implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost {
diff --git a/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java b/src/main/java/appeng/helpers/IFluidInterfaceHost.java
similarity index 95%
rename from src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java
rename to src/main/java/appeng/helpers/IFluidInterfaceHost.java
index 20a416c19..b0123773a 100644
--- a/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java
+++ b/src/main/java/appeng/helpers/IFluidInterfaceHost.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.helper;
+package appeng.helpers;
 
 import java.util.EnumSet;
 
@@ -25,6 +25,7 @@ import net.minecraft.util.Direction;
 
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.networking.security.IActionHost;
+import appeng.helpers.DualityFluidInterface;
 import appeng.me.helpers.IGridProxyable;
 
 public interface IFluidInterfaceHost extends IActionHost, IGridProxyable, IUpgradeableHost {
diff --git a/src/main/java/appeng/fluids/helper/FluidCellConfig.java b/src/main/java/appeng/items/contents/FluidCellConfig.java
similarity index 98%
rename from src/main/java/appeng/fluids/helper/FluidCellConfig.java
rename to src/main/java/appeng/items/contents/FluidCellConfig.java
index 392b29af3..3f930d835 100644
--- a/src/main/java/appeng/fluids/helper/FluidCellConfig.java
+++ b/src/main/java/appeng/items/contents/FluidCellConfig.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.helper;
+package appeng.items.contents;
 
 import javax.annotation.Nonnull;
 
@@ -27,8 +27,8 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 
 import appeng.core.Api;
-import appeng.fluids.items.FluidDummyItem;
 import appeng.items.contents.CellConfig;
+import appeng.items.misc.FluidDummyItem;
 
 /**
  * @author DrummerMC
diff --git a/src/main/java/appeng/fluids/items/FluidDummyItem.java b/src/main/java/appeng/items/misc/FluidDummyItem.java
similarity index 98%
rename from src/main/java/appeng/fluids/items/FluidDummyItem.java
rename to src/main/java/appeng/items/misc/FluidDummyItem.java
index 03a9e397c..592f2b864 100644
--- a/src/main/java/appeng/fluids/items/FluidDummyItem.java
+++ b/src/main/java/appeng/items/misc/FluidDummyItem.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.items;
+package appeng.items.misc;
 
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemGroup;
diff --git a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java b/src/main/java/appeng/items/storage/BasicFluidStorageCell.java
similarity index 96%
rename from src/main/java/appeng/fluids/items/BasicFluidStorageCell.java
rename to src/main/java/appeng/items/storage/BasicFluidStorageCell.java
index fd0d4fd9a..b10808246 100644
--- a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java
+++ b/src/main/java/appeng/items/storage/BasicFluidStorageCell.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.items;
+package appeng.items.storage;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -26,9 +26,8 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.Api;
-import appeng.fluids.helper.FluidCellConfig;
+import appeng.items.contents.FluidCellConfig;
 import appeng.items.materials.MaterialType;
-import appeng.items.storage.AbstractStorageCell;
 import appeng.util.InventoryAdaptor;
 
 /**
diff --git a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/FluidAnnihilationPlanePart.java
similarity index 96%
rename from src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
rename to src/main/java/appeng/parts/automation/FluidAnnihilationPlanePart.java
index 6708c87c8..aa5e08e9f 100644
--- a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
+++ b/src/main/java/appeng/parts/automation/FluidAnnihilationPlanePart.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import java.util.List;
 
@@ -44,16 +44,12 @@ import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
 import appeng.core.sync.packets.BlockTransitionEffectPacket;
-import appeng.fluids.util.AEFluidStack;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.parts.BasicStatePart;
-import appeng.parts.automation.PlaneConnectionHelper;
-import appeng.parts.automation.PlaneConnections;
-import appeng.parts.automation.PlaneModelData;
-import appeng.parts.automation.PlaneModels;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
 
 public class FluidAnnihilationPlanePart extends BasicStatePart implements IGridTickable {
 
diff --git a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java b/src/main/java/appeng/parts/automation/FluidExportBusPart.java
similarity index 99%
rename from src/main/java/appeng/fluids/parts/FluidExportBusPart.java
rename to src/main/java/appeng/parts/automation/FluidExportBusPart.java
index dcfef4e22..a9e66d1f1 100644
--- a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java
+++ b/src/main/java/appeng/parts/automation/FluidExportBusPart.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import javax.annotation.Nonnull;
 
diff --git a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java b/src/main/java/appeng/parts/automation/FluidFormationPlanePart.java
similarity index 95%
rename from src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
rename to src/main/java/appeng/parts/automation/FluidFormationPlanePart.java
index 42de6d68a..36b211afd 100644
--- a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
+++ b/src/main/java/appeng/parts/automation/FluidFormationPlanePart.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,18 +45,15 @@ import appeng.api.storage.data.IItemList;
 import appeng.api.util.AEPartLocation;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidFormationPlaneContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.storage.MEInventoryHandler;
-import appeng.parts.automation.AbstractFormationPlanePart;
-import appeng.parts.automation.PlaneModelData;
-import appeng.parts.automation.PlaneModels;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 import appeng.util.prioritylist.PrecisePriorityList;
 
 public class FluidFormationPlanePart extends AbstractFormationPlanePart<IAEFluidStack> implements IAEFluidInventory {
diff --git a/src/main/java/appeng/fluids/parts/FluidImportBusPart.java b/src/main/java/appeng/parts/automation/FluidImportBusPart.java
similarity index 98%
rename from src/main/java/appeng/fluids/parts/FluidImportBusPart.java
rename to src/main/java/appeng/parts/automation/FluidImportBusPart.java
index d906a69c7..99628702d 100644
--- a/src/main/java/appeng/fluids/parts/FluidImportBusPart.java
+++ b/src/main/java/appeng/parts/automation/FluidImportBusPart.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import javax.annotation.Nonnull;
 
@@ -44,11 +44,11 @@ import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.data.IAEFluidStack;
 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.fluid.AEFluidStack;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java b/src/main/java/appeng/parts/automation/FluidLevelEmitterPart.java
similarity index 97%
rename from src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java
rename to src/main/java/appeng/parts/automation/FluidLevelEmitterPart.java
index a7d8d3a3a..9046a9bea 100644
--- a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java
+++ b/src/main/java/appeng/parts/automation/FluidLevelEmitterPart.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import java.util.Random;
 
@@ -37,18 +37,17 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidLevelEmitterContainer;
 import appeng.core.Api;
 import appeng.core.AppEng;
-import appeng.fluids.container.FluidLevelEmitterContainer;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.parts.PartModel;
-import appeng.parts.automation.UpgradeablePart;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidLevelEmitterPart extends UpgradeablePart
         implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack> {
diff --git a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java b/src/main/java/appeng/parts/automation/SharedFluidBusPart.java
similarity index 96%
rename from src/main/java/appeng/fluids/parts/SharedFluidBusPart.java
rename to src/main/java/appeng/parts/automation/SharedFluidBusPart.java
index 79d4ea940..178ffcd30 100644
--- a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java
+++ b/src/main/java/appeng/parts/automation/SharedFluidBusPart.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -39,13 +39,12 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.util.AECableType;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidIOContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidIOContainer;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
-import appeng.parts.automation.UpgradeablePart;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java b/src/main/java/appeng/parts/misc/FluidHandlerAdapter.java
similarity index 99%
rename from src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java
rename to src/main/java/appeng/parts/misc/FluidHandlerAdapter.java
index 675bf8395..541cdcaae 100644
--- a/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java
+++ b/src/main/java/appeng/parts/misc/FluidHandlerAdapter.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.misc;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,10 +39,10 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.core.Api;
-import appeng.fluids.util.AEFluidStack;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
+import appeng.util.fluid.AEFluidStack;
 
 /**
  * Wraps an Fluid Handler in such a way that it can be used as an IMEInventory
diff --git a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java b/src/main/java/appeng/parts/misc/FluidInterfacePart.java
similarity index 97%
rename from src/main/java/appeng/fluids/parts/FluidInterfacePart.java
rename to src/main/java/appeng/parts/misc/FluidInterfacePart.java
index 07ff0498f..a84fe0e8f 100644
--- a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java
+++ b/src/main/java/appeng/parts/misc/FluidInterfacePart.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.misc;
 
 import java.util.EnumSet;
 
@@ -51,11 +51,11 @@ import appeng.api.util.AECableType;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.core.Api;
 import appeng.core.AppEng;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.helper.IFluidInterfaceHost;
+import appeng.helpers.DualityFluidInterface;
+import appeng.helpers.IFluidInterfaceHost;
 import appeng.helpers.IPriorityHost;
 import appeng.helpers.Reflected;
 import appeng.items.parts.PartModels;
diff --git a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java b/src/main/java/appeng/parts/misc/FluidStorageBusPart.java
similarity index 98%
rename from src/main/java/appeng/fluids/parts/FluidStorageBusPart.java
rename to src/main/java/appeng/parts/misc/FluidStorageBusPart.java
index 43454e717..aefac015b 100644
--- a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java
+++ b/src/main/java/appeng/parts/misc/FluidStorageBusPart.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.misc;
 
 import java.util.Collections;
 import java.util.List;
@@ -65,13 +65,10 @@ import appeng.api.util.AEPartLocation;
 import appeng.capabilities.Capabilities;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.helpers.IInterfaceHost;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
@@ -79,8 +76,10 @@ import appeng.me.helpers.MachineSource;
 import appeng.me.storage.ITickingMonitor;
 import appeng.me.storage.MEInventoryHandler;
 import appeng.parts.PartModel;
-import appeng.parts.misc.SharedStorageBusPart;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 import appeng.util.prioritylist.FuzzyPriorityList;
 import appeng.util.prioritylist.PrecisePriorityList;
 
diff --git a/src/main/java/appeng/fluids/parts/FluidTerminalPart.java b/src/main/java/appeng/parts/reporting/FluidTerminalPart.java
similarity index 94%
rename from src/main/java/appeng/fluids/parts/FluidTerminalPart.java
rename to src/main/java/appeng/parts/reporting/FluidTerminalPart.java
index eafd19439..7e576626d 100644
--- a/src/main/java/appeng/fluids/parts/FluidTerminalPart.java
+++ b/src/main/java/appeng/parts/reporting/FluidTerminalPart.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.reporting;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.container.ContainerType;
@@ -24,11 +24,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 import appeng.api.parts.IPartModel;
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.AppEng;
-import appeng.fluids.container.FluidTerminalContainer;
 import appeng.items.parts.PartModels;
 import appeng.parts.PartModel;
-import appeng.parts.reporting.AbstractTerminalPart;
 
 /**
  * @author BrockWS
diff --git a/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java b/src/main/java/appeng/tile/misc/FluidInterfaceTileEntity.java
similarity index 96%
rename from src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java
rename to src/main/java/appeng/tile/misc/FluidInterfaceTileEntity.java
index 9628a4ad1..bd8060d53 100644
--- a/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java
+++ b/src/main/java/appeng/tile/misc/FluidInterfaceTileEntity.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.tile;
+package appeng.tile.misc;
 
 import java.util.EnumSet;
 
@@ -45,10 +45,10 @@ import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
+import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.helper.IFluidInterfaceHost;
+import appeng.helpers.DualityFluidInterface;
+import appeng.helpers.IFluidInterfaceHost;
 import appeng.helpers.IPriorityHost;
 import appeng.tile.grid.AENetworkTileEntity;
 
diff --git a/src/main/java/appeng/tile/storage/ChestTileEntity.java b/src/main/java/appeng/tile/storage/ChestTileEntity.java
index 59ad672e2..3c436e288 100644
--- a/src/main/java/appeng/tile/storage/ChestTileEntity.java
+++ b/src/main/java/appeng/tile/storage/ChestTileEntity.java
@@ -91,10 +91,9 @@ import appeng.api.storage.data.IAEStack;
 import appeng.api.util.AEColor;
 import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.container.implementations.MEMonitorableContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.IPriorityHost;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MEMonitorHandler;
@@ -105,6 +104,7 @@ import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperChainedItemHandler;
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
index 5a104b4d1..253d041e3 100644
--- a/src/main/java/appeng/util/Platform.java
+++ b/src/main/java/appeng/util/Platform.java
@@ -105,12 +105,12 @@ import appeng.core.AEConfig;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.stats.AeStats;
-import appeng.fluids.util.AEFluidStack;
 import appeng.hooks.TickHandler;
 import appeng.integration.abstraction.JEIFacade;
 import appeng.me.GridAccessException;
 import appeng.me.GridNode;
 import appeng.me.helpers.AENetworkProxy;
+import appeng.util.fluid.AEFluidStack;
 import appeng.util.helpers.ItemComparisonHelper;
 import appeng.util.helpers.P2PHelper;
 import appeng.util.item.AEItemStack;
diff --git a/src/main/java/appeng/fluids/util/AEFluidInventory.java b/src/main/java/appeng/util/fluid/AEFluidInventory.java
similarity index 99%
rename from src/main/java/appeng/fluids/util/AEFluidInventory.java
rename to src/main/java/appeng/util/fluid/AEFluidInventory.java
index 4566d62f8..0ce32a017 100644
--- a/src/main/java/appeng/fluids/util/AEFluidInventory.java
+++ b/src/main/java/appeng/util/fluid/AEFluidInventory.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 import java.util.Objects;
 
diff --git a/src/main/java/appeng/fluids/util/AEFluidStack.java b/src/main/java/appeng/util/fluid/AEFluidStack.java
similarity index 99%
rename from src/main/java/appeng/fluids/util/AEFluidStack.java
rename to src/main/java/appeng/util/fluid/AEFluidStack.java
index c07acd070..bc4b2703e 100644
--- a/src/main/java/appeng/fluids/util/AEFluidStack.java
+++ b/src/main/java/appeng/util/fluid/AEFluidStack.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -38,7 +38,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.Api;
-import appeng.fluids.items.FluidDummyItem;
+import appeng.items.misc.FluidDummyItem;
 import appeng.util.Platform;
 import appeng.util.item.AEStack;
 
diff --git a/src/main/java/appeng/fluids/util/AEFluidTank.java b/src/main/java/appeng/util/fluid/AEFluidTank.java
similarity index 98%
rename from src/main/java/appeng/fluids/util/AEFluidTank.java
rename to src/main/java/appeng/util/fluid/AEFluidTank.java
index f8325f5f9..e7ed51b9f 100644
--- a/src/main/java/appeng/fluids/util/AEFluidTank.java
+++ b/src/main/java/appeng/util/fluid/AEFluidTank.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 
diff --git a/src/main/java/appeng/fluids/util/FluidList.java b/src/main/java/appeng/util/fluid/FluidList.java
similarity index 99%
rename from src/main/java/appeng/fluids/util/FluidList.java
rename to src/main/java/appeng/util/fluid/FluidList.java
index 9a459717d..1eba9abe2 100644
--- a/src/main/java/appeng/fluids/util/FluidList.java
+++ b/src/main/java/appeng/util/fluid/FluidList.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/appeng/fluids/util/FluidSorters.java b/src/main/java/appeng/util/fluid/FluidSorters.java
similarity index 99%
rename from src/main/java/appeng/fluids/util/FluidSorters.java
rename to src/main/java/appeng/util/fluid/FluidSorters.java
index 239226266..3a371b995 100644
--- a/src/main/java/appeng/fluids/util/FluidSorters.java
+++ b/src/main/java/appeng/util/fluid/FluidSorters.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 import java.util.Comparator;
 
diff --git a/src/main/java/appeng/fluids/util/IAEFluidInventory.java b/src/main/java/appeng/util/fluid/IAEFluidInventory.java
similarity index 97%
rename from src/main/java/appeng/fluids/util/IAEFluidInventory.java
rename to src/main/java/appeng/util/fluid/IAEFluidInventory.java
index b2ed7191d..509119080 100644
--- a/src/main/java/appeng/fluids/util/IAEFluidInventory.java
+++ b/src/main/java/appeng/util/fluid/IAEFluidInventory.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 @FunctionalInterface
 public interface IAEFluidInventory {
diff --git a/src/main/java/appeng/fluids/util/IAEFluidTank.java b/src/main/java/appeng/util/fluid/IAEFluidTank.java
similarity index 91%
rename from src/main/java/appeng/fluids/util/IAEFluidTank.java
rename to src/main/java/appeng/util/fluid/IAEFluidTank.java
index 3eddab5b5..9489fb1cb 100644
--- a/src/main/java/appeng/fluids/util/IAEFluidTank.java
+++ b/src/main/java/appeng/util/fluid/IAEFluidTank.java
@@ -1,5 +1,5 @@
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 import net.minecraftforge.fluids.capability.IFluidHandler;
 
diff --git a/src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java b/src/main/java/appeng/util/fluid/MeaningfulFluidIterator.java
similarity index 98%
rename from src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java
rename to src/main/java/appeng/util/fluid/MeaningfulFluidIterator.java
index f9309cbce..44c38d582 100644
--- a/src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java
+++ b/src/main/java/appeng/util/fluid/MeaningfulFluidIterator.java
@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;