diff --git a/pom.xml b/pom.xml
index dcf0ea8..2d9e1df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,8 +82,18 @@
                                     <excludeDefaults>false</excludeDefaults>
                                     <includes>
                                         <include>**/nms/v*/**</include>
-                                        <include>**/core/third_party/**</include>
                                     </includes>
+                                    <excludes>
+                                        <exclude>**/third_party/org/apache/**</exclude>
+                                        <exclude>**/third_party/net/kyori/**</exclude>
+                                        <exclude>**/third_party/com/zaxxer/**</exclude>
+                                        <exclude>**/third_party/org/jooq/**</exclude>
+                                        <exclude>**/third_party/org/mariadb/**</exclude>
+                                        <exclude>**/third_party/com/h2database/**</exclude>
+                                        <exclude>**/third_party/org/h2/**</exclude>
+                                        <exclude>**/third_party/com/cryptomorin/**</exclude>
+                                        <exclude>**/third_party/org/reactivestreams/**</exclude>
+                                    </excludes>
                                 </filter>
                             </filters>
                         </configuration>
diff --git a/src/main/java/com/craftaro/ultimatekits/UltimateKits.java b/src/main/java/com/craftaro/ultimatekits/UltimateKits.java
index 8dd8789..d03efe0 100644
--- a/src/main/java/com/craftaro/ultimatekits/UltimateKits.java
+++ b/src/main/java/com/craftaro/ultimatekits/UltimateKits.java
@@ -8,9 +8,9 @@ import com.craftaro.core.configuration.Config;
 import com.craftaro.core.gui.GuiManager;
 import com.craftaro.core.hooks.EconomyManager;
 import com.craftaro.core.hooks.HologramManager;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.NumberUtils;
 import com.craftaro.core.utils.TextUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.category.Category;
 import com.craftaro.ultimatekits.category.CategoryManager;
 import com.craftaro.ultimatekits.commands.CommandCategories;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/AnimatedKitGui.java b/src/main/java/com/craftaro/ultimatekits/gui/AnimatedKitGui.java
index 84198a9..29c1e9e 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/AnimatedKitGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/AnimatedKitGui.java
@@ -3,9 +3,9 @@ package com.craftaro.ultimatekits.gui;
 import com.craftaro.core.compatibility.CompatibleMaterial;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
-import com.craftaro.core.third_party.org.apache.commons.text.WordUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.third_party.com.cryptomorin.xseries.XSound;
+import com.craftaro.third_party.org.apache.commons.text.WordUtils;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.kit.Kit;
 import com.craftaro.ultimatekits.kit.KitItem;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/BlockEditorGui.java b/src/main/java/com/craftaro/ultimatekits/gui/BlockEditorGui.java
index aceebd5..420d4ef 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/BlockEditorGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/BlockEditorGui.java
@@ -2,7 +2,7 @@ package com.craftaro.ultimatekits.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.kit.KitBlockData;
 import com.craftaro.ultimatekits.kit.KitType;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/CategoryEditorGui.java b/src/main/java/com/craftaro/ultimatekits/gui/CategoryEditorGui.java
index fb51060..3cc6755 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/CategoryEditorGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/CategoryEditorGui.java
@@ -3,8 +3,8 @@ package com.craftaro.ultimatekits.gui;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.input.ChatPrompt;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.category.Category;
 import com.craftaro.ultimatekits.category.CategoryManager;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/CategorySelectorGui.java b/src/main/java/com/craftaro/ultimatekits/gui/CategorySelectorGui.java
index f7674b0..e3a2d38 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/CategorySelectorGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/CategorySelectorGui.java
@@ -3,8 +3,8 @@ package com.craftaro.ultimatekits.gui;
 import com.craftaro.core.compatibility.CompatibleMaterial;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TextUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.category.Category;
 import com.craftaro.ultimatekits.kit.Kit;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/ConfirmBuyGui.java b/src/main/java/com/craftaro/ultimatekits/gui/ConfirmBuyGui.java
index 799a3b6..b9379bc 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/ConfirmBuyGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/ConfirmBuyGui.java
@@ -2,9 +2,9 @@ package com.craftaro.ultimatekits.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.NumberUtils;
 import com.craftaro.core.utils.TextUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.kit.Kit;
 import com.craftaro.ultimatekits.settings.Settings;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/KitDecorOptionsGui.java b/src/main/java/com/craftaro/ultimatekits/gui/KitDecorOptionsGui.java
index c7db75e..e637f9f 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/KitDecorOptionsGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/KitDecorOptionsGui.java
@@ -2,8 +2,8 @@ package com.craftaro.ultimatekits.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.ItemUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.kit.Kit;
 import com.craftaro.ultimatekits.kit.KitBlockData;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/KitEditorGui.java b/src/main/java/com/craftaro/ultimatekits/gui/KitEditorGui.java
index 8d1df6a..d0f0eb7 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/KitEditorGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/KitEditorGui.java
@@ -5,10 +5,10 @@ import com.craftaro.core.gui.DoubleGui;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.input.ChatPrompt;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
 import com.craftaro.core.utils.ItemUtils;
 import com.craftaro.core.utils.TextUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.third_party.com.cryptomorin.xseries.XSound;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.kit.Kit;
 import com.craftaro.ultimatekits.kit.KitAnimation;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/KitGeneralOptionsGui.java b/src/main/java/com/craftaro/ultimatekits/gui/KitGeneralOptionsGui.java
index 079e50c..d758b21 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/KitGeneralOptionsGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/KitGeneralOptionsGui.java
@@ -3,8 +3,8 @@ package com.craftaro.ultimatekits.gui;
 import com.craftaro.core.gui.AnvilGui;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.ItemUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.category.Category;
 import com.craftaro.ultimatekits.kit.Kit;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/KitGuiOptionsGui.java b/src/main/java/com/craftaro/ultimatekits/gui/KitGuiOptionsGui.java
index b522985..18526df 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/KitGuiOptionsGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/KitGuiOptionsGui.java
@@ -3,8 +3,8 @@ package com.craftaro.ultimatekits.gui;
 import com.craftaro.core.gui.AnvilGui;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.ItemUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.kit.Kit;
 import com.craftaro.ultimatekits.settings.Settings;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/KitSelectorGui.java b/src/main/java/com/craftaro/ultimatekits/gui/KitSelectorGui.java
index 8151513..94a0f72 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/KitSelectorGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/KitSelectorGui.java
@@ -3,10 +3,10 @@ package com.craftaro.ultimatekits.gui;
 import com.craftaro.core.compatibility.CompatibleMaterial;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.ItemUtils;
 import com.craftaro.core.utils.TextUtils;
 import com.craftaro.core.utils.TimeUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.category.Category;
 import com.craftaro.ultimatekits.kit.Kit;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/KitSellingOptionsGui.java b/src/main/java/com/craftaro/ultimatekits/gui/KitSellingOptionsGui.java
index 0c40700..4984f9e 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/KitSellingOptionsGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/KitSellingOptionsGui.java
@@ -4,8 +4,8 @@ import com.craftaro.core.gui.AnvilGui;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
 import com.craftaro.core.hooks.EconomyManager;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.ItemUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.kit.Kit;
 import com.craftaro.ultimatekits.settings.Settings;
diff --git a/src/main/java/com/craftaro/ultimatekits/gui/PreviewKitGui.java b/src/main/java/com/craftaro/ultimatekits/gui/PreviewKitGui.java
index 5041388..f357aca 100644
--- a/src/main/java/com/craftaro/ultimatekits/gui/PreviewKitGui.java
+++ b/src/main/java/com/craftaro/ultimatekits/gui/PreviewKitGui.java
@@ -2,10 +2,10 @@ package com.craftaro.ultimatekits.gui;
 
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.SkullUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.NumberUtils;
 import com.craftaro.core.utils.TextUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.SkullUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.kit.Kit;
 import com.craftaro.ultimatekits.settings.Settings;
diff --git a/src/main/java/com/craftaro/ultimatekits/kit/Kit.java b/src/main/java/com/craftaro/ultimatekits/kit/Kit.java
index 27c5431..1b63a35 100644
--- a/src/main/java/com/craftaro/ultimatekits/kit/Kit.java
+++ b/src/main/java/com/craftaro/ultimatekits/kit/Kit.java
@@ -5,11 +5,11 @@ import com.craftaro.core.configuration.Config;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiManager;
 import com.craftaro.core.hooks.EconomyManager;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XSound;
 import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem;
 import com.craftaro.core.utils.ItemUtils;
 import com.craftaro.core.utils.TextUtils;
 import com.craftaro.core.utils.TimeUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XSound;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.category.Category;
 import com.craftaro.ultimatekits.crate.Crate;
diff --git a/src/main/java/com/craftaro/ultimatekits/listeners/InteractListeners.java b/src/main/java/com/craftaro/ultimatekits/listeners/InteractListeners.java
index e27982f..25a85c8 100644
--- a/src/main/java/com/craftaro/ultimatekits/listeners/InteractListeners.java
+++ b/src/main/java/com/craftaro/ultimatekits/listeners/InteractListeners.java
@@ -3,8 +3,8 @@ package com.craftaro.ultimatekits.listeners;
 import com.craftaro.core.compatibility.CompatibleHand;
 import com.craftaro.core.compatibility.ServerVersion;
 import com.craftaro.core.gui.GuiManager;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.core.utils.TimeUtils;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.UltimateKits;
 import com.craftaro.ultimatekits.gui.BlockEditorGui;
 import com.craftaro.ultimatekits.kit.Kit;
diff --git a/src/main/java/com/craftaro/ultimatekits/utils/Methods.java b/src/main/java/com/craftaro/ultimatekits/utils/Methods.java
index 03b41e3..26ab746 100644
--- a/src/main/java/com/craftaro/ultimatekits/utils/Methods.java
+++ b/src/main/java/com/craftaro/ultimatekits/utils/Methods.java
@@ -3,7 +3,7 @@ package com.craftaro.ultimatekits.utils;
 import com.craftaro.core.compatibility.CompatibleMaterial;
 import com.craftaro.core.gui.Gui;
 import com.craftaro.core.gui.GuiUtils;
-import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import com.craftaro.ultimatekits.settings.Settings;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;