diff --git a/eco-api/src/main/java/com/willfp/eco/core/extensions/Extension.java b/eco-api/src/main/java/com/willfp/eco/core/extensions/Extension.java
index c8bc08b4..0538a4f9 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/extensions/Extension.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/extensions/Extension.java
@@ -1,6 +1,5 @@
 package com.willfp.eco.core.extensions;
 
-import com.willfp.eco.internal.extensions.ExtensionMetadata;
 import com.willfp.eco.core.EcoPlugin;
 import lombok.AccessLevel;
 import lombok.Getter;
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/internal/extensions/ExtensionMetadata.java b/eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java
similarity index 78%
rename from eco-core/core-plugin/src/main/java/com/willfp/eco/internal/extensions/ExtensionMetadata.java
rename to eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java
index ee40c221..8680caa7 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/eco/internal/extensions/ExtensionMetadata.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionMetadata.java
@@ -1,4 +1,4 @@
-package com.willfp.eco.internal.extensions;
+package com.willfp.eco.core.extensions;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java
index ae7b52d7..349b1669 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/items/builder/EnchantedBookBuilder.java
@@ -1,6 +1,5 @@
 package com.willfp.eco.core.items.builder;
 
-import com.willfp.eco.internal.items.AbstractItemStackBuilder;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java
index 22971a9a..3d50beca 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemStackBuilder.java
@@ -1,6 +1,5 @@
 package com.willfp.eco.core.items.builder;
 
-import com.willfp.eco.internal.items.AbstractItemStackBuilder;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java
index 29b1872b..b791bf1d 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/items/builder/LeatherArmorBuilder.java
@@ -1,6 +1,5 @@
 package com.willfp.eco.core.items.builder;
 
-import com.willfp.eco.internal.items.AbstractItemStackBuilder;
 import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java
index 4aaef71f..78e1d769 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/items/builder/SkullBuilder.java
@@ -1,6 +1,5 @@
 package com.willfp.eco.core.items.builder;
 
-import com.willfp.eco.internal.items.AbstractItemStackBuilder;
 import com.willfp.eco.util.SkullUtils;
 import org.bukkit.Material;
 import org.bukkit.inventory.meta.SkullMeta;
diff --git a/eco-api/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java b/eco-api/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java
index 800bc319..93eb3728 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/recipe/parts/TestableStack.java
@@ -1,7 +1,7 @@
 package com.willfp.eco.core.recipe.parts;
 
+import com.willfp.eco.core.Eco;
 import com.willfp.eco.core.items.TestableItem;
-import com.willfp.eco.internal.Internals;
 import lombok.Getter;
 import org.apache.commons.lang.Validate;
 import org.bukkit.inventory.ItemStack;
@@ -58,7 +58,7 @@ public class TestableStack implements TestableItem {
         List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
         assert lore != null;
         lore.add("");
-        String add = Internals.getInstance().getPlugin().getLangYml().getString("multiple-in-craft");
+        String add = Eco.getHandler().getPlugin().getLangYml().getString("multiple-in-craft");
         add = add.replace("%amount%", String.valueOf(amount));
         lore.add(add);
         meta.setLore(lore);
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java
index 9c6690fe..422952eb 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java
@@ -2,6 +2,7 @@ package com.willfp.eco.internal.extensions;
 
 
 import com.willfp.eco.core.extensions.Extension;
+import com.willfp.eco.core.extensions.ExtensionMetadata;
 import com.willfp.eco.core.extensions.MalformedExtensionException;
 import com.willfp.eco.core.extensions.ExtensionLoader;
 import com.willfp.eco.core.PluginDependent;