diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
index cf4d8da47..d33baa26b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
@@ -57,6 +57,8 @@ public final class RS {
         for (FluidStorageType type : FluidStorageType.values()) {
             e.getRegistry().register(new ItemFluidStoragePart(type));
         }
+
+        e.getRegistry().register(new ItemStorageHousing());
     }
 
     /* TODO
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java
index 11586f792..66567dd59 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java
@@ -1,16 +1,12 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
+import net.minecraft.item.Item;
 
-public class ItemStorageHousing extends ItemBase {
+public class ItemStorageHousing extends Item {
     public ItemStorageHousing() {
-        super(new ItemInfo(RS.ID, "storage_housing"));
+        super(new Item.Properties().group(RS.MAIN_GROUP));
+
+        this.setRegistryName(RS.ID, "storage_housing");
     }
-/* TODO
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerModels(IModelRegistration modelRegistration) {
-        modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
-    }*/
 }
diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.json b/src/main/resources/assets/refinedstorage/lang/en_us.json
index dc7a4f666..98cb2f412 100644
--- a/src/main/resources/assets/refinedstorage/lang/en_us.json
+++ b/src/main/resources/assets/refinedstorage/lang/en_us.json
@@ -267,7 +267,7 @@
   "item.refinedstorage:upgrade.7": "Fortune Upgrade",
   "item.refinedstorage:upgrade.8": "Fortune Upgrade",
   "item.refinedstorage:upgrade.9": "Fortune Upgrade",
-  "item.refinedstorage:storage_housing": "Storage Housing",
+  "item.refinedstorage.storage_housing": "Storage Housing",
   "item.refinedstorage:filter": "Filter",
   "item.refinedstorage.network_card": "Network Card",
   "item.refinedstorage:wrench": "Wrench",
diff --git a/src/main/resources/assets/refinedstorage/recipes/storage_housing.json b/src/main/resources/data/refinedstorage/recipes/storage_housing.json
similarity index 84%
rename from src/main/resources/assets/refinedstorage/recipes/storage_housing.json
rename to src/main/resources/data/refinedstorage/recipes/storage_housing.json
index 88dc0d873..c58e50d56 100644
--- a/src/main/resources/assets/refinedstorage/recipes/storage_housing.json
+++ b/src/main/resources/data/refinedstorage/recipes/storage_housing.json
@@ -7,8 +7,7 @@
   ],
   "key": {
     "G": {
-      "type": "forge:ore_dict",
-      "ore": "blockGlass"
+      "tag": "forge:glass"
     },
     "R": {
       "item": "minecraft:redstone"