diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index ade3815d8..1fbd68855 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -22,7 +22,7 @@ import refinedstorage.network.GridPullFlags;
 import refinedstorage.network.MessageGridCraftingClear;
 import refinedstorage.network.MessageGridCraftingPush;
 import refinedstorage.network.MessageGridPatternCreate;
-import refinedstorage.storage.ClientItem;
+import refinedstorage.tile.ClientItem;
 import refinedstorage.tile.grid.IGrid;
 import refinedstorage.tile.grid.TileGrid;
 import refinedstorage.tile.grid.WirelessGrid;
diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java
index 851fe6c04..0ae7e5312 100755
--- a/src/main/java/refinedstorage/gui/GuiHandler.java
+++ b/src/main/java/refinedstorage/gui/GuiHandler.java
@@ -9,7 +9,6 @@ import net.minecraftforge.fml.common.network.IGuiHandler;
 import refinedstorage.RefinedStorageGui;
 import refinedstorage.RefinedStorageUtils;
 import refinedstorage.container.*;
-import refinedstorage.storage.IStorageGui;
 import refinedstorage.tile.*;
 import refinedstorage.tile.controller.TileController;
 import refinedstorage.tile.grid.TileGrid;
diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java
index 6128abcfd..541cfaa5e 100755
--- a/src/main/java/refinedstorage/gui/GuiStorage.java
+++ b/src/main/java/refinedstorage/gui/GuiStorage.java
@@ -7,7 +7,7 @@ import refinedstorage.container.ContainerStorage;
 import refinedstorage.gui.sidebutton.SideButtonCompare;
 import refinedstorage.gui.sidebutton.SideButtonMode;
 import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
-import refinedstorage.storage.IStorageGui;
+import refinedstorage.tile.IStorageGui;
 
 import java.io.IOException;
 
diff --git a/src/main/java/refinedstorage/network/MessageGridItems.java b/src/main/java/refinedstorage/network/MessageGridItems.java
index 7c4f08207..bdee957c4 100755
--- a/src/main/java/refinedstorage/network/MessageGridItems.java
+++ b/src/main/java/refinedstorage/network/MessageGridItems.java
@@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.container.ContainerGrid;
-import refinedstorage.storage.ClientItem;
+import refinedstorage.tile.ClientItem;
 import refinedstorage.tile.controller.TileController;
 
 import java.util.ArrayList;
diff --git a/src/main/java/refinedstorage/storage/ClientItem.java b/src/main/java/refinedstorage/tile/ClientItem.java
similarity index 91%
rename from src/main/java/refinedstorage/storage/ClientItem.java
rename to src/main/java/refinedstorage/tile/ClientItem.java
index 62f3fd63a..7f93793e9 100755
--- a/src/main/java/refinedstorage/storage/ClientItem.java
+++ b/src/main/java/refinedstorage/tile/ClientItem.java
@@ -1,4 +1,4 @@
-package refinedstorage.storage;
+package refinedstorage.tile;
 
 import net.minecraft.item.ItemStack;
 
