diff --git a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java
index 8ce662e..43390ac 100644
--- a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java
+++ b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java
@@ -276,7 +276,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory {
         {
             this.numUsingPlayers = 0;
             float var1 = 5.0F;
-            List var2 = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double)((float)this.xCoord - var1), (double)((float)this.yCoord - var1), (double)((float)this.zCoord - var1), (double)((float)(this.xCoord + 1) + var1), (double)((float)(this.yCoord + 1) + var1), (double)((float)(this.zCoord + 1) + var1)));
+            List var2 = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB((double)((float)this.xCoord - var1), (double)((float)this.yCoord - var1), (double)((float)this.zCoord - var1), (double)((float)(this.xCoord + 1) + var1), (double)((float)(this.yCoord + 1) + var1), (double)((float)(this.zCoord + 1) + var1)));
             Iterator var3 = var2.iterator();
 
             while (var3.hasNext())
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/block_textures.png b/IronChests2/resources/cpw/mods/ironchest/sprites/block_textures.png
deleted file mode 100644
index 8b525c1..0000000
Binary files a/IronChests2/resources/cpw/mods/ironchest/sprites/block_textures.png and /dev/null differ
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png b/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png
deleted file mode 100644
index 535c78d..0000000
Binary files a/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png and /dev/null differ
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/coppercontainer.png b/IronChests2/resources/mods/ironchest/textures/gui/coppercontainer.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/coppercontainer.png
rename to IronChests2/resources/mods/ironchest/textures/gui/coppercontainer.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/diamondcontainer.png b/IronChests2/resources/mods/ironchest/textures/gui/diamondcontainer.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/diamondcontainer.png
rename to IronChests2/resources/mods/ironchest/textures/gui/diamondcontainer.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/goldcontainer.png b/IronChests2/resources/mods/ironchest/textures/gui/goldcontainer.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/goldcontainer.png
rename to IronChests2/resources/mods/ironchest/textures/gui/goldcontainer.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/ironcontainer.png b/IronChests2/resources/mods/ironchest/textures/gui/ironcontainer.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/ironcontainer.png
rename to IronChests2/resources/mods/ironchest/textures/gui/ironcontainer.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/silvercontainer.png b/IronChests2/resources/mods/ironchest/textures/gui/silvercontainer.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/silvercontainer.png
rename to IronChests2/resources/mods/ironchest/textures/gui/silvercontainer.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/copperchest.png b/IronChests2/resources/mods/ironchest/textures/model/copperchest.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/copperchest.png
rename to IronChests2/resources/mods/ironchest/textures/model/copperchest.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/crystalchest.png b/IronChests2/resources/mods/ironchest/textures/model/crystalchest.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/crystalchest.png
rename to IronChests2/resources/mods/ironchest/textures/model/crystalchest.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/diamondchest.png b/IronChests2/resources/mods/ironchest/textures/model/diamondchest.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/diamondchest.png
rename to IronChests2/resources/mods/ironchest/textures/model/diamondchest.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/goldchest.png b/IronChests2/resources/mods/ironchest/textures/model/goldchest.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/goldchest.png
rename to IronChests2/resources/mods/ironchest/textures/model/goldchest.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/ironchest.png b/IronChests2/resources/mods/ironchest/textures/model/ironchest.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/ironchest.png
rename to IronChests2/resources/mods/ironchest/textures/model/ironchest.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/obsidianchest.png b/IronChests2/resources/mods/ironchest/textures/model/obsidianchest.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/obsidianchest.png
rename to IronChests2/resources/mods/ironchest/textures/model/obsidianchest.png
diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/silverchest.png b/IronChests2/resources/mods/ironchest/textures/model/silverchest.png
similarity index 100%
rename from IronChests2/resources/cpw/mods/ironchest/sprites/silverchest.png
rename to IronChests2/resources/mods/ironchest/textures/model/silverchest.png
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/copper_front.png b/IronChests2/resources/mods/ironchest/textures/terrain/copper_front.png
new file mode 100644
index 0000000..8ca415c
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/copper_front.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/copper_side.png b/IronChests2/resources/mods/ironchest/textures/terrain/copper_side.png
new file mode 100644
index 0000000..864e950
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/copper_side.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/copper_top.png b/IronChests2/resources/mods/ironchest/textures/terrain/copper_top.png
new file mode 100644
index 0000000..09a8488
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/copper_top.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/crystal_front.png b/IronChests2/resources/mods/ironchest/textures/terrain/crystal_front.png
new file mode 100644
index 0000000..c517953
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/crystal_front.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/crystal_side.png b/IronChests2/resources/mods/ironchest/textures/terrain/crystal_side.png
new file mode 100644
index 0000000..842cc18
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/crystal_side.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/crystal_top.png b/IronChests2/resources/mods/ironchest/textures/terrain/crystal_top.png
new file mode 100644
index 0000000..ce8ef63
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/crystal_top.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/diamond_front.png b/IronChests2/resources/mods/ironchest/textures/terrain/diamond_front.png
new file mode 100644
index 0000000..d5e6373
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/diamond_front.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/diamond_side.png b/IronChests2/resources/mods/ironchest/textures/terrain/diamond_side.png
new file mode 100644
index 0000000..3c69947
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/diamond_side.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/diamond_top.png b/IronChests2/resources/mods/ironchest/textures/terrain/diamond_top.png
new file mode 100644
index 0000000..08c3bb5
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/diamond_top.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/gold_front.png b/IronChests2/resources/mods/ironchest/textures/terrain/gold_front.png
new file mode 100644
index 0000000..56f1d4d
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/gold_front.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/gold_side.png b/IronChests2/resources/mods/ironchest/textures/terrain/gold_side.png
new file mode 100644
index 0000000..f06fb4f
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/gold_side.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/gold_top.png b/IronChests2/resources/mods/ironchest/textures/terrain/gold_top.png
new file mode 100644
index 0000000..a29e9f3
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/gold_top.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/iron_front.png b/IronChests2/resources/mods/ironchest/textures/terrain/iron_front.png
new file mode 100644
index 0000000..a3db415
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/iron_front.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/iron_side.png b/IronChests2/resources/mods/ironchest/textures/terrain/iron_side.png
new file mode 100644
index 0000000..1486949
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/iron_side.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/iron_top.png b/IronChests2/resources/mods/ironchest/textures/terrain/iron_top.png
new file mode 100644
index 0000000..30efea4
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/iron_top.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_front.png b/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_front.png
new file mode 100644
index 0000000..34fa538
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_front.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_side.png b/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_side.png
new file mode 100644
index 0000000..c545cfc
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_side.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_top.png b/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_top.png
new file mode 100644
index 0000000..f391959
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/obsidian_top.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/silver_front.png b/IronChests2/resources/mods/ironchest/textures/terrain/silver_front.png
new file mode 100644
index 0000000..3a8a37e
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/silver_front.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/silver_side.png b/IronChests2/resources/mods/ironchest/textures/terrain/silver_side.png
new file mode 100644
index 0000000..d4df077
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/silver_side.png differ
diff --git a/IronChests2/resources/mods/ironchest/textures/terrain/silver_top.png b/IronChests2/resources/mods/ironchest/textures/terrain/silver_top.png
new file mode 100644
index 0000000..9439036
Binary files /dev/null and b/IronChests2/resources/mods/ironchest/textures/terrain/silver_top.png differ