diff --git a/src/main/java/refinedstorage/api/RefinedStorageAPI.java b/src/main/java/refinedstorage/api/RefinedStorageAPI.java
index 8ae613dc1..ebef434ae 100755
--- a/src/main/java/refinedstorage/api/RefinedStorageAPI.java
+++ b/src/main/java/refinedstorage/api/RefinedStorageAPI.java
@@ -4,7 +4,7 @@ import refinedstorage.api.solderer.ISoldererRegistry;
 
 public final class RefinedStorageAPI {
     /**
-     * The solderer registry, set in pre-initialization.
+     * The solderer registry, set in pre-initialization
      */
     public static ISoldererRegistry SOLDERER_REGISTRY;
 }
diff --git a/src/main/java/refinedstorage/api/network/INetworkMaster.java b/src/main/java/refinedstorage/api/network/INetworkMaster.java
index 638337f03..8e7877e88 100755
--- a/src/main/java/refinedstorage/api/network/INetworkMaster.java
+++ b/src/main/java/refinedstorage/api/network/INetworkMaster.java
@@ -7,7 +7,7 @@ import net.minecraft.util.math.BlockPos;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.network.grid.IItemGridHandler;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.item.IGroupedItemStorage;
 
 import javax.annotation.Nonnull;
diff --git a/src/main/java/refinedstorage/api/network/INetworkNodeGraph.java b/src/main/java/refinedstorage/api/network/INetworkNodeGraph.java
index 3b758e3d7..e63db1ae9 100755
--- a/src/main/java/refinedstorage/api/network/INetworkNodeGraph.java
+++ b/src/main/java/refinedstorage/api/network/INetworkNodeGraph.java
@@ -1,7 +1,7 @@
 package refinedstorage.api.network;
 
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.WorldProvider;
+import net.minecraft.world.World;
 
 import java.util.List;
 import java.util.Set;
