diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java
index 43212d9f..6ff85278 100644
--- a/archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java
+++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/grate/TileGrate.java
@@ -21,8 +21,8 @@ import resonant.api.IRotatable;
 import resonant.lib.config.Config;
 import resonant.lib.utility.FluidUtility;
 import resonantinduction.core.Reference;
-import resonantinduction.core.fluid.TilePressureNode;
 import resonantinduction.core.grid.fluid.FluidPressureNode;
+import resonantinduction.core.grid.fluid.TilePressureNode;
 import universalelectricity.api.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java
index 0ec60719..c383d0ea 100644
--- a/archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java
+++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/gutter/TileGutter.java
@@ -35,9 +35,9 @@ import resonant.lib.utility.inventory.InventoryUtility;
 import resonantinduction.archaic.fluid.grate.TileGrate;
 import resonantinduction.core.Reference;
 import resonantinduction.core.ResonantInduction.RecipeType;
-import resonantinduction.core.fluid.TilePressureNode;
 import resonantinduction.core.grid.fluid.FluidPressureNode;
 import resonantinduction.core.grid.fluid.IPressureNodeProvider;
+import resonantinduction.core.grid.fluid.TilePressureNode;
 import universalelectricity.api.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java
index d6a793ae..7a71ca73 100644
--- a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java
+++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/ItemBlockTank.java
@@ -14,7 +14,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 import resonant.lib.utility.LanguageUtility;
 import resonantinduction.archaic.Archaic;
