diff --git a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
index 14492a72..116127f7 100644
--- a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
+++ b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
@@ -1,6 +1,7 @@
 package com.pahimar.ee3;
 
 import com.pahimar.ee3.configuration.ConfigurationHandler;
+import com.pahimar.ee3.exchange.EnergyValueRegistry;
 import com.pahimar.ee3.handler.CraftingHandler;
 import com.pahimar.ee3.handler.FuelHandler;
 import com.pahimar.ee3.handler.GuiHandler;
@@ -11,6 +12,7 @@ import com.pahimar.ee3.network.PacketHandler;
 import com.pahimar.ee3.proxy.IProxy;
 import com.pahimar.ee3.reference.Messages;
 import com.pahimar.ee3.reference.Reference;
+import com.pahimar.ee3.skill.SkillRegistry;
 import com.pahimar.ee3.util.LogHelper;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -100,4 +102,14 @@ public class EquivalentExchange3
     {
 
     }
+
+    public EnergyValueRegistry getEnergyValueRegistry()
+    {
+        return EnergyValueRegistry.getInstance();
+    }
+
+    public SkillRegistry getSkillRegistry()
+    {
+        return SkillRegistry.getInstance();
+    }
 }
diff --git a/src/main/java/com/pahimar/ee3/api/EnergyValueRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/EnergyValueRegistryProxy.java
new file mode 100644
index 00000000..fcf009ef
--- /dev/null
+++ b/src/main/java/com/pahimar/ee3/api/EnergyValueRegistryProxy.java
@@ -0,0 +1,62 @@
+package com.pahimar.ee3.api;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import cpw.mods.fml.common.Mod;
+
+public class EnergyValueRegistryProxy
+{
+    @Mod.Instance("EE3")
+    private static Object ee3Mod;
+
+    public static void addValue(IEnergyValue energyValue)
+    {
+        init();
+
+        // NOOP if EquivalentExchange3 is not present
+        if (ee3Mod == null)
+        {
+            return;
+        }
+
+        // TODO
+    }
+
+    private static void init()
+    {
+        if (ee3Mod != null)
+        {
+            EE3Wrapper.ee3mod = (EquivalentExchange3) ee3Mod;
+        }
+    }
+
+    public static void getValue(Object object)
+    {
+        init();
+
+        // NOOP if EquivalentExchange3 is not present
+        if (ee3Mod == null)
+        {
+            return;
+        }
+
+        EE3Wrapper.ee3mod.getEnergyValueRegistry().getEnergyValue(object);
+    }
+
+    public static void getValue(Object object, boolean strict)
+    {
+        init();
+
+        // NOOP if EquivalentExchange3 is not present
+        if (ee3Mod == null)
+        {
+            return;
+        }
+
+        EE3Wrapper.ee3mod.getEnergyValueRegistry().getEnergyValue(object, strict);
+    }
+
+    private static class EE3Wrapper
+    {
+        private static EquivalentExchange3 ee3mod;
+    }
+}
diff --git a/src/main/java/com/pahimar/ee3/api/IEnergyValue.java b/src/main/java/com/pahimar/ee3/api/IEnergyValue.java
new file mode 100644
index 00000000..f39d9e0e
--- /dev/null
+++ b/src/main/java/com/pahimar/ee3/api/IEnergyValue.java
@@ -0,0 +1,5 @@
+package com.pahimar.ee3.api;
+
+public interface IEnergyValue
+{
+}
diff --git a/src/main/java/com/pahimar/ee3/api/IEnergyValueProvider.java b/src/main/java/com/pahimar/ee3/api/IEnergyValueProvider.java
new file mode 100644
index 00000000..861d02a7
--- /dev/null
+++ b/src/main/java/com/pahimar/ee3/api/IEnergyValueProvider.java
@@ -0,0 +1,8 @@
+package com.pahimar.ee3.api;
+
+import net.minecraft.item.ItemStack;
+
+public interface IEnergyValueProvider
+{
+    public abstract IEnergyValue getEnergyValue(ItemStack itemStack);
+}
diff --git a/src/main/java/com/pahimar/ee3/api/SkillRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/SkillRegistryProxy.java
new file mode 100644
index 00000000..501e5bb2
--- /dev/null
+++ b/src/main/java/com/pahimar/ee3/api/SkillRegistryProxy.java
@@ -0,0 +1,80 @@
+package com.pahimar.ee3.api;
+
+import com.pahimar.ee3.EquivalentExchange3;
+import cpw.mods.fml.common.Mod;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class SkillRegistryProxy
+{
+    @Mod.Instance("EE3")
+    private static Object ee3Mod;
+
+    public static void addSkill(Item item)
+    {
+        addSkill(new ItemStack(item));
+    }
+
+    public static void addSkill(ItemStack itemStack)
+    {
+        addSkill(itemStack, true, true);
+    }
+
+    public static void addSkill(ItemStack itemStack, boolean isLearnable, boolean isRecovereable)
+    {
+        init();
+
+        // NOOP if EquivalentExchange3 is not present
+        if (ee3Mod == null)
+        {
+            return;
+        }
+
+        EE3Wrapper.ee3mod.getSkillRegistry().addSkill(itemStack, isLearnable, isRecovereable);
+    }
+
+    private static void init()
+    {
+        if (ee3Mod != null)
+        {
+            EE3Wrapper.ee3mod = (EquivalentExchange3) ee3Mod;
+        }
+    }
+
+    public static void addSkill(Block block)
+    {
+        addSkill(new ItemStack(block));
+    }
+
+    public static void isLearnable(ItemStack itemStack)
+    {
+        init();
+
+        // NOOP if EquivalentExchange3 is not present
+        if (ee3Mod == null)
+        {
+            return;
+        }
+
+        EE3Wrapper.ee3mod.getSkillRegistry().isLearnable(itemStack);
+    }
+
+    public static void isRecoverable(ItemStack itemStack)
+    {
+        init();
+
+        // NOOP if EquivalentExchange3 is not present
+        if (ee3Mod == null)
+        {
+            return;
+        }
+
+        EE3Wrapper.ee3mod.getSkillRegistry().isRecoverable(itemStack);
+    }
+
+    private static class EE3Wrapper
+    {
+        private static EquivalentExchange3 ee3mod;
+    }
+}
diff --git a/src/main/java/com/pahimar/ee3/api/exchange/IEnergyValueProvider.java b/src/main/java/com/pahimar/ee3/api/exchange/IEnergyValueProvider.java
deleted file mode 100644
index f3baeecf..00000000
--- a/src/main/java/com/pahimar/ee3/api/exchange/IEnergyValueProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.pahimar.ee3.api.exchange;
-
-import net.minecraft.item.ItemStack;
-
-public interface IEnergyValueProvider
-{
-    public abstract EnergyValue getEnergyValue(ItemStack itemStack);
-}
diff --git a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java
index d6def02e..22c04294 100644
--- a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java
+++ b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java
@@ -1,8 +1,8 @@
 package com.pahimar.ee3.client.handler;
 