diff --git a/src/main/java/refinedstorage/storage/IStorageGui.java b/src/main/java/refinedstorage/tile/IStorageGui.java
similarity index 90%
rename from src/main/java/refinedstorage/storage/IStorageGui.java
rename to src/main/java/refinedstorage/tile/IStorageGui.java
index 6697083f6..257b802f0 100755
--- a/src/main/java/refinedstorage/storage/IStorageGui.java
+++ b/src/main/java/refinedstorage/tile/IStorageGui.java
@@ -1,26 +1,26 @@
-package refinedstorage.storage;
-
-import net.minecraftforge.items.IItemHandler;
-import refinedstorage.tile.config.ICompareConfig;
-import refinedstorage.tile.config.IModeConfig;
-import refinedstorage.tile.config.IRedstoneModeConfig;
-
-public interface IStorageGui {
-    String getGuiTitle();
-
-    int getPriority();
-
-    void onPriorityChanged(int priority);
-
-    IItemHandler getFilters();
-
-    IRedstoneModeConfig getRedstoneModeConfig();
-
-    ICompareConfig getCompareConfig();
-
-    IModeConfig getModeConfig();
-
-    int getStored();
-
-    int getCapacity();
-}
+package refinedstorage.tile;
+
+import net.minecraftforge.items.IItemHandler;
+import refinedstorage.tile.config.ICompareConfig;
+import refinedstorage.tile.config.IModeConfig;
+import refinedstorage.tile.config.IRedstoneModeConfig;
+
+public interface IStorageGui {
+    String getGuiTitle();
+
+    int getPriority();
+
+    void onPriorityChanged(int priority);
+
+    IItemHandler getFilters();
+
+    IRedstoneModeConfig getRedstoneModeConfig();
+
+    ICompareConfig getCompareConfig();
+
+    IModeConfig getModeConfig();
+
+    int getStored();
+
+    int getCapacity();
+}
diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java
index 9806e2b89..5f6fbd13d 100755
--- a/src/main/java/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java
@@ -20,7 +20,6 @@ import refinedstorage.container.ContainerDiskDrive;
 import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.inventory.BasicItemValidator;
 import refinedstorage.network.MessagePriorityUpdate;
-import refinedstorage.storage.IStorageGui;
 import refinedstorage.tile.config.*;
 
 import java.util.List;
diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java
index d26e5ac2f..8f85effe8 100755
--- a/src/main/java/refinedstorage/tile/TileExternalStorage.java
+++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java
@@ -17,7 +17,6 @@ import refinedstorage.api.storage.IStorageProvider;
 import refinedstorage.container.ContainerStorage;
 import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.network.MessagePriorityUpdate;
-import refinedstorage.storage.IStorageGui;
 import refinedstorage.tile.config.ICompareConfig;
 import refinedstorage.tile.config.IModeConfig;
 import refinedstorage.tile.config.IRedstoneModeConfig;
diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
index b407b2853..b7307e802 100755
--- a/src/main/java/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -19,7 +19,6 @@ import refinedstorage.block.EnumStorageType;
 import refinedstorage.container.ContainerStorage;
 import refinedstorage.inventory.BasicItemHandler;
 import refinedstorage.network.MessagePriorityUpdate;
-import refinedstorage.storage.IStorageGui;
 import refinedstorage.tile.config.*;
 
 import java.util.List;
diff --git a/src/main/java/refinedstorage/tile/grid/IGrid.java b/src/main/java/refinedstorage/tile/grid/IGrid.java
index 034c5ca6a..353bbe9c9 100755
--- a/src/main/java/refinedstorage/tile/grid/IGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/IGrid.java
@@ -2,7 +2,7 @@ package refinedstorage.tile.grid;
 
 import net.minecraft.util.math.BlockPos;
 import refinedstorage.block.EnumGridType;
-import refinedstorage.storage.ClientItem;
+import refinedstorage.tile.ClientItem;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 
 import java.util.List;
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index 10d87359d..3477e0c80 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -24,7 +24,7 @@ import refinedstorage.network.MessageGridCraftingStart;
 import refinedstorage.network.MessageGridSettingsUpdate;
 import refinedstorage.network.MessageGridStoragePull;
 import refinedstorage.network.MessageGridStoragePush;
-import refinedstorage.storage.ClientItem;
+import refinedstorage.tile.ClientItem;
 import refinedstorage.tile.TileMachine;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 
diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
index 16974cab3..7d495dc59 100755
--- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
@@ -13,7 +13,7 @@ import refinedstorage.network.MessageWirelessGridCraftingStart;
 import refinedstorage.network.MessageWirelessGridSettingsUpdate;
 import refinedstorage.network.MessageWirelessGridStoragePull;
 import refinedstorage.network.MessageWirelessGridStoragePush;
-import refinedstorage.storage.ClientItem;
+import refinedstorage.tile.ClientItem;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 import refinedstorage.tile.controller.TileController;