-import resonantinduction.core.fluid.TileFluidDistribution;
+import resonantinduction.core.grid.fluid.TileFluidDistribution;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import universalelectricity.api.energy.UnitDisplay.UnitPrefix;
diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java
index d5266010..9a7d1a95 100644
--- a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java
+++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TankNetwork.java
@@ -5,8 +5,8 @@ import java.util.LinkedList;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.FluidStack;
-import resonantinduction.core.fluid.FluidDistributionetwork;
-import resonantinduction.core.fluid.IFluidDistribution;
+import resonantinduction.core.grid.fluid.FluidDistributionetwork;
+import resonantinduction.core.grid.fluid.IFluidDistribution;
 
 /** Network that handles connected tanks
  * 
diff --git a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java
index b22e41b3..c5c77882 100644
--- a/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java
+++ b/archaic/src/main/scala/resonantinduction/archaic/fluid/tank/TileTank.java
@@ -28,9 +28,9 @@ import resonant.lib.utility.inventory.InventoryUtility;
 import resonant.lib.utility.render.RenderBlockUtility;
 import resonantinduction.archaic.Archaic;
 import resonantinduction.core.Reference;
-import resonantinduction.core.fluid.FluidDistributionetwork;
-import resonantinduction.core.fluid.IFluidDistribution;
-import resonantinduction.core.fluid.TileFluidDistribution;
+import resonantinduction.core.grid.fluid.FluidDistributionetwork;
+import resonantinduction.core.grid.fluid.IFluidDistribution;
+import resonantinduction.core.grid.fluid.TileFluidDistribution;
 import universalelectricity.api.UniversalElectricity;
 import universalelectricity.api.vector.Vector3;
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/scala/resonantinduction/core/fluid/FluidDistributionetwork.java b/src/main/scala/resonantinduction/core/grid/fluid/FluidDistributionetwork.java
similarity index 90%
rename from src/main/scala/resonantinduction/core/fluid/FluidDistributionetwork.java
rename to src/main/scala/resonantinduction/core/grid/fluid/FluidDistributionetwork.java
index 6da2d39f..e8099b3a 100644
--- a/src/main/scala/resonantinduction/core/fluid/FluidDistributionetwork.java
+++ b/src/main/scala/resonantinduction/core/grid/fluid/FluidDistributionetwork.java
@@ -1,4 +1,4 @@
-package resonantinduction.core.fluid;
+package resonantinduction.core.grid.fluid;
 
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -83,10 +83,7 @@ public abstract class FluidDistributionetwork extends NodeNetwork<FluidDistribut
 
     public int fill(IFluidDistribution source, ForgeDirection from, FluidStack resource, boolean doFill)
     {
-        System.out.println("FluidDistributionNetwork: Filling " + resource + "  Tank: " + this.getTank().getFluidAmount());
-        System.out.println("FluidDistributionNetwork: Tank Contains Fluid: " + getTank().getFluid() + "  Tank: " + this.getTank().getFluidAmount());
         int fill = this.getTank().fill(resource.copy(), doFill);
-        System.out.println("FluidDistributionNetwork: Filled " + fill + "  Tank: " + this.getTank().getFluidAmount());
         if (fill > 0)
         {
             needsUpdate = true;
diff --git a/src/main/scala/resonantinduction/core/fluid/IFluidDistribution.java b/src/main/scala/resonantinduction/core/grid/fluid/IFluidDistribution.java
similarity index 93%
rename from src/main/scala/resonantinduction/core/fluid/IFluidDistribution.java
rename to src/main/scala/resonantinduction/core/grid/fluid/IFluidDistribution.java
index 30be48fa..aa84633b 100644
--- a/src/main/scala/resonantinduction/core/fluid/IFluidDistribution.java
+++ b/src/main/scala/resonantinduction/core/grid/fluid/IFluidDistribution.java
@@ -1,4 +1,4 @@
-package resonantinduction.core.fluid;
+package resonantinduction.core.grid.fluid;
 
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.IFluidHandler;
diff --git a/src/main/scala/resonantinduction/core/fluid/TileFluidDistribution.java b/src/main/scala/resonantinduction/core/grid/fluid/TileFluidDistribution.java
similarity index 98%
rename from src/main/scala/resonantinduction/core/fluid/TileFluidDistribution.java
rename to src/main/scala/resonantinduction/core/grid/fluid/TileFluidDistribution.java
index 337534ae..80ea203c 100644
--- a/src/main/scala/resonantinduction/core/fluid/TileFluidDistribution.java
+++ b/src/main/scala/resonantinduction/core/grid/fluid/TileFluidDistribution.java
@@ -1,4 +1,4 @@
-package resonantinduction.core.fluid;
+package resonantinduction.core.grid.fluid;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/scala/resonantinduction/core/fluid/TileFluidNode.java b/src/main/scala/resonantinduction/core/grid/fluid/TileFluidNode.java
similarity index 99%
rename from src/main/scala/resonantinduction/core/fluid/TileFluidNode.java
rename to src/main/scala/resonantinduction/core/grid/fluid/TileFluidNode.java
index 66ef0724..24878c8a 100644
--- a/src/main/scala/resonantinduction/core/fluid/TileFluidNode.java
+++ b/src/main/scala/resonantinduction/core/grid/fluid/TileFluidNode.java
@@ -1,4 +1,4 @@
-package resonantinduction.core.fluid;
+package resonantinduction.core.grid.fluid;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/scala/resonantinduction/core/fluid/TilePressureNode.java b/src/main/scala/resonantinduction/core/grid/fluid/TilePressureNode.java
similarity index 92%
rename from src/main/scala/resonantinduction/core/fluid/TilePressureNode.java
rename to src/main/scala/resonantinduction/core/grid/fluid/TilePressureNode.java
index 2e0df5d3..60820944 100644
--- a/src/main/scala/resonantinduction/core/fluid/TilePressureNode.java
+++ b/src/main/scala/resonantinduction/core/grid/fluid/TilePressureNode.java
@@ -1,4 +1,4 @@
-package resonantinduction.core.fluid;
+package resonantinduction.core.grid.fluid;
 
 import net.minecraft.block.material.Material;
 import net.minecraftforge.common.ForgeDirection;
@@ -8,8 +8,6 @@ import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import resonant.api.grid.INode;
 import resonant.lib.network.IPacketReceiverWithID;
-import resonantinduction.core.grid.fluid.FluidPressureNode;
-import resonantinduction.core.grid.fluid.IPressureNodeProvider;
 
 /**
  * A prefab class for tiles that use the fluid network.