diff --git a/src/main/java/refinedstorage/apiimpl/network/NetworkUtils.java b/src/main/java/refinedstorage/api/network/NetworkUtils.java
similarity index 89%
rename from src/main/java/refinedstorage/apiimpl/network/NetworkUtils.java
rename to src/main/java/refinedstorage/api/network/NetworkUtils.java
index eb7091dea..b5bb88a47 100755
--- a/src/main/java/refinedstorage/apiimpl/network/NetworkUtils.java
+++ b/src/main/java/refinedstorage/api/network/NetworkUtils.java
@@ -1,11 +1,12 @@
-package refinedstorage.apiimpl.network;
+package refinedstorage.api.network;
 
 import net.minecraft.item.ItemStack;
 import refinedstorage.api.autocrafting.ICraftingPattern;
-import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.storage.CompareUtils;
 
-// @TODO: Move this class to API
+/**
+ * Utilities for network manipulation.
+ */
 public final class NetworkUtils {
     public static ItemStack extractItem(INetworkMaster network, ItemStack stack, int size) {
         return network.extractItem(stack, size, CompareUtils.COMPARE_DAMAGE | CompareUtils.COMPARE_NBT);
diff --git a/src/main/java/refinedstorage/api/storage/IGroupedStorage.java b/src/main/java/refinedstorage/api/storage/IGroupedStorage.java
index 161f2acc4..887f823ed 100755
--- a/src/main/java/refinedstorage/api/storage/IGroupedStorage.java
+++ b/src/main/java/refinedstorage/api/storage/IGroupedStorage.java
@@ -56,7 +56,7 @@ public interface IGroupedStorage {
     ItemStack get(@Nonnull ItemStack stack, int flags);
 
     /**
-     * Gets an item from the network by hash.
+     * Gets an item from the network by hash, see {@link refinedstorage.api.network.NetworkUtils#getItemStackHashCode(ItemStack)}.
      *
      * @return Null if no item is found matching the hash, or the {@link ItemStack}, do NOT modify
      */
diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java b/src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java
index 32647b06f..6f0f1f723 100755
--- a/src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java
+++ b/src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java
@@ -9,7 +9,7 @@ import net.minecraftforge.common.util.Constants;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.apiimpl.network.NetworkUtils;
+import refinedstorage.api.network.NetworkUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java b/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
index a71515321..31f04b17a 100755
--- a/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
+++ b/src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
@@ -8,8 +8,8 @@ import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.ICraftingPatternContainer;
 import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.network.INetworkMaster;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.storage.CompareUtils;
-import refinedstorage.apiimpl.network.NetworkUtils;
 
 public class ProcessingCraftingTask implements ICraftingTask {
     public static final int ID = 1;
diff --git a/src/main/java/refinedstorage/apiimpl/network/GridHandler.java b/src/main/java/refinedstorage/apiimpl/network/GridHandler.java
index c3ec103eb..dcc2bb780 100755
--- a/src/main/java/refinedstorage/apiimpl/network/GridHandler.java
+++ b/src/main/java/refinedstorage/apiimpl/network/GridHandler.java
@@ -8,6 +8,7 @@ import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.network.GridExtractFlags;
 import refinedstorage.api.network.IGridHandler;
 import refinedstorage.api.network.INetworkMaster;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.storage.CompareUtils;
 
 public class GridHandler implements IGridHandler {
diff --git a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
index b160082ac..be2aa0b27 100755
--- a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
+++ b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
@@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack;
 import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.INetworkNode;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.IGroupedStorage;
 import refinedstorage.api.storage.IStorage;
 import refinedstorage.api.storage.IStorageProvider;
-import refinedstorage.apiimpl.network.NetworkUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java
index 39c4a1d45..16686409b 100755
--- a/src/main/java/refinedstorage/block/BlockController.java
+++ b/src/main/java/refinedstorage/block/BlockController.java
@@ -20,7 +20,7 @@ import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.RefinedStorageGui;
-import refinedstorage.apiimpl.network.NetworkUtils;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.item.ItemBlockController;
 import refinedstorage.tile.controller.TileController;
 
diff --git a/src/main/java/refinedstorage/block/BlockNode.java b/src/main/java/refinedstorage/block/BlockNode.java
index ea9d1dcf5..8156606eb 100755
--- a/src/main/java/refinedstorage/block/BlockNode.java
+++ b/src/main/java/refinedstorage/block/BlockNode.java
@@ -11,7 +11,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.apiimpl.network.NetworkUtils;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.tile.TileNode;
 
 public abstract class BlockNode extends BlockBase {
diff --git a/src/main/java/refinedstorage/gui/grid/ClientStack.java b/src/main/java/refinedstorage/gui/grid/ClientStack.java
index a9cc647b5..6532fa381 100755
--- a/src/main/java/refinedstorage/gui/grid/ClientStack.java
+++ b/src/main/java/refinedstorage/gui/grid/ClientStack.java
@@ -5,7 +5,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.apiimpl.network.NetworkUtils;
+import refinedstorage.api.network.NetworkUtils;
 
 public class ClientStack {
     private int id;
diff --git a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
index 4bf77d363..0b7dfff89 100755
--- a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
+++ b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
@@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageItems;
-import refinedstorage.apiimpl.network.NetworkUtils;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.container.ContainerNetworkTransmitter;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerUpgrade;
diff --git a/src/main/java/refinedstorage/tile/TileNode.java b/src/main/java/refinedstorage/tile/TileNode.java
index f4159bf61..b0c35f2c9 100755
--- a/src/main/java/refinedstorage/tile/TileNode.java
+++ b/src/main/java/refinedstorage/tile/TileNode.java
@@ -7,7 +7,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.INetworkNode;
-import refinedstorage.apiimpl.network.NetworkUtils;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.block.BlockNode;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 import refinedstorage.tile.config.RedstoneMode;
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index d34ca5a8d..900e5c0fb 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -34,7 +34,6 @@ import refinedstorage.apiimpl.autocrafting.CraftingPattern;
 import refinedstorage.apiimpl.autocrafting.ProcessingCraftingTask;
 import refinedstorage.apiimpl.network.GridHandler;
 import refinedstorage.apiimpl.network.NetworkNodeGraph;
-import refinedstorage.apiimpl.network.NetworkUtils;
 import refinedstorage.apiimpl.network.WirelessGridHandler;
 import refinedstorage.apiimpl.storage.GroupedStorage;
 import refinedstorage.block.BlockController;
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index e2a0c1a3e..0f14802d5 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -15,8 +15,8 @@ import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.api.network.IGridHandler;
+import refinedstorage.api.network.NetworkUtils;
 import refinedstorage.api.storage.CompareUtils;
-import refinedstorage.apiimpl.network.NetworkUtils;
 import refinedstorage.block.BlockGrid;
 import refinedstorage.block.EnumGridType;
 import refinedstorage.container.ContainerGrid;