diff --git a/ee3_client/net/minecraft/src/ee3/client/EEProxy.java b/ee3_client/net/minecraft/src/ee3/client/EEProxy.java
index 500ea952..6c1fa3c9 100644
--- a/ee3_client/net/minecraft/src/ee3/client/EEProxy.java
+++ b/ee3_client/net/minecraft/src/ee3/client/EEProxy.java
@@ -7,7 +7,7 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.World;
-import net.minecraft.src.ee3.core.IProxy;
+import net.minecraft.src.ee3.interfaces.IProxy;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
 public class EEProxy implements IProxy {
diff --git a/ee3_common/net/minecraft/src/ee3/core/EMCMapping.java b/ee3_common/net/minecraft/src/ee3/core/EMCMapping.java
index f8be8e0f..0576a829 100644
--- a/ee3_common/net/minecraft/src/ee3/core/EMCMapping.java
+++ b/ee3_common/net/minecraft/src/ee3/core/EMCMapping.java
@@ -4,17 +4,23 @@ public class EMCMapping {
 	
 	private float cost;
 	private float recovery;
+	private boolean learnable;
+	private boolean recoverable;
 	
 	public EMCMapping() { }
 	
 	public EMCMapping(float cost) {
 		this.cost = cost;
 		recovery = cost;
+		learnable = true;
+		recoverable = true;
 	}
 	
-	public EMCMapping(float cost, float recovery) {
+	public EMCMapping(float cost, float recovery, boolean learnable, boolean recoverable) {
 		this.cost = cost;
 		this.recovery = recovery;
+		this.learnable = learnable;
+		this.recoverable = recoverable;
 	}
 	
 	public float getCostEMC() {
@@ -25,6 +31,14 @@ public class EMCMapping {
 		return recovery;
 	}
 	
+	public boolean isLearnable() {
+		return learnable;
+	}
+	
+	public boolean isRecoverable() {
+		return recoverable;
+	}
+	
 	public void setCostEMC(float cost) {
 		this.cost = cost;
 	}
@@ -32,4 +46,12 @@ public class EMCMapping {
 	public void setRecoveryEMC(float recovery) {
 		this.recovery = recovery;
 	}
+	
+	public void setLearnable(boolean learnable) {
+		this.learnable = learnable;
+	}
+	
+	public void setRecoverable(boolean recoverable) {
+		this.recoverable = recoverable;
+	}
 }
diff --git a/ee3_common/net/minecraft/src/ee3/core/IItemModal.java b/ee3_common/net/minecraft/src/ee3/core/IItemModal.java
deleted file mode 100644
index 37f11a91..00000000
--- a/ee3_common/net/minecraft/src/ee3/core/IItemModal.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.minecraft.src.ee3.core;
-
-public interface IItemModal {
-
-}
diff --git a/ee3_common/net/minecraft/src/ee3/core/PStoneRecipes.java b/ee3_common/net/minecraft/src/ee3/core/RecipesPhilStone.java
similarity index 94%
rename from ee3_common/net/minecraft/src/ee3/core/PStoneRecipes.java
rename to ee3_common/net/minecraft/src/ee3/core/RecipesPhilStone.java
index e1629daa..9b508a17 100644
--- a/ee3_common/net/minecraft/src/ee3/core/PStoneRecipes.java
+++ b/ee3_common/net/minecraft/src/ee3/core/RecipesPhilStone.java
@@ -1,22 +1,22 @@
-package net.minecraft.src.ee3.core;
-
-public class PStoneRecipes {
-
-	public void init() {
-		// X dirt == X cobblestone == X stone == X sand
-		// X gravel == X sandstone
-		// X rose == X dandelion == X indigo flower (RP2)
-		// X sapling == X birch sapling == X pine sapling == X jungle sapling
-		// X wood == X birch wood == X pine wood == X jungle wood
-		// X wood plank == X birch wood plank == X pine wood plank == X jungle wood plank
-		// X wool == X wool (next meta colour)
-		/* Cobblestone to diamond recipe path */
-		// X cobblestone == X/4 gravel
-		// X gravel == X/8 wood
-		// X wood == X/2 obsidian
-		// X obsidian == X/4 iron ingot
-		// X iron ingot == X/8 gold ingot
-		// X gold ingot == X/4 diamond
-		/* Therefore, 8192 cobblestone == 2048 gravel == 256 wood == 128 obsidian == 32 iron ingot == 4 gold ingot == 1 diamond */
-	}
-}
+package net.minecraft.src.ee3.core;
+
+public class RecipesPhilStone {
+
+	public void init() {
+		// X dirt == X cobblestone == X stone == X sand
+		// X gravel == X sandstone
+		// X rose == X dandelion == X indigo flower (RP2)
+		// X sapling == X birch sapling == X pine sapling == X jungle sapling
+		// X wood == X birch wood == X pine wood == X jungle wood
+		// X wood plank == X birch wood plank == X pine wood plank == X jungle wood plank
+		// X wool == X wool (next meta colour)
+		/* Cobblestone to diamond recipe path */
+		// X cobblestone == X/4 gravel
+		// X gravel == X/8 wood
+		// X wood == X/2 obsidian
+		// X obsidian == X/4 iron ingot
+		// X iron ingot == X/8 gold ingot
+		// X gold ingot == X/4 diamond
+		/* Therefore, 8192 cobblestone == 2048 gravel == 256 wood == 128 obsidian == 32 iron ingot == 4 gold ingot == 1 diamond */
+	}
+}
diff --git a/ee3_common/net/minecraft/src/ee3/core/ServerClientProxy.java b/ee3_common/net/minecraft/src/ee3/core/ServerClientProxy.java
index d77de15a..3ed62ff8 100644
--- a/ee3_common/net/minecraft/src/ee3/core/ServerClientProxy.java
+++ b/ee3_common/net/minecraft/src/ee3/core/ServerClientProxy.java
@@ -1,6 +1,7 @@
 package net.minecraft.src.ee3.core;
 
 import net.minecraft.src.ModLoader;
+import net.minecraft.src.ee3.interfaces.IProxy;
 import net.minecraft.src.ee3.lib.Reference;
 import net.minecraft.src.forge.MinecraftForge;
 
diff --git a/ee3_common/net/minecraft/src/ee3/core/IItemChargeable.java b/ee3_common/net/minecraft/src/ee3/interfaces/IItemChargeable.java
similarity index 77%
rename from ee3_common/net/minecraft/src/ee3/core/IItemChargeable.java
rename to ee3_common/net/minecraft/src/ee3/interfaces/IItemChargeable.java
index 1b08a93c..371b7139 100644
--- a/ee3_common/net/minecraft/src/ee3/core/IItemChargeable.java
+++ b/ee3_common/net/minecraft/src/ee3/interfaces/IItemChargeable.java
@@ -1,10 +1,10 @@
-package net.minecraft.src.ee3.core;
-
-public interface IItemChargeable {
-
-	public abstract int getMaxCharge();
-	
-	public abstract void increaseCharge();
-	
-	public abstract void decreaseCharge();
-}
+package net.minecraft.src.ee3.interfaces;
+
+public interface IItemChargeable {
+
+	public abstract int getMaxCharge();
+	
+	public abstract void increaseCharge();
+	
+	public abstract void decreaseCharge();
+}
diff --git a/ee3_common/net/minecraft/src/ee3/interfaces/IItemModal.java b/ee3_common/net/minecraft/src/ee3/interfaces/IItemModal.java
new file mode 100644
index 00000000..eaeee013
--- /dev/null
+++ b/ee3_common/net/minecraft/src/ee3/interfaces/IItemModal.java
@@ -0,0 +1,5 @@
+package net.minecraft.src.ee3.interfaces;
+
+public interface IItemModal {
+
+}
diff --git a/ee3_common/net/minecraft/src/ee3/core/IProxy.java b/ee3_common/net/minecraft/src/ee3/interfaces/IProxy.java
similarity index 93%
rename from ee3_common/net/minecraft/src/ee3/core/IProxy.java
rename to ee3_common/net/minecraft/src/ee3/interfaces/IProxy.java
index 7036bea6..144966ba 100644
--- a/ee3_common/net/minecraft/src/ee3/core/IProxy.java
+++ b/ee3_common/net/minecraft/src/ee3/interfaces/IProxy.java
@@ -1,37 +1,37 @@
-package net.minecraft.src.ee3.core;
-
-import java.io.File;
-
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.World;
-import net.minecraft.src.forge.IGuiHandler;
-
-public interface IProxy {
-	
-	public abstract void registerRenderInformation();
-	
-	public abstract void registerTileEntities();
-	
-	public abstract void registerTranslations();
-	
-	public abstract File getMinecraftDir();
-	
-	public abstract boolean isRemote();
-	
-	public abstract World getCurrentWorld();
-	
-	public abstract String getMinecraftVersion();
-	
-	public abstract void registerSoundHandler();
-	
-	public abstract void handleControl(NetworkManager network, int key);
-	
-	public abstract void handlePedestalPacket(int x, int y, int z, int itemId, boolean activated);
-	
-	public abstract void handleTEPacket(int x, int y, int z, byte direction, String player);
-	
-	public abstract Object handleGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z);
-	
-	public abstract void playSound(String soundName, float x, float y, float z, float volume, float pitch);
-}
+package net.minecraft.src.ee3.interfaces;
+
+import java.io.File;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.NetworkManager;
+import net.minecraft.src.World;
+import net.minecraft.src.forge.IGuiHandler;
+
+public interface IProxy {
+	
+	public abstract void registerRenderInformation();
+	
+	public abstract void registerTileEntities();
+	
+	public abstract void registerTranslations();
+	
+	public abstract File getMinecraftDir();
+	
+	public abstract boolean isRemote();
+	
+	public abstract World getCurrentWorld();
+	
+	public abstract String getMinecraftVersion();
+	
+	public abstract void registerSoundHandler();
+	
+	public abstract void handleControl(NetworkManager network, int key);
+	
+	public abstract void handlePedestalPacket(int x, int y, int z, int itemId, boolean activated);
+	
+	public abstract void handleTEPacket(int x, int y, int z, byte direction, String player);
+	
+	public abstract Object handleGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z);
+	
+	public abstract void playSound(String soundName, float x, float y, float z, float volume, float pitch);
+}
diff --git a/ee3_common/net/minecraft/src/ee3/item/ItemChargeable.java b/ee3_common/net/minecraft/src/ee3/item/ItemChargeable.java
deleted file mode 100644
index 7ff83b2d..00000000
--- a/ee3_common/net/minecraft/src/ee3/item/ItemChargeable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.minecraft.src.ee3.item;
-
-public class ItemChargeable extends ItemMod {
-
-	private int maxCharge;
-	
-	public ItemChargeable(int i, int j) {
-		super(i);
-		maxCharge = j;
-	}
-}
diff --git a/ee3_common/net/minecraft/src/ee3/item/ItemEE.java b/ee3_common/net/minecraft/src/ee3/item/ItemEE.java
new file mode 100644
index 00000000..dbcd1b44
--- /dev/null
+++ b/ee3_common/net/minecraft/src/ee3/item/ItemEE.java
@@ -0,0 +1,8 @@
+package net.minecraft.src.ee3.item;
+
+public class ItemEE extends ItemMod {
+
+	public ItemEE(int i) {
+		super(i);
+	}
+}
diff --git a/ee3_common/net/minecraft/src/ee3/item/ItemEEStackable.java b/ee3_common/net/minecraft/src/ee3/item/ItemEEStackable.java
new file mode 100644
index 00000000..b917be42
--- /dev/null
+++ b/ee3_common/net/minecraft/src/ee3/item/ItemEEStackable.java
@@ -0,0 +1,10 @@
+package net.minecraft.src.ee3.item;
+
+public class ItemEEStackable extends ItemMod {
+
+	public ItemEEStackable(int i) {
+		super(i);
+		maxStackSize = 64;
+	}
+
+}
diff --git a/ee3_common/net/minecraft/src/ee3/item/ItemMod.java b/ee3_common/net/minecraft/src/ee3/item/ItemMod.java
index 102b6e56..0f9c3453 100644
--- a/ee3_common/net/minecraft/src/ee3/item/ItemMod.java
+++ b/ee3_common/net/minecraft/src/ee3/item/ItemMod.java
@@ -14,7 +14,6 @@ public class ItemMod extends Item implements ITextureProvider {
 	
 	@Override
 	public String getTextureFile() {
-		// TODO Proper location
 		return Reference.SPRITE_SHEET_LOCATION + Reference.ITEM_SPRITE_SHEET;
 	}
 
diff --git a/ee3_common/net/minecraft/src/ee3/item/ItemPhilosopherStone.java b/ee3_common/net/minecraft/src/ee3/item/ItemPhilosopherStone.java
new file mode 100644
index 00000000..526fde5d
--- /dev/null
+++ b/ee3_common/net/minecraft/src/ee3/item/ItemPhilosopherStone.java
@@ -0,0 +1,28 @@
+package net.minecraft.src.ee3.item;
+
+import net.minecraft.src.ee3.interfaces.IItemChargeable;
+import net.minecraft.src.ee3.interfaces.IItemModal;
+
+public class ItemPhilosopherStone extends ItemEE implements IItemChargeable, IItemModal {
+
+	private int maxCharge;
+	
+	public ItemPhilosopherStone(int i) {
+		super(i);
+		maxCharge = 4;
+	}
+
+	@Override
+	public int getMaxCharge() {
+		return maxCharge;
+	}
+
+	@Override
+	public void increaseCharge() {
+	}
+
+	@Override
+	public void decreaseCharge() {
+	}
+
+}
diff --git a/ee3_common/net/minecraft/src/mod_EE3.java b/ee3_common/net/minecraft/src/mod_EE3.java
index 017e74db..1bcd9a2a 100644
--- a/ee3_common/net/minecraft/src/mod_EE3.java
+++ b/ee3_common/net/minecraft/src/mod_EE3.java
@@ -2,10 +2,10 @@ package net.minecraft.src;
 
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.ee3.core.ConfigurationManager;
-import net.minecraft.src.ee3.core.IProxy;
 import net.minecraft.src.ee3.core.ServerClientProxy;
 import net.minecraft.src.ee3.core.Version;
 import net.minecraft.src.ee3.gui.GuiHandler;
+import net.minecraft.src.ee3.interfaces.IProxy;
 import net.minecraft.src.ee3.lib.Reference;
 import net.minecraft.src.ee3.lib.Sounds;
 import net.minecraft.src.ee3.network.PacketHandler;
diff --git a/ee3_server/net/minecraft/src/ee3/server/EEProxy.java b/ee3_server/net/minecraft/src/ee3/server/EEProxy.java
index 33c0711c..b87c0593 100644
--- a/ee3_server/net/minecraft/src/ee3/server/EEProxy.java
+++ b/ee3_server/net/minecraft/src/ee3/server/EEProxy.java
@@ -6,7 +6,7 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.World;
-import net.minecraft.src.ee3.core.IProxy;
+import net.minecraft.src.ee3.interfaces.IProxy;
 
 public class EEProxy implements IProxy {