diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java
index 1e200963..53b256f8 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java
+++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java
@@ -5,7 +5,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.willfp.eco.core.display.Display;
-import com.willfp.eco.proxy.ChatComponentProxy;
+import proxy.ChatComponentProxy;
 import net.minecraft.server.v1_16_R3.ChatBaseComponent;
 import net.minecraft.server.v1_16_R3.ChatHoverable;
 import net.minecraft.server.v1_16_R3.ChatMessage;
@@ -22,10 +22,10 @@ import java.util.Arrays;
 
 public final class ChatComponent implements ChatComponentProxy {
     @Override
-    public Object modifyComponent(@NotNull final Object object,
+    public Object modifyComponent(@NotNull final Object obj,
                                   @NotNull final Player player) {
-        if (!(object instanceof IChatBaseComponent chatComponent)) {
-            return object;
+        if (!(obj instanceof IChatBaseComponent chatComponent)) {
+            return obj;
         }
 
         for (IChatBaseComponent iChatBaseComponent : chatComponent) {
diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/AutoCraft.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/AutoCraft.kt
index dacde474..222a3753 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/AutoCraft.kt
+++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/AutoCraft.kt
@@ -1,5 +1,5 @@
 
-import com.willfp.eco.proxy.AutoCraftProxy
+import proxy.AutoCraftProxy
 import net.minecraft.server.v1_16_R3.MinecraftKey
 import net.minecraft.server.v1_16_R3.PacketPlayOutAutoRecipe
 
diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/BlockBreak.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/BlockBreak.kt
index 869fe224..f75541ab 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/BlockBreak.kt
+++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/BlockBreak.kt
@@ -1,5 +1,5 @@
 
-import com.willfp.eco.proxy.BlockBreakProxy
+import proxy.BlockBreakProxy
 import net.minecraft.server.v1_16_R3.BlockPosition
 import org.bukkit.block.Block
 import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer
diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/FastItemStackFactory.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/FastItemStackFactory.kt
index 8e66d402..019a10ee 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/FastItemStackFactory.kt
+++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/FastItemStackFactory.kt
@@ -1,6 +1,6 @@
 
 import com.willfp.eco.core.fast.FastItemStack
-import com.willfp.eco.proxy.FastItemStackFactoryProxy
+import proxy.FastItemStackFactoryProxy
 import com.willfp.eco.proxy.v1_16_R3.NMSFastItemStack
 import org.bukkit.inventory.ItemStack
 
diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/Skull.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/Skull.kt
index fa97cb5f..0725b22f 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/Skull.kt
+++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/Skull.kt
@@ -1,7 +1,7 @@
 
 import com.mojang.authlib.GameProfile
 import com.mojang.authlib.properties.Property
-import com.willfp.eco.proxy.SkullProxy
+import proxy.SkullProxy
 import org.bukkit.inventory.meta.SkullMeta
 import java.lang.reflect.Method
 import java.util.*
diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/VillagerTrade.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/VillagerTrade.kt
index 9953ebec..b9250ab2 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/VillagerTrade.kt
+++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/VillagerTrade.kt
@@ -1,6 +1,6 @@
 
 import com.willfp.eco.core.display.Display
-import com.willfp.eco.proxy.VillagerTradeProxy
+import proxy.VillagerTradeProxy
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantRecipe
 import org.bukkit.entity.Player
 import org.bukkit.inventory.MerchantRecipe
diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java
index f226c89c..f74b5492 100644
--- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java
+++ b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java
@@ -5,7 +5,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.willfp.eco.core.display.Display;
-import com.willfp.eco.proxy.ChatComponentProxy;
+import proxy.ChatComponentProxy;
 import net.minecraft.nbt.TagParser;
 import net.minecraft.network.chat.BaseComponent;
 import net.minecraft.network.chat.Component;
@@ -22,10 +22,10 @@ import java.util.Arrays;
 
 public final class ChatComponent implements ChatComponentProxy {
     @Override
-    public Object modifyComponent(@NotNull final Object object,
+    public Object modifyComponent(@NotNull final Object obj,
                                   @NotNull final Player player) {
-        if (!(object instanceof Component chatComponent)) {
-            return object;
+        if (!(obj instanceof Component chatComponent)) {
+            return obj;
         }
 
         for (Component iChatBaseComponent : chatComponent) {
diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/AutoCraft.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/AutoCraft.kt
index 3b34e0ca..7d518532 100644
--- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/AutoCraft.kt
+++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/AutoCraft.kt
@@ -1,8 +1,8 @@
 package com.willfp.eco.proxy.v1_17_R1
 
-import com.willfp.eco.proxy.AutoCraftProxy
 import net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket
 import net.minecraft.resources.ResourceLocation
+import proxy.AutoCraftProxy
 
 class AutoCraft : AutoCraftProxy {
     @Throws(NoSuchFieldException::class, IllegalAccessException::class)
diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/BlockBreak.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/BlockBreak.kt
index 7b7d38e4..e8863c50 100644
--- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/BlockBreak.kt
+++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/BlockBreak.kt
@@ -1,8 +1,8 @@
 package com.willfp.eco.proxy.v1_17_R1
 
-import com.willfp.eco.proxy.BlockBreakProxy
 import org.bukkit.block.Block
 import org.bukkit.entity.Player
+import proxy.BlockBreakProxy
 
 class BlockBreak : BlockBreakProxy {
     override fun breakBlock(
diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.kt
index f149a868..f4c6c265 100644
--- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.kt
+++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.kt
@@ -1,9 +1,9 @@
 package com.willfp.eco.proxy.v1_17_R1
 
 import com.willfp.eco.core.fast.FastItemStack
-import com.willfp.eco.proxy.FastItemStackFactoryProxy
 import com.willfp.eco.proxy.v1_17_R1.fast.NMSFastItemStack
 import org.bukkit.inventory.ItemStack
+import proxy.FastItemStackFactoryProxy
 
 class FastItemStackFactory : FastItemStackFactoryProxy {
     override fun create(itemStack: ItemStack): FastItemStack {
diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/Skull.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/Skull.kt
index 3e573628..1dac6c11 100644
--- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/Skull.kt
+++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/Skull.kt
@@ -2,8 +2,8 @@ package com.willfp.eco.proxy.v1_17_R1
 
 import com.mojang.authlib.GameProfile
 import com.mojang.authlib.properties.Property
-import com.willfp.eco.proxy.SkullProxy
 import org.bukkit.inventory.meta.SkullMeta
+import proxy.SkullProxy
 import java.lang.reflect.Method
 import java.util.*
 
diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.kt
index aac5078f..971c1243 100644
--- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.kt
+++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.kt
@@ -1,11 +1,11 @@
 package com.willfp.eco.proxy.v1_17_R1
 
 import com.willfp.eco.core.display.Display
-import com.willfp.eco.proxy.VillagerTradeProxy
 import net.minecraft.world.item.trading.MerchantOffer
 import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftMerchantRecipe
 import org.bukkit.entity.Player
 import org.bukkit.inventory.MerchantRecipe
+import proxy.VillagerTradeProxy
 import java.lang.reflect.Field
 
 class VillagerTrade : VillagerTradeProxy {
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt
index bdf26c3e..fec61404 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt
@@ -31,7 +31,7 @@ import com.willfp.eco.internal.integrations.PlaceholderIntegrationPAPI
 import com.willfp.eco.internal.logging.EcoLogger
 import com.willfp.eco.internal.proxy.EcoProxyFactory
 import com.willfp.eco.internal.scheduling.EcoScheduler
-import com.willfp.eco.proxy.FastItemStackFactoryProxy
+import proxy.FastItemStackFactoryProxy
 import org.bstats.bukkit.Metrics
 import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.inventory.ItemStack
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt
index b57e1a6e..6b0a72ba 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt
@@ -9,9 +9,9 @@ import com.willfp.eco.core.integrations.antigrief.AntigriefManager
 import com.willfp.eco.core.integrations.customitems.CustomItemsManager
 import com.willfp.eco.core.integrations.mcmmo.McmmoManager
 import com.willfp.eco.internal.drops.DropManager
-import com.willfp.eco.proxy.BlockBreakProxy
-import com.willfp.eco.proxy.FastItemStackFactoryProxy
-import com.willfp.eco.proxy.SkullProxy
+import proxy.BlockBreakProxy
+import proxy.FastItemStackFactoryProxy
+import proxy.SkullProxy
 import com.willfp.eco.spigot.arrows.ArrowDataListener
 import com.willfp.eco.spigot.display.*
 import com.willfp.eco.spigot.drops.CollatedRunnable
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketAutoRecipe.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketAutoRecipe.kt
index 456e5e49..f77a2ab8 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketAutoRecipe.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketAutoRecipe.kt
@@ -6,7 +6,7 @@ import com.comphenix.protocol.events.PacketContainer
 import com.comphenix.protocol.events.PacketEvent
 import com.willfp.eco.core.AbstractPacketAdapter
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.proxy.AutoCraftProxy
+import proxy.AutoCraftProxy
 import org.bukkit.entity.Player
 import java.lang.reflect.InvocationTargetException
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketChat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketChat.kt
index 59d6728d..c7fc66c7 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketChat.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketChat.kt
@@ -7,7 +7,7 @@ import com.comphenix.protocol.events.PacketEvent
 import com.comphenix.protocol.wrappers.WrappedChatComponent
 import com.willfp.eco.core.AbstractPacketAdapter
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.proxy.ChatComponentProxy
+import proxy.ChatComponentProxy
 import org.bukkit.entity.Player
 
 class PacketChat(plugin: EcoPlugin) :
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.kt
index 5e20eba9..0d186e31 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.kt
@@ -6,7 +6,7 @@ import com.comphenix.protocol.events.PacketContainer
 import com.comphenix.protocol.events.PacketEvent
 import com.willfp.eco.core.AbstractPacketAdapter
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.proxy.VillagerTradeProxy
+import proxy.VillagerTradeProxy
 import com.willfp.eco.util.NamespacedKeyUtils
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemFlag
diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/AutoCraftProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/AutoCraftProxy.java
deleted file mode 100644
index b9a88a1f..00000000
--- a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/AutoCraftProxy.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.willfp.eco.proxy;
-
-import com.willfp.eco.core.proxy.AbstractProxy;
-import org.jetbrains.annotations.NotNull;
-
-public interface AutoCraftProxy extends AbstractProxy {
-    void modifyPacket(@NotNull Object packet) throws NoSuchFieldException, IllegalAccessException;
-}
diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/BlockBreakProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/BlockBreakProxy.java
deleted file mode 100644
index fc6a8bc7..00000000
--- a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/BlockBreakProxy.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.willfp.eco.proxy;
-
-import com.willfp.eco.core.proxy.AbstractProxy;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public interface BlockBreakProxy extends AbstractProxy {
-    void breakBlock(@NotNull Player player,
-                    @NotNull Block block);
-}
diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/ChatComponentProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/ChatComponentProxy.java
deleted file mode 100644
index eb75675e..00000000
--- a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/ChatComponentProxy.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.willfp.eco.proxy;
-
-
-import com.willfp.eco.core.proxy.AbstractProxy;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public interface ChatComponentProxy extends AbstractProxy {
-    Object modifyComponent(@NotNull Object object,
-                           @NotNull Player player);
-}
diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/FastItemStackFactoryProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/FastItemStackFactoryProxy.java
deleted file mode 100644
index 37d4e55e..00000000
--- a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/FastItemStackFactoryProxy.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.willfp.eco.proxy;
-
-import com.willfp.eco.core.fast.FastItemStack;
-import com.willfp.eco.core.proxy.AbstractProxy;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-public interface FastItemStackFactoryProxy extends AbstractProxy {
-    FastItemStack create(@NotNull ItemStack itemStack);
-}
diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/SkullProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/SkullProxy.java
deleted file mode 100644
index 5a831bb5..00000000
--- a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/SkullProxy.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.willfp.eco.proxy;
-
-import com.willfp.eco.core.proxy.AbstractProxy;
-import org.bukkit.inventory.meta.SkullMeta;
-import org.jetbrains.annotations.NotNull;
-
-public interface SkullProxy extends AbstractProxy {
-    void setSkullTexture(@NotNull SkullMeta meta,
-                         @NotNull String base64);
-}
diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/VillagerTradeProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/VillagerTradeProxy.java
deleted file mode 100644
index 9d2aa107..00000000
--- a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/VillagerTradeProxy.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.willfp.eco.proxy;
-
-import com.willfp.eco.core.proxy.AbstractProxy;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.MerchantRecipe;
-import org.jetbrains.annotations.NotNull;
-
-public interface VillagerTradeProxy extends AbstractProxy {
-    MerchantRecipe displayTrade(@NotNull MerchantRecipe recipe,
-                                @NotNull Player player);
-}
diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/AutoCraftProxy.kt b/eco-core/core-proxy/src/main/kotlin/proxy/AutoCraftProxy.kt
new file mode 100644
index 00000000..8f4122b5
--- /dev/null
+++ b/eco-core/core-proxy/src/main/kotlin/proxy/AutoCraftProxy.kt
@@ -0,0 +1,8 @@
+package proxy
+
+import com.willfp.eco.core.proxy.AbstractProxy
+
+interface AutoCraftProxy : AbstractProxy {
+    @Throws(NoSuchFieldException::class, IllegalAccessException::class)
+    fun modifyPacket(packet: Any)
+}
\ No newline at end of file
diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/BlockBreakProxy.kt b/eco-core/core-proxy/src/main/kotlin/proxy/BlockBreakProxy.kt
new file mode 100644
index 00000000..3611f6bb
--- /dev/null
+++ b/eco-core/core-proxy/src/main/kotlin/proxy/BlockBreakProxy.kt
@@ -0,0 +1,12 @@
+package proxy
+
+import com.willfp.eco.core.proxy.AbstractProxy
+import org.bukkit.block.Block
+import org.bukkit.entity.Player
+
+interface BlockBreakProxy : AbstractProxy {
+    fun breakBlock(
+        player: Player,
+        block: Block
+    )
+}
\ No newline at end of file
diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/ChatComponentProxy.kt b/eco-core/core-proxy/src/main/kotlin/proxy/ChatComponentProxy.kt
new file mode 100644
index 00000000..9197c7e8
--- /dev/null
+++ b/eco-core/core-proxy/src/main/kotlin/proxy/ChatComponentProxy.kt
@@ -0,0 +1,11 @@
+package proxy
+
+import com.willfp.eco.core.proxy.AbstractProxy
+import org.bukkit.entity.Player
+
+interface ChatComponentProxy : AbstractProxy {
+    fun modifyComponent(
+        obj: Any,
+        player: Player
+    ): Any?
+}
\ No newline at end of file
diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/FastItemStackFactoryProxy.kt b/eco-core/core-proxy/src/main/kotlin/proxy/FastItemStackFactoryProxy.kt
new file mode 100644
index 00000000..4e085a2f
--- /dev/null
+++ b/eco-core/core-proxy/src/main/kotlin/proxy/FastItemStackFactoryProxy.kt
@@ -0,0 +1,9 @@
+package proxy
+
+import com.willfp.eco.core.fast.FastItemStack
+import com.willfp.eco.core.proxy.AbstractProxy
+import org.bukkit.inventory.ItemStack
+
+interface FastItemStackFactoryProxy : AbstractProxy {
+    fun create(itemStack: ItemStack): FastItemStack
+}
\ No newline at end of file
diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/SkullProxy.kt b/eco-core/core-proxy/src/main/kotlin/proxy/SkullProxy.kt
new file mode 100644
index 00000000..6ad27243
--- /dev/null
+++ b/eco-core/core-proxy/src/main/kotlin/proxy/SkullProxy.kt
@@ -0,0 +1,11 @@
+package proxy
+
+import com.willfp.eco.core.proxy.AbstractProxy
+import org.bukkit.inventory.meta.SkullMeta
+
+interface SkullProxy : AbstractProxy {
+    fun setSkullTexture(
+        meta: SkullMeta,
+        base64: String
+    )
+}
\ No newline at end of file
diff --git a/eco-core/core-proxy/src/main/kotlin/proxy/VillagerTradeProxy.kt b/eco-core/core-proxy/src/main/kotlin/proxy/VillagerTradeProxy.kt
new file mode 100644
index 00000000..3369e0e7
--- /dev/null
+++ b/eco-core/core-proxy/src/main/kotlin/proxy/VillagerTradeProxy.kt
@@ -0,0 +1,12 @@
+package proxy
+
+import com.willfp.eco.core.proxy.AbstractProxy
+import org.bukkit.entity.Player
+import org.bukkit.inventory.MerchantRecipe
+
+interface VillagerTradeProxy : AbstractProxy {
+    fun displayTrade(
+        recipe: MerchantRecipe,
+        player: Player
+    ): MerchantRecipe
+}
\ No newline at end of file