-import com.pahimar.ee3.api.core.WrappedStack;
-import com.pahimar.ee3.api.exchange.EnergyValue;
-import com.pahimar.ee3.api.exchange.EnergyValueRegistry;
+import com.pahimar.ee3.exchange.EnergyValue;
+import com.pahimar.ee3.exchange.EnergyValueRegistry;
+import com.pahimar.ee3.exchange.WrappedStack;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/com/pahimar/ee3/api/exchange/EnergyComponent.java b/src/main/java/com/pahimar/ee3/exchange/EnergyComponent.java
similarity index 96%
rename from src/main/java/com/pahimar/ee3/api/exchange/EnergyComponent.java
rename to src/main/java/com/pahimar/ee3/exchange/EnergyComponent.java
index ead58210..1ad496b9 100644
--- a/src/main/java/com/pahimar/ee3/api/exchange/EnergyComponent.java
+++ b/src/main/java/com/pahimar/ee3/exchange/EnergyComponent.java
@@ -1,20 +1,17 @@
-package com.pahimar.ee3.api.exchange;
+package com.pahimar.ee3.exchange;
 
 public class EnergyComponent implements Comparable<EnergyComponent>
 {
-
     public final EnergyType type;
     public final int weight;
 
     public EnergyComponent(EnergyType type)
     {
-
         this(type, 1);
     }
 
     public EnergyComponent(EnergyType type, int weight)
     {
-
         this.type = type;
 
         if (weight > 0)
@@ -30,7 +27,6 @@ public class EnergyComponent implements Comparable<EnergyComponent>
     @Override
     public boolean equals(Object object)
     {
-
         if (!(object instanceof EnergyComponent))
         {
             return false;
@@ -50,7 +46,6 @@ public class EnergyComponent implements Comparable<EnergyComponent>
     @Override
     public int compareTo(EnergyComponent energyComponent)
     {
-
         if (energyComponent != null)
         {
             if (this.type == energyComponent.type)
diff --git a/src/main/java/com/pahimar/ee3/api/exchange/EnergyType.java b/src/main/java/com/pahimar/ee3/exchange/EnergyType.java
similarity index 85%
rename from src/main/java/com/pahimar/ee3/api/exchange/EnergyType.java
rename to src/main/java/com/pahimar/ee3/exchange/EnergyType.java
index b0ef68c7..ba79e653 100644
--- a/src/main/java/com/pahimar/ee3/api/exchange/EnergyType.java
+++ b/src/main/java/com/pahimar/ee3/exchange/EnergyType.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.api.exchange;
+package com.pahimar.ee3.exchange;
 
 public enum EnergyType
 {
diff --git a/src/main/java/com/pahimar/ee3/api/exchange/EnergyValue.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValue.java
similarity index 66%
rename from src/main/java/com/pahimar/ee3/api/exchange/EnergyValue.java
rename to src/main/java/com/pahimar/ee3/exchange/EnergyValue.java
index 98a0e4b5..39f4b7a9 100644
--- a/src/main/java/com/pahimar/ee3/api/exchange/EnergyValue.java
+++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValue.java
@@ -1,19 +1,13 @@
-package com.pahimar.ee3.api.exchange;
+package com.pahimar.ee3.exchange;
 
-import com.google.gson.*;
-import com.pahimar.ee3.util.LogHelper;
-
-import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class EnergyValue implements Comparable<EnergyValue>, JsonDeserializer<EnergyValue>, JsonSerializer<EnergyValue>
+public class EnergyValue implements Comparable<EnergyValue>
 {
-    // Gson serializer for serializing to/deserializing from json
-    private static final Gson gsonSerializer = (new GsonBuilder()).registerTypeAdapter(EnergyValue.class, new EnergyValue()).create();
     private static final int PRECISION = 4;
 
     public final float[] components;
@@ -140,32 +134,6 @@ public class EnergyValue implements Comparable<EnergyValue>, JsonDeserializer<En
         this((float) value, componentList);
     }
 
-    /**
-     * Deserializes an EnergyValue object from the given serialized json String
-     *
-     * @param jsonEnergyValue Json encoded String representing a EnergyValue object
-     * @return The EnergyValue that was encoded as json, or null if a valid EnergyValue could not be decoded from given
-     * String
-     */
-    @SuppressWarnings("unused")
-    public static EnergyValue createFromJson(String jsonEnergyValue)
-    {
-        try
-        {
-            return gsonSerializer.fromJson(jsonEnergyValue, EnergyValue.class);
-        }
-        catch (JsonSyntaxException exception)
-        {
-            LogHelper.error(exception.getMessage());
-        }
-        catch (JsonParseException exception)
-        {
-            LogHelper.error(exception.getMessage());
-        }
-
-        return null;
-    }
-
     @Override
     public int hashCode()
     {
@@ -252,59 +220,4 @@ public class EnergyValue implements Comparable<EnergyValue>, JsonDeserializer<En
             throw new ArrayIndexOutOfBoundsException();
         }
     }
-
-    /**
-     * Returns this EnergyValue as a json serialized String
-     *
-     * @return Json serialized String of this EnergyValue
-     */
-    public String toJson()
-    {
-        return gsonSerializer.toJson(this);
-    }
-
-    @Override
-    public JsonElement serialize(EnergyValue exchangeEnergyValue, Type type, JsonSerializationContext context)
-    {
-        JsonObject jsonEnergyValue = new JsonObject();
-
-        for (EnergyType energyType : EnergyType.TYPES)
-        {
-            jsonEnergyValue.addProperty(energyType.toString(), exchangeEnergyValue.components[energyType.ordinal()]);
-        }
-
-        return jsonEnergyValue;
-    }
-
-    @Override
-    public EnergyValue deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext context) throws JsonParseException
-    {
-
-        float[] energyValueComponents = new float[EnergyType.TYPES.length];
-        JsonObject jsonEnergyValue = (JsonObject) jsonElement;
-
-        for (EnergyType energyType : EnergyType.TYPES)
-        {
-            if ((jsonEnergyValue.get(energyType.toString()) != null) && (jsonEnergyValue.get(energyType.toString()).isJsonPrimitive()))
-            {
-                try
-                {
-                    energyValueComponents[energyType.ordinal()] = jsonEnergyValue.get(energyType.toString()).getAsFloat();
-                }
-                catch (UnsupportedOperationException exception)
-                {
-                    LogHelper.error(exception.getMessage());
-                }
-            }
-        }
-
-        EnergyValue exchangeEnergyValue = new EnergyValue(energyValueComponents);
-
-        if (exchangeEnergyValue.getValue() > 0f)
-        {
-            return exchangeEnergyValue;
-        }
-
-        return null;
-    }
 }
diff --git a/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistry.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
similarity index 99%
rename from src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistry.java
rename to src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
index b40f6f01..0b08c71a 100644
--- a/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistry.java
+++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
@@ -1,10 +1,8 @@
-package com.pahimar.ee3.api.exchange;
+package com.pahimar.ee3.exchange;
 
 import com.google.common.collect.ImmutableSortedMap;
-import com.pahimar.ee3.api.core.OreStack;
-import com.pahimar.ee3.api.core.WrappedStack;
-import com.pahimar.ee3.api.recipe.RecipeRegistry;
 import com.pahimar.ee3.init.EnergyValues;
+import com.pahimar.ee3.recipe.RecipeRegistry;
 import com.pahimar.ee3.util.EnergyValueHelper;
 import com.pahimar.ee3.util.LogHelper;
 import net.minecraft.item.Item;
diff --git a/src/main/java/com/pahimar/ee3/api/core/OreStack.java b/src/main/java/com/pahimar/ee3/exchange/OreStack.java
similarity index 98%
rename from src/main/java/com/pahimar/ee3/api/core/OreStack.java
rename to src/main/java/com/pahimar/ee3/exchange/OreStack.java
index ee4cab0b..cef39cb5 100644
--- a/src/main/java/com/pahimar/ee3/api/core/OreStack.java
+++ b/src/main/java/com/pahimar/ee3/exchange/OreStack.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.api.core;
+package com.pahimar.ee3.exchange;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
diff --git a/src/main/java/com/pahimar/ee3/api/core/WrappedStack.java b/src/main/java/com/pahimar/ee3/exchange/WrappedStack.java
similarity index 99%
rename from src/main/java/com/pahimar/ee3/api/core/WrappedStack.java
rename to src/main/java/com/pahimar/ee3/exchange/WrappedStack.java
index 1c70b64f..645c3289 100644
--- a/src/main/java/com/pahimar/ee3/api/core/WrappedStack.java
+++ b/src/main/java/com/pahimar/ee3/exchange/WrappedStack.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.api.core;
+package com.pahimar.ee3.exchange;
 
 import com.pahimar.ee3.util.FluidHelper;
 import com.pahimar.ee3.util.ItemHelper;
diff --git a/src/main/java/com/pahimar/ee3/init/EnergyValues.java b/src/main/java/com/pahimar/ee3/init/EnergyValues.java
index 67818b6c..68883abf 100644
--- a/src/main/java/com/pahimar/ee3/init/EnergyValues.java
+++ b/src/main/java/com/pahimar/ee3/init/EnergyValues.java
@@ -1,8 +1,8 @@
 package com.pahimar.ee3.init;
 
-import com.pahimar.ee3.api.core.OreStack;
-import com.pahimar.ee3.api.core.WrappedStack;
-import com.pahimar.ee3.api.exchange.EnergyValue;
+import com.pahimar.ee3.exchange.EnergyValue;
+import com.pahimar.ee3.exchange.OreStack;
+import com.pahimar.ee3.exchange.WrappedStack;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/pahimar/ee3/init/Recipes.java b/src/main/java/com/pahimar/ee3/init/Recipes.java
index 25ad95ce..70985870 100644
--- a/src/main/java/com/pahimar/ee3/init/Recipes.java
+++ b/src/main/java/com/pahimar/ee3/init/Recipes.java
@@ -1,6 +1,6 @@
 package com.pahimar.ee3.init;
 
-import com.pahimar.ee3.api.recipe.RecipesAludel;
+import com.pahimar.ee3.recipe.RecipesAludel;
 import com.pahimar.ee3.util.CraftingHelper;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.init.Blocks;
diff --git a/src/main/java/com/pahimar/ee3/api/recipe/RecipeAludel.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipeAludel.java
similarity index 97%
rename from src/main/java/com/pahimar/ee3/api/recipe/RecipeAludel.java
rename to src/main/java/com/pahimar/ee3/item/crafting/RecipeAludel.java
index 1f1451eb..f01aad90 100644
--- a/src/main/java/com/pahimar/ee3/api/recipe/RecipeAludel.java
+++ b/src/main/java/com/pahimar/ee3/item/crafting/RecipeAludel.java
@@ -1,7 +1,7 @@
-package com.pahimar.ee3.api.recipe;
+package com.pahimar.ee3.item.crafting;
 
-import com.pahimar.ee3.api.core.OreStack;
-import com.pahimar.ee3.api.core.WrappedStack;
+import com.pahimar.ee3.exchange.OreStack;
+import com.pahimar.ee3.exchange.WrappedStack;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
diff --git a/src/main/java/com/pahimar/ee3/api/recipe/RecipeRegistry.java b/src/main/java/com/pahimar/ee3/recipe/RecipeRegistry.java
similarity index 93%
rename from src/main/java/com/pahimar/ee3/api/recipe/RecipeRegistry.java
rename to src/main/java/com/pahimar/ee3/recipe/RecipeRegistry.java
index d43955c1..98117192 100644
--- a/src/main/java/com/pahimar/ee3/api/recipe/RecipeRegistry.java
+++ b/src/main/java/com/pahimar/ee3/recipe/RecipeRegistry.java
@@ -1,11 +1,9 @@
-package com.pahimar.ee3.api.recipe;
+package com.pahimar.ee3.recipe;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.api.core.WrappedStack;
-import com.pahimar.ee3.recipe.RecipesFluidContainers;
-import com.pahimar.ee3.recipe.RecipesPotions;
-import com.pahimar.ee3.recipe.RecipesVanilla;
+import com.pahimar.ee3.exchange.WrappedStack;
+import com.pahimar.ee3.item.crafting.RecipeAludel;
 import com.pahimar.ee3.util.LogHelper;
 
 import java.util.Collection;
diff --git a/src/main/java/com/pahimar/ee3/api/recipe/RecipesAludel.java b/src/main/java/com/pahimar/ee3/recipe/RecipesAludel.java
similarity index 93%
rename from src/main/java/com/pahimar/ee3/api/recipe/RecipesAludel.java
rename to src/main/java/com/pahimar/ee3/recipe/RecipesAludel.java
index 029d840e..e62e42ef 100644
--- a/src/main/java/com/pahimar/ee3/api/recipe/RecipesAludel.java
+++ b/src/main/java/com/pahimar/ee3/recipe/RecipesAludel.java
@@ -1,6 +1,7 @@
-package com.pahimar.ee3.api.recipe;
+package com.pahimar.ee3.recipe;
 
-import com.pahimar.ee3.api.core.OreStack;
+import com.pahimar.ee3.exchange.OreStack;
+import com.pahimar.ee3.item.crafting.RecipeAludel;
 import net.minecraft.item.ItemStack;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/pahimar/ee3/recipe/RecipesFluidContainers.java b/src/main/java/com/pahimar/ee3/recipe/RecipesFluidContainers.java
index 52008dea..9cdc12ec 100644
--- a/src/main/java/com/pahimar/ee3/recipe/RecipesFluidContainers.java
+++ b/src/main/java/com/pahimar/ee3/recipe/RecipesFluidContainers.java
@@ -2,7 +2,7 @@ package com.pahimar.ee3.recipe;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.api.core.WrappedStack;
+import com.pahimar.ee3.exchange.WrappedStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
 
diff --git a/src/main/java/com/pahimar/ee3/recipe/RecipesPotions.java b/src/main/java/com/pahimar/ee3/recipe/RecipesPotions.java
index 5c46445d..d495fa33 100644
--- a/src/main/java/com/pahimar/ee3/recipe/RecipesPotions.java
+++ b/src/main/java/com/pahimar/ee3/recipe/RecipesPotions.java
@@ -2,7 +2,7 @@ package com.pahimar.ee3.recipe;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.api.core.WrappedStack;
+import com.pahimar.ee3.exchange.WrappedStack;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/pahimar/ee3/recipe/RecipesVanilla.java b/src/main/java/com/pahimar/ee3/recipe/RecipesVanilla.java
index 4b10210e..49692777 100644
--- a/src/main/java/com/pahimar/ee3/recipe/RecipesVanilla.java
+++ b/src/main/java/com/pahimar/ee3/recipe/RecipesVanilla.java
@@ -2,7 +2,7 @@ package com.pahimar.ee3.recipe;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.api.core.WrappedStack;
+import com.pahimar.ee3.exchange.WrappedStack;
 import com.pahimar.ee3.util.RecipeHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
diff --git a/src/main/java/com/pahimar/ee3/skill/SkillRegistry.java b/src/main/java/com/pahimar/ee3/skill/SkillRegistry.java
index 98e1c830..8de03b05 100644
--- a/src/main/java/com/pahimar/ee3/skill/SkillRegistry.java
+++ b/src/main/java/com/pahimar/ee3/skill/SkillRegistry.java
@@ -1,8 +1,6 @@
 package com.pahimar.ee3.skill;
 
-import com.pahimar.ee3.init.Skills;
 import com.pahimar.ee3.util.ItemHelper;
-import com.pahimar.ee3.util.LogHelper;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -33,45 +31,53 @@ public class SkillRegistry
     private void init()
     {
         skillMap = new TreeMap<ItemStack, Skill>(ItemHelper.comparator);
-        Skills.addDefaultSkills();
     }
 
-    public boolean addSkill(Item item)
+    public void addSkill(Item item)
     {
-        return addSkill(new ItemStack(item));
+        addSkill(new ItemStack(item));
     }
 
-    public boolean addSkill(Block block)
+    public void addSkill(ItemStack itemStack)
     {
-        return addSkill(new ItemStack(block));
+        addSkill(itemStack, true, true);
     }
 
-    public boolean addSkill(ItemStack itemStack)
+    public void addSkill(ItemStack itemStack, boolean learnable, boolean recoverable)
     {
-        return addSkill(itemStack, true, true);
+        addSkill(itemStack, new Skill(learnable, recoverable));
     }
 
-    public boolean addSkill(ItemStack itemStack, boolean learnable, boolean recoverable)
-    {
-        return addSkill(itemStack, new Skill(learnable, recoverable));
-    }
-
-    public boolean addSkill(ItemStack itemStack, Skill skill)
+    private void addSkill(ItemStack itemStack, Skill skill)
     {
         if (!skillMap.containsKey(itemStack))
         {
             skillMap.put(itemStack, skill);
-            return true;
+        }
+    }
+
+    public void addSkill(Block block)
+    {
+        addSkill(new ItemStack(block));
+    }
+
+    public boolean isLearnable(ItemStack itemStack)
+    {
+        if (skillMap.containsKey(itemStack))
+        {
+            return skillMap.get(itemStack).isLearnable();
         }
 
         return false;
     }
 
-    public void dumpSkillSet()
+    public boolean isRecoverable(ItemStack itemStack)
     {
-        for (ItemStack itemStack : skillMap.keySet())
+        if (skillMap.containsKey(itemStack))
         {
-            LogHelper.info(String.format("%s: %s", ItemHelper.toString(itemStack), skillMap.get(itemStack)));
+            return skillMap.get(itemStack).isRecoverable();
         }
+
+        return false;
     }
 }
diff --git a/src/main/java/com/pahimar/ee3/thread/DynamicEnergyValueInitThread.java b/src/main/java/com/pahimar/ee3/thread/DynamicEnergyValueInitThread.java
index 9d00a77f..bed47d84 100644
--- a/src/main/java/com/pahimar/ee3/thread/DynamicEnergyValueInitThread.java
+++ b/src/main/java/com/pahimar/ee3/thread/DynamicEnergyValueInitThread.java
@@ -1,6 +1,6 @@
 package com.pahimar.ee3.thread;
 
-import com.pahimar.ee3.api.exchange.EnergyValueRegistry;
+import com.pahimar.ee3.exchange.EnergyValueRegistry;
 import com.pahimar.ee3.util.LogHelper;
 
 public class DynamicEnergyValueInitThread implements Runnable
diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileEntityAludel.java b/src/main/java/com/pahimar/ee3/tileentity/TileEntityAludel.java
index b2df9ff4..a419b9cf 100644
--- a/src/main/java/com/pahimar/ee3/tileentity/TileEntityAludel.java
+++ b/src/main/java/com/pahimar/ee3/tileentity/TileEntityAludel.java
@@ -1,10 +1,10 @@
 package com.pahimar.ee3.tileentity;
 
-import com.pahimar.ee3.api.recipe.RecipeAludel;
-import com.pahimar.ee3.api.recipe.RecipesAludel;
 import com.pahimar.ee3.item.ItemAlchemicalDust;
+import com.pahimar.ee3.item.crafting.RecipeAludel;
 import com.pahimar.ee3.network.PacketHandler;
 import com.pahimar.ee3.network.message.MessageTileEntityAludel;
+import com.pahimar.ee3.recipe.RecipesAludel;
 import com.pahimar.ee3.reference.Names;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/com/pahimar/ee3/util/CalcinationHelper.java b/src/main/java/com/pahimar/ee3/util/CalcinationHelper.java
index 95e25470..57e70552 100644
--- a/src/main/java/com/pahimar/ee3/util/CalcinationHelper.java
+++ b/src/main/java/com/pahimar/ee3/util/CalcinationHelper.java
@@ -1,7 +1,7 @@
 package com.pahimar.ee3.util;
 
-import com.pahimar.ee3.api.exchange.EnergyValue;
-import com.pahimar.ee3.api.exchange.EnergyValueRegistry;
+import com.pahimar.ee3.exchange.EnergyValue;
+import com.pahimar.ee3.exchange.EnergyValueRegistry;
 import com.pahimar.ee3.init.ModItems;
 import com.pahimar.ee3.item.ItemAlchemicalDust;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/pahimar/ee3/util/EnergyValueHelper.java b/src/main/java/com/pahimar/ee3/util/EnergyValueHelper.java
index 596e6e4d..56d656a2 100644
--- a/src/main/java/com/pahimar/ee3/util/EnergyValueHelper.java
+++ b/src/main/java/com/pahimar/ee3/util/EnergyValueHelper.java
@@ -1,9 +1,9 @@
 package com.pahimar.ee3.util;
 
-import com.pahimar.ee3.api.core.WrappedStack;
-import com.pahimar.ee3.api.exchange.EnergyType;
-import com.pahimar.ee3.api.exchange.EnergyValue;
-import com.pahimar.ee3.api.exchange.EnergyValueRegistry;
+import com.pahimar.ee3.exchange.EnergyType;
+import com.pahimar.ee3.exchange.EnergyValue;
+import com.pahimar.ee3.exchange.EnergyValueRegistry;
+import com.pahimar.ee3.exchange.WrappedStack;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 
diff --git a/src/main/java/com/pahimar/ee3/util/RecipeHelper.java b/src/main/java/com/pahimar/ee3/util/RecipeHelper.java
index 8b98fc67..41a9589f 100644
--- a/src/main/java/com/pahimar/ee3/util/RecipeHelper.java
+++ b/src/main/java/com/pahimar/ee3/util/RecipeHelper.java
@@ -1,7 +1,7 @@
 package com.pahimar.ee3.util;
 
-import com.pahimar.ee3.api.core.OreStack;
-import com.pahimar.ee3.api.core.WrappedStack;
+import com.pahimar.ee3.exchange.OreStack;
+import com.pahimar.ee3.exchange.WrappedStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.ShapedRecipes;