@@ -24,9 +24,7 @@ public interface INetworkNodeGraph {
     List<INetworkNode> all();
 
     /**
-     * These hashes are calculated like this: 31 * {@link BlockPos#hashCode()} + {@link WorldProvider#getDimension()}
-     *
-     * @return A set of hashes of all connected nodes
+     * @return A set of hashes of all connected nodes, see {@link NetworkUtils#getNodeHashCode(World, INetworkNode)}
      */
     Set<Integer> allHashes();
 
diff --git a/src/main/java/refinedstorage/api/network/NetworkUtils.java b/src/main/java/refinedstorage/api/network/NetworkUtils.java
index 3a1d56e1f..2c250ec31 100755
--- a/src/main/java/refinedstorage/api/network/NetworkUtils.java
+++ b/src/main/java/refinedstorage/api/network/NetworkUtils.java
@@ -1,8 +1,9 @@
 package refinedstorage.api.network;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 
 /**
  * Utilities for network manipulation.
@@ -27,4 +28,10 @@ public final class NetworkUtils {
     public static int getItemStackHashCode(ItemStack stack) {
         return stack.getItem().hashCode() * (stack.getItemDamage() + 1) * (stack.hasTagCompound() ? stack.getTagCompound().hashCode() : 1);
     }
+
+    public static int getNodeHashCode(World world, INetworkNode node) {
+        int result = node.getPosition().hashCode();
+        result = 31 * result + world.provider.getDimension();
+        return result;
+    }
 }
diff --git a/src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java b/src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java
index 484a22dde..edbaa231b 100755
--- a/src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java
+++ b/src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import javax.annotation.Nullable;
 
 /**
- * Defines the behavior of grids.
+ * Defines the behavior of item grids.
  */
 public interface IItemGridHandler {
     /**
diff --git a/src/main/java/refinedstorage/api/storage/item/CompareUtils.java b/src/main/java/refinedstorage/api/storage/CompareUtils.java
similarity index 97%
rename from src/main/java/refinedstorage/api/storage/item/CompareUtils.java
rename to src/main/java/refinedstorage/api/storage/CompareUtils.java
index 8b340c15e..83cfa7ffb 100755
--- a/src/main/java/refinedstorage/api/storage/item/CompareUtils.java
+++ b/src/main/java/refinedstorage/api/storage/CompareUtils.java
@@ -1,11 +1,11 @@
-package refinedstorage.api.storage.item;
+package refinedstorage.api.storage;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 import org.apache.commons.lang3.ArrayUtils;
 
 /**
- * Utilities for comparing {@link ItemStack}.
+ * Utilities for comparing.
  */
 public final class CompareUtils {
     public static final int COMPARE_DAMAGE = 1;
diff --git a/src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java b/src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java
index 55bd1ac22..310d71092 100755
--- a/src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java
+++ b/src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java
@@ -2,6 +2,7 @@ package refinedstorage.api.storage.item;
 
 import net.minecraft.item.ItemStack;
 import refinedstorage.api.network.INetworkMaster;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.IStorageProvider;
 
 import javax.annotation.Nonnull;
@@ -18,8 +19,7 @@ import java.util.List;
  */
 public interface IGroupedItemStorage {
     /**
-     * Rebuilds the storages and items for a network. Typically called when a {@link IStorageProvider} is
-     * added or removed from the network.
+     * Rebuilds the global item list. Typically called when a {@link IStorageProvider} is added or removed from the network.
      */
     void rebuild();
 
@@ -70,7 +70,7 @@ public interface IGroupedItemStorage {
     Collection<ItemStack> getStacks();
 
     /**
-     * @return The storages connected to this network
+     * @return The item storages connected to this network
      */
     List<IItemStorage> getStorages();
 }
diff --git a/src/main/java/refinedstorage/api/storage/item/IItemStorage.java b/src/main/java/refinedstorage/api/storage/item/IItemStorage.java
index 5ceae03f4..8b6add79b 100755
--- a/src/main/java/refinedstorage/api/storage/item/IItemStorage.java
+++ b/src/main/java/refinedstorage/api/storage/item/IItemStorage.java
@@ -1,6 +1,7 @@
 package refinedstorage.api.storage.item;
 
 import net.minecraft.item.ItemStack;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.IStorageProvider;
 
 import javax.annotation.Nonnull;
diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java b/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java
index 47eb86931..54342d0c4 100755
--- a/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java
+++ b/src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java
@@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 
 public class CraftingTaskScheduler {
     private static final String NBT_SCHEDULED = "CraftingTaskScheduled";
diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java b/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
index f5fb0e38a..31f04b17a 100755
--- a/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
+++ b/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
@@ -9,7 +9,7 @@ import refinedstorage.api.autocrafting.ICraftingPatternContainer;
 import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.NetworkUtils;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 
 public class ProcessingCraftingTask implements ICraftingTask {
     public static final int ID = 1;
diff --git a/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java
index 8973ab683..4f9b27336 100755
--- a/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java
+++ b/src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java
@@ -9,7 +9,7 @@ import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.network.grid.GridExtractFlags;
 import refinedstorage.api.network.grid.IItemGridHandler;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 
 public class ItemGridHandler implements IItemGridHandler {
     public static final int MAX_CRAFTING_PER_REQUEST = 500;
diff --git a/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java
index f2ca40c22..562c98c35 100755
--- a/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java
+++ b/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java
@@ -7,6 +7,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 import refinedstorage.api.network.INetworkNode;
 import refinedstorage.api.network.INetworkNodeGraph;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.tile.TileController;
 import refinedstorage.tile.TileNetworkTransmitter;
 
@@ -22,12 +23,6 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
         this.controller = controller;
     }
 
-    private int hashNode(World world, INetworkNode node) {
-        int result = node.getPosition().hashCode();
-        result = 31 * result + world.provider.getDimension();
-        return result;
-    }
-
     @Override
     public void rebuild(BlockPos start, boolean notify) {
         if (!controller.canRun()) {
@@ -71,7 +66,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
             INetworkNode node = (INetworkNode) tile;
 
             newNodes.add(node);
-            newNodeHashes.add(hashNode(world, node));
+            newNodeHashes.add(NetworkUtils.getNodeHashCode(world, node));
 
             if (tile instanceof TileNetworkTransmitter) {
                 final TileNetworkTransmitter transmitter = (TileNetworkTransmitter) tile;
@@ -120,7 +115,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
             boolean changed = false;
 
             for (INetworkNode newNode : nodes) {
-                if (!oldNodeHashes.contains(hashNode(newNode.getNodeWorld(), newNode))) {
+                if (!oldNodeHashes.contains(NetworkUtils.getNodeHashCode(newNode.getNodeWorld(), newNode))) {
                     newNode.onConnected(controller);
 
                     changed = true;
@@ -128,7 +123,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
             }
 
             for (INetworkNode oldNode : oldNodes) {
-                if (!nodeHashes.contains(hashNode(oldNode.getNodeWorld(), oldNode))) {
+                if (!nodeHashes.contains(NetworkUtils.getNodeHashCode(oldNode.getNodeWorld(), oldNode))) {
                     oldNode.onDisconnected(controller);
 
                     changed = true;
diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java b/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java
index 04f0b5162..971b5aade 100755
--- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java
+++ b/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java
@@ -3,7 +3,7 @@ package refinedstorage.apiimpl.solderer;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.api.solderer.ISoldererRecipe;
 import refinedstorage.api.solderer.ISoldererRegistry;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java b/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java
index 090ca1557..4c751672e 100755
--- a/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java
+++ b/src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java
@@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.NetworkUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.IStorageProvider;
-import refinedstorage.api.storage.item.CompareUtils;
 import refinedstorage.api.storage.item.IGroupedItemStorage;
 import refinedstorage.api.storage.item.IItemStorage;
 
diff --git a/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java b/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java
index d8f807feb..ab98cc810 100755
--- a/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java
+++ b/src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java
@@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.item.IItemStorage;
 
 import javax.annotation.Nullable;
diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java
index 0a1e7f294..896b211e5 100755
--- a/src/main/java/refinedstorage/container/ContainerBase.java
+++ b/src/main/java/refinedstorage/container/ContainerBase.java
@@ -6,7 +6,7 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.slot.SlotDisabled;
 import refinedstorage.container.slot.SlotSpecimen;
 import refinedstorage.container.slot.SlotSpecimenLegacy;
diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java
index c1aae68a4..a3c48e8f7 100755
--- a/src/main/java/refinedstorage/container/ContainerGrid.java
+++ b/src/main/java/refinedstorage/container/ContainerGrid.java
@@ -104,8 +104,8 @@ public class ContainerGrid extends ContainerBase {
             if (slot.getHasStack()) {
                 if (slot == craftingResultSlot) {
                     ((TileGrid) grid).onCraftedShift(this, player);
-                } else if (grid.getGridHandler() != null && slot != patternResultSlot && !(slot instanceof SlotSpecimenLegacy)) {
-                    slot.putStack(grid.getGridHandler().onInsert(slot.getStack()));
+                } else if (grid.getHandler() != null && slot != patternResultSlot && !(slot instanceof SlotSpecimenLegacy)) {
+                    slot.putStack(grid.getHandler().onInsert(slot.getStack()));
 
                     detectAndSendChanges();
                 }
diff --git a/src/main/java/refinedstorage/gui/GuiConstructor.java b/src/main/java/refinedstorage/gui/GuiConstructor.java
index 7aed1efd5..50bca551c 100755
--- a/src/main/java/refinedstorage/gui/GuiConstructor.java
+++ b/src/main/java/refinedstorage/gui/GuiConstructor.java
@@ -1,6 +1,6 @@
 package refinedstorage.gui;
 
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerConstructor;
 import refinedstorage.gui.sidebutton.SideButtonCompare;
 import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java
index d703a3cd0..24b62adaa 100755
--- a/src/main/java/refinedstorage/gui/GuiDestructor.java
+++ b/src/main/java/refinedstorage/gui/GuiDestructor.java
@@ -1,6 +1,6 @@
 package refinedstorage.gui;
 
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerDestructor;
 import refinedstorage.gui.sidebutton.SideButtonCompare;
 import refinedstorage.gui.sidebutton.SideButtonMode;
diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java
index 10e746d6b..230fa761c 100755
--- a/src/main/java/refinedstorage/gui/GuiDetector.java
+++ b/src/main/java/refinedstorage/gui/GuiDetector.java
@@ -2,7 +2,7 @@ package refinedstorage.gui;
 
 import com.google.common.primitives.Ints;
 import net.minecraft.client.gui.GuiTextField;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerDetector;
 import refinedstorage.gui.sidebutton.SideButtonCompare;
 import refinedstorage.gui.sidebutton.SideButtonDetectorMode;
diff --git a/src/main/java/refinedstorage/gui/GuiExporter.java b/src/main/java/refinedstorage/gui/GuiExporter.java
index 31499faba..387f8b612 100755
--- a/src/main/java/refinedstorage/gui/GuiExporter.java
+++ b/src/main/java/refinedstorage/gui/GuiExporter.java
@@ -1,6 +1,6 @@
 package refinedstorage.gui;
 
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerExporter;
 import refinedstorage.gui.sidebutton.SideButtonCompare;
 import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
diff --git a/src/main/java/refinedstorage/gui/GuiGridFilter.java b/src/main/java/refinedstorage/gui/GuiGridFilter.java
index 0c8aa7f13..8d6b119ed 100755
--- a/src/main/java/refinedstorage/gui/GuiGridFilter.java
+++ b/src/main/java/refinedstorage/gui/GuiGridFilter.java
@@ -3,7 +3,7 @@ package refinedstorage.gui;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
 import refinedstorage.RefinedStorage;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerGridFilter;
 import refinedstorage.item.ItemGridFilter;
 import refinedstorage.network.MessageGridFilterUpdate;
diff --git a/src/main/java/refinedstorage/gui/GuiImporter.java b/src/main/java/refinedstorage/gui/GuiImporter.java
index 61cc6b9ff..384cbec40 100755
--- a/src/main/java/refinedstorage/gui/GuiImporter.java
+++ b/src/main/java/refinedstorage/gui/GuiImporter.java
@@ -1,6 +1,6 @@
 package refinedstorage.gui;
 
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerImporter;
 import refinedstorage.gui.sidebutton.SideButtonCompare;
 import refinedstorage.gui.sidebutton.SideButtonMode;
diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/refinedstorage/gui/GuiInterface.java
index fe907e5c8..627456013 100755
--- a/src/main/java/refinedstorage/gui/GuiInterface.java
+++ b/src/main/java/refinedstorage/gui/GuiInterface.java
@@ -1,6 +1,6 @@
 package refinedstorage.gui;
 
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerInterface;
 import refinedstorage.gui.sidebutton.SideButtonCompare;
 import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java
index c00cef7a9..fff34ef1c 100755
--- a/src/main/java/refinedstorage/gui/GuiStorage.java
+++ b/src/main/java/refinedstorage/gui/GuiStorage.java
@@ -2,7 +2,7 @@ package refinedstorage.gui;
 
 import com.google.common.primitives.Ints;
 import net.minecraft.client.gui.GuiTextField;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.ContainerStorage;
 import refinedstorage.gui.sidebutton.SideButtonCompare;
 import refinedstorage.gui.sidebutton.SideButtonMode;
diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
index 7a0f4e4bf..e18c55921 100755
--- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
@@ -14,7 +14,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import refinedstorage.RefinedStorage;
 import refinedstorage.api.network.grid.GridExtractFlags;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.block.EnumGridType;
 import refinedstorage.container.ContainerGrid;
 import refinedstorage.gui.GuiBase;
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
index c659fbeb2..aad6ddfda 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
@@ -1,7 +1,7 @@
 package refinedstorage.gui.sidebutton;
 
 import net.minecraft.util.text.TextFormatting;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.gui.GuiBase;
 import refinedstorage.tile.data.TileDataManager;
 import refinedstorage.tile.data.TileDataParameter;
diff --git a/src/main/java/refinedstorage/item/ItemGridFilter.java b/src/main/java/refinedstorage/item/ItemGridFilter.java
index 0c2dd10c3..81048e31e 100755
--- a/src/main/java/refinedstorage/item/ItemGridFilter.java
+++ b/src/main/java/refinedstorage/item/ItemGridFilter.java
@@ -10,7 +10,7 @@ import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
 import refinedstorage.RefinedStorageItems;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerGridFilter;
 
 import java.util.List;
diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java
index fb5c30c85..3ab1897aa 100755
--- a/src/main/java/refinedstorage/item/ItemPattern.java
+++ b/src/main/java/refinedstorage/item/ItemPattern.java
@@ -13,7 +13,7 @@ import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
 import refinedstorage.RefinedStorageItems;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingStart.java b/src/main/java/refinedstorage/network/MessageGridCraftingStart.java
index 023e6c832..bb28f4106 100755
--- a/src/main/java/refinedstorage/network/MessageGridCraftingStart.java
+++ b/src/main/java/refinedstorage/network/MessageGridCraftingStart.java
@@ -36,7 +36,7 @@ public class MessageGridCraftingStart extends MessageHandlerPlayerToServer<Messa
         Container container = player.openContainer;
 
         if (container instanceof ContainerGrid) {
-            IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
+            IItemGridHandler handler = ((ContainerGrid) container).getGrid().getHandler();
 
             if (handler != null) {
                 handler.onCraftingRequested(message.id, message.quantity);
diff --git a/src/main/java/refinedstorage/network/MessageGridInsertHeld.java b/src/main/java/refinedstorage/network/MessageGridInsertHeld.java
index 0970bc2db..d931e944e 100755
--- a/src/main/java/refinedstorage/network/MessageGridInsertHeld.java
+++ b/src/main/java/refinedstorage/network/MessageGridInsertHeld.java
@@ -32,7 +32,7 @@ public class MessageGridInsertHeld extends MessageHandlerPlayerToServer<MessageG
         Container container = player.openContainer;
 
         if (container instanceof ContainerGrid) {
-            IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
+            IItemGridHandler handler = ((ContainerGrid) container).getGrid().getHandler();
 
             if (handler != null) {
                 handler.onInsertHeldItem(message.single, player);
diff --git a/src/main/java/refinedstorage/network/MessageGridPull.java b/src/main/java/refinedstorage/network/MessageGridPull.java
index 7d6eb1093..fa6517c2d 100755
--- a/src/main/java/refinedstorage/network/MessageGridPull.java
+++ b/src/main/java/refinedstorage/network/MessageGridPull.java
@@ -36,7 +36,7 @@ public class MessageGridPull extends MessageHandlerPlayerToServer<MessageGridPul
         Container container = player.openContainer;
 
         if (container instanceof ContainerGrid) {
-            IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
+            IItemGridHandler handler = ((ContainerGrid) container).getGrid().getHandler();
 
             if (handler != null) {
                 handler.onExtract(message.id, message.flags, player);
diff --git a/src/main/java/refinedstorage/tile/ClientNode.java b/src/main/java/refinedstorage/tile/ClientNode.java
index 0181127a8..47723884e 100755
--- a/src/main/java/refinedstorage/tile/ClientNode.java
+++ b/src/main/java/refinedstorage/tile/ClientNode.java
@@ -1,7 +1,7 @@
 package refinedstorage.tile;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 
 public class ClientNode {
     private ItemStack stack;
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index a189aeee3..ac15d8034 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -22,7 +22,7 @@ import refinedstorage.api.autocrafting.ICraftingPatternContainer;
 import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.network.*;
 import refinedstorage.api.network.grid.IItemGridHandler;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.item.IGroupedItemStorage;
 import refinedstorage.api.storage.item.IItemStorage;
 import refinedstorage.apiimpl.autocrafting.BasicCraftingTask;
diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java
index c4049faa3..74e4c94ff 100755
--- a/src/main/java/refinedstorage/tile/TileSolderer.java
+++ b/src/main/java/refinedstorage/tile/TileSolderer.java
@@ -11,7 +11,7 @@ import refinedstorage.RefinedStorage;
 import refinedstorage.api.RefinedStorageAPI;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.solderer.ISoldererRecipe;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerSolderer;
 import refinedstorage.inventory.ItemHandlerUpgrade;
diff --git a/src/main/java/refinedstorage/tile/config/IFilterable.java b/src/main/java/refinedstorage/tile/config/IFilterable.java
index ebfcb883b..6b2b7beb2 100755
--- a/src/main/java/refinedstorage/tile/config/IFilterable.java
+++ b/src/main/java/refinedstorage/tile/config/IFilterable.java
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.network.datasync.DataSerializers;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.items.IItemHandler;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.tile.data.ITileDataConsumer;
 import refinedstorage.tile.data.ITileDataProducer;
 import refinedstorage.tile.data.TileDataParameter;
diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java
index c77a689e5..5ebc46d65 100755
--- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java
+++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java
@@ -3,7 +3,7 @@ package refinedstorage.tile.externalstorage;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.ItemHandlerHelper;
 import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.tile.config.IFilterable;
 
 import javax.annotation.Nonnull;
diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java
index 71871665f..e1342d3ee 100755
--- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java
+++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java
@@ -4,7 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer;
 import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.tile.config.IFilterable;
 
 import java.util.Collections;
diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java
index 71fe7d826..5973d041b 100755
--- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java
+++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java
@@ -1,7 +1,7 @@
 package refinedstorage.tile.externalstorage;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.item.IItemStorage;
 
 import java.util.List;
diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
index 3ea54ec06..3a7227cd7 100755
--- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
+++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
@@ -3,7 +3,7 @@ package refinedstorage.tile.externalstorage;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.tile.config.IFilterable;
 
 import java.util.ArrayList;
diff --git a/src/main/java/refinedstorage/tile/grid/IGrid.java b/src/main/java/refinedstorage/tile/grid/IGrid.java
index a2d57de94..ee61a38e4 100755
--- a/src/main/java/refinedstorage/tile/grid/IGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/IGrid.java
@@ -14,7 +14,7 @@ public interface IGrid {
 
     BlockPos getNetworkPosition();
 
-    IItemGridHandler getGridHandler();
+    IItemGridHandler getHandler();
 
     int getViewType();
 
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index 2a4845557..ac4c04741 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -17,7 +17,7 @@ import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.network.grid.IItemGridHandler;
-import refinedstorage.api.storage.item.CompareUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.block.BlockGrid;
 import refinedstorage.block.EnumGridType;
 import refinedstorage.container.ContainerGrid;
@@ -195,7 +195,7 @@ public class TileGrid extends TileNode implements IGrid {
     }
 
     @Override
-    public IItemGridHandler getGridHandler() {
+    public IItemGridHandler getHandler() {
         return isConnected() ? network.getItemGridHandler() : null;
     }
 
diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
index 64733131b..03d7791db 100755
--- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
@@ -84,7 +84,7 @@ public class WirelessGrid implements IGrid {
     }
 
     @Override
-    public IItemGridHandler getGridHandler() {
+    public IItemGridHandler getHandler() {
         TileController controller = getController();
 
         return controller != null ? controller.getItemGridHandler() : null;