diff --git a/src/api/java/appeng/api/networking/IGridCacheFactory.java b/api/src/main/java/appeng/api/networking/IGridCacheFactory.java
similarity index 100%
rename from src/api/java/appeng/api/networking/IGridCacheFactory.java
rename to api/src/main/java/appeng/api/networking/IGridCacheFactory.java
diff --git a/src/main/java/appeng/container/interfaces/IInventorySlotAware.java b/core/src/main/java/appeng/container/interfaces/IInventorySlotAware.java
similarity index 100%
rename from src/main/java/appeng/container/interfaces/IInventorySlotAware.java
rename to core/src/main/java/appeng/container/interfaces/IInventorySlotAware.java
diff --git a/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java b/core/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java
similarity index 100%
rename from src/main/java/appeng/core/sync/packets/CompassRequestPacket.java
rename to core/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java
diff --git a/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java b/core/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java
similarity index 100%
rename from src/main/java/appeng/core/sync/packets/CompassResponsePacket.java
rename to core/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java
diff --git a/core/src/main/java/appeng/fluids/util/AEFluidStack.java b/core/src/main/java/appeng/fluids/util/AEFluidStack.java
index 9701386ff..ca295bb83 100644
--- a/core/src/main/java/appeng/fluids/util/AEFluidStack.java
+++ b/core/src/main/java/appeng/fluids/util/AEFluidStack.java
@@ -237,32 +237,22 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
     public static IAEFluidStack fromPacket(final PacketByteBuf buffer) {
         final boolean isCraftable = buffer.readBoolean();
 
-        CompoundTag volumeTag = buffer.readCompoundTag();
-        final long stackSize = buffer.readVarLong();
+        FluidKey fluid = FluidKey.fromTag(buffer.readCompoundTag());
+        CompoundTag compoundTag = buffer.readCompoundTag();
+        final long amount = buffer.readVarLong();
         final long countRequestable = buffer.readVarLong();
 
-        if (volumeTag == null) {
-            return null;
-        }
-        FluidVolume fluidStack = FluidVolume.fromTag(volumeTag);
-        if (fluidStack.isEmpty()) {
-            return null;
-        }
-
-        final AEFluidStack fluid = AEFluidStack.fromFluidStack(fluidStack);
-        fluid.setStackSize(stackSize);
-        fluid.setCountRequestable(countRequestable);
-        fluid.setCraftable(isCraftable);
-        return fluid;
+        final AEFluidStack fluidStack = new AEFluidStack(fluid, amount, compoundTag);
+        fluidStack.setCountRequestable(countRequestable);
+        fluidStack.setCraftable(isCraftable);
+        return fluidStack;
     }
 
     @Override
     public void writeToPacket(final PacketByteBuf buffer) {
         buffer.writeBoolean(this.isCraftable());
-        // Cannot use writeFluidStack here because for FluidStacks with amount==0, it
-        // will not write the fluid
-        buffer.writeRegistryIdUnsafe(ForgeRegistries.FLUIDS, fluid);
-        buffer.writeCompoundTag(getFluidStack().getTag());
+        buffer.writeCompoundTag(fluid.toTag());
+        buffer.writeCompoundTag(tagCompound);
         buffer.writeVarLong(this.getStackSize());
         buffer.writeVarLong(this.getCountRequestable());
     }
diff --git a/src/main/java/appeng/hooks/CompassManager.java b/core/src/main/java/appeng/hooks/CompassManager.java
similarity index 100%
rename from src/main/java/appeng/hooks/CompassManager.java
rename to core/src/main/java/appeng/hooks/CompassManager.java
diff --git a/src/main/java/appeng/hooks/CompassResult.java b/core/src/main/java/appeng/hooks/CompassResult.java
similarity index 100%
rename from src/main/java/appeng/hooks/CompassResult.java
rename to core/src/main/java/appeng/hooks/CompassResult.java
diff --git a/src/main/java/appeng/items/contents/CellUpgrades.java b/core/src/main/java/appeng/items/contents/CellUpgrades.java
similarity index 100%
rename from src/main/java/appeng/items/contents/CellUpgrades.java
rename to core/src/main/java/appeng/items/contents/CellUpgrades.java
diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/core/src/main/java/appeng/items/contents/NetworkToolViewer.java
similarity index 100%
rename from src/main/java/appeng/items/contents/NetworkToolViewer.java
rename to core/src/main/java/appeng/items/contents/NetworkToolViewer.java
diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/core/src/main/java/appeng/items/contents/PortableCellViewer.java
similarity index 100%
rename from src/main/java/appeng/items/contents/PortableCellViewer.java
rename to core/src/main/java/appeng/items/contents/PortableCellViewer.java
diff --git a/src/main/java/appeng/items/contents/QuartzKnifeObj.java b/core/src/main/java/appeng/items/contents/QuartzKnifeObj.java
similarity index 100%
rename from src/main/java/appeng/items/contents/QuartzKnifeObj.java
rename to core/src/main/java/appeng/items/contents/QuartzKnifeObj.java
diff --git a/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java b/core/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java
similarity index 100%
rename from src/main/java/appeng/parts/automation/BlockUpgradeInventory.java
rename to core/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java
diff --git a/src/main/java/appeng/parts/automation/StackUpgradeInventory.java b/core/src/main/java/appeng/parts/automation/StackUpgradeInventory.java
similarity index 100%
rename from src/main/java/appeng/parts/automation/StackUpgradeInventory.java
rename to core/src/main/java/appeng/parts/automation/StackUpgradeInventory.java