diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/BoundItem.java b/Plugin/src/main/java/me/filoghost/chestcommands/internal/BoundItem.java
index a5fd267..859c514 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/BoundItem.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/internal/BoundItem.java
@@ -18,7 +18,6 @@ import org.bukkit.Material;
 import org.bukkit.event.block.Action;
 import org.bukkit.inventory.ItemStack;
 
-import me.filoghost.chestcommands.util.ClickType;
 import me.filoghost.chestcommands.util.Validate;
 
 public class BoundItem {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/util/ClickType.java b/Plugin/src/main/java/me/filoghost/chestcommands/internal/ClickType.java
similarity index 93%
rename from Plugin/src/main/java/me/filoghost/chestcommands/util/ClickType.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/internal/ClickType.java
index 8262ba7..434d75d 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/util/ClickType.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/internal/ClickType.java
@@ -12,7 +12,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package me.filoghost.chestcommands.util;
+package me.filoghost.chestcommands.internal;
 
 import org.bukkit.event.block.Action;
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/icon/ExtendedIcon.java b/Plugin/src/main/java/me/filoghost/chestcommands/internal/ExtendedIcon.java
similarity index 93%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/icon/ExtendedIcon.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/internal/ExtendedIcon.java
index 1ad61d4..4920ab7 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/icon/ExtendedIcon.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/internal/ExtendedIcon.java
@@ -12,7 +12,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package me.filoghost.chestcommands.internal.icon;
+package me.filoghost.chestcommands.internal;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -22,9 +22,6 @@ import org.bukkit.inventory.InventoryView;
 import me.filoghost.chestcommands.ChestCommands;
 import me.filoghost.chestcommands.api.Icon;
 import me.filoghost.chestcommands.bridge.EconomyBridge;
-import me.filoghost.chestcommands.internal.ExtendedIconMenu;
-import me.filoghost.chestcommands.internal.MenuInventoryHolder;
-import me.filoghost.chestcommands.internal.RequiredItem;
 import me.filoghost.chestcommands.util.MaterialsRegistry;
 import me.filoghost.chestcommands.util.StringUtils;
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/ExtendedIconMenu.java b/Plugin/src/main/java/me/filoghost/chestcommands/internal/ExtendedIconMenu.java
index 920f78c..4f4e8aa 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/ExtendedIconMenu.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/internal/ExtendedIconMenu.java
@@ -26,7 +26,6 @@ import me.filoghost.chestcommands.ChestCommands;
 import me.filoghost.chestcommands.Permissions;
 import me.filoghost.chestcommands.action.Action;
 import me.filoghost.chestcommands.api.IconMenu;
-import me.filoghost.chestcommands.internal.icon.ExtendedIcon;
 import me.filoghost.chestcommands.util.ItemUtils;
 
 import java.util.List;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuData.java b/Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuData.java
index fce0303..d2945f3 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuData.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuData.java
@@ -17,7 +17,6 @@ package me.filoghost.chestcommands.internal;
 import org.bukkit.Material;
 
 import me.filoghost.chestcommands.action.Action;
-import me.filoghost.chestcommands.util.ClickType;
 
 import java.util.List;
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/parser/IconParser.java b/Plugin/src/main/java/me/filoghost/chestcommands/parser/IconParser.java
index 2749de6..d928efa 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/parser/IconParser.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/parser/IconParser.java
@@ -29,8 +29,8 @@ import me.filoghost.chestcommands.config.AsciiPlaceholders;
 import me.filoghost.chestcommands.config.ConfigUtil;
 import me.filoghost.chestcommands.exception.FormatException;
 import me.filoghost.chestcommands.internal.RunActionsClickHandler;
+import me.filoghost.chestcommands.internal.ExtendedIcon;
 import me.filoghost.chestcommands.internal.RequiredItem;
-import me.filoghost.chestcommands.internal.icon.ExtendedIcon;
 import me.filoghost.chestcommands.parser.EnchantmentParser.EnchantmentDetails;
 import me.filoghost.chestcommands.util.ErrorCollector;
 import me.filoghost.chestcommands.util.FormatUtils;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/parser/MenuParser.java b/Plugin/src/main/java/me/filoghost/chestcommands/parser/MenuParser.java
index 049fd44..5417d82 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/parser/MenuParser.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/parser/MenuParser.java
@@ -26,10 +26,10 @@ import me.filoghost.chestcommands.api.Icon;
 import me.filoghost.chestcommands.config.ConfigUtil;
 import me.filoghost.chestcommands.config.yaml.PluginConfig;
 import me.filoghost.chestcommands.exception.FormatException;
+import me.filoghost.chestcommands.internal.ClickType;
 import me.filoghost.chestcommands.internal.ExtendedIconMenu;
 import me.filoghost.chestcommands.internal.MenuData;
 import me.filoghost.chestcommands.parser.IconParser.Coords;
-import me.filoghost.chestcommands.util.ClickType;
 import me.filoghost.chestcommands.util.ErrorCollector;
 import me.filoghost.chestcommands.util.FormatUtils;