diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/ChestCommands.java b/Plugin/src/main/java/me/filoghost/chestcommands/ChestCommands.java
index b6d5dfa..a4b1d21 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/ChestCommands.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/ChestCommands.java
@@ -34,12 +34,12 @@ import me.filoghost.chestcommands.config.AsciiPlaceholders;
 import me.filoghost.chestcommands.config.Lang;
 import me.filoghost.chestcommands.config.Settings;
 import me.filoghost.chestcommands.config.yaml.PluginConfig;
-import me.filoghost.chestcommands.internal.AdvancedIconMenu;
-import me.filoghost.chestcommands.internal.MenuSettings;
 import me.filoghost.chestcommands.listener.CommandListener;
 import me.filoghost.chestcommands.listener.InventoryListener;
 import me.filoghost.chestcommands.listener.JoinListener;
 import me.filoghost.chestcommands.listener.SignListener;
+import me.filoghost.chestcommands.menu.AdvancedIconMenu;
+import me.filoghost.chestcommands.menu.settings.MenuSettings;
 import me.filoghost.chestcommands.parser.MenuParser;
 import me.filoghost.chestcommands.task.RefreshMenusTask;
 import me.filoghost.chestcommands.util.FileUtils;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/MenuManager.java b/Plugin/src/main/java/me/filoghost/chestcommands/MenuManager.java
index 68fff64..b2f50d3 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/MenuManager.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/MenuManager.java
@@ -25,10 +25,10 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 
-import me.filoghost.chestcommands.internal.AdvancedIconMenu;
-import me.filoghost.chestcommands.internal.BaseIconMenu;
-import me.filoghost.chestcommands.internal.MenuInventoryHolder;
-import me.filoghost.chestcommands.internal.OpenTrigger;
+import me.filoghost.chestcommands.menu.AdvancedIconMenu;
+import me.filoghost.chestcommands.menu.BaseIconMenu;
+import me.filoghost.chestcommands.menu.MenuInventoryHolder;
+import me.filoghost.chestcommands.menu.settings.OpenTrigger;
 import me.filoghost.chestcommands.util.CaseInsensitiveMap;
 import me.filoghost.chestcommands.util.ErrorCollector;
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/action/OpenMenuAction.java b/Plugin/src/main/java/me/filoghost/chestcommands/action/OpenMenuAction.java
index 9710acd..52e9ad9 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/action/OpenMenuAction.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/action/OpenMenuAction.java
@@ -19,7 +19,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 import me.filoghost.chestcommands.ChestCommands;
-import me.filoghost.chestcommands.internal.AdvancedIconMenu;
+import me.filoghost.chestcommands.menu.AdvancedIconMenu;
 
 public class OpenMenuAction extends Action {
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/api/impl/BackendAPIImpl.java b/Plugin/src/main/java/me/filoghost/chestcommands/api/impl/BackendAPIImpl.java
index 9b81f91..9d5edfe 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/api/impl/BackendAPIImpl.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/api/impl/BackendAPIImpl.java
@@ -23,7 +23,7 @@ import me.filoghost.chestcommands.api.StaticIcon;
 import me.filoghost.chestcommands.ChestCommands;
 import me.filoghost.chestcommands.api.ConfigurableIcon;
 import me.filoghost.chestcommands.api.internal.BackendAPI;
-import me.filoghost.chestcommands.internal.AdvancedIconMenu;
+import me.filoghost.chestcommands.menu.AdvancedIconMenu;
 
 public class BackendAPIImpl extends BackendAPI {
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/api/impl/IconMenuImpl.java b/Plugin/src/main/java/me/filoghost/chestcommands/api/impl/IconMenuImpl.java
index bc940d4..2092527 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/api/impl/IconMenuImpl.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/api/impl/IconMenuImpl.java
@@ -16,7 +16,7 @@ package me.filoghost.chestcommands.api.impl;
 
 import me.filoghost.chestcommands.api.Icon;
 import me.filoghost.chestcommands.api.IconMenu;
-import me.filoghost.chestcommands.internal.BaseIconMenu;
+import me.filoghost.chestcommands.menu.BaseIconMenu;
 
 public class IconMenuImpl extends BaseIconMenu<Icon> implements IconMenu {
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/command/CommandHandler.java b/Plugin/src/main/java/me/filoghost/chestcommands/command/CommandHandler.java
index fa10621..85e861c 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/command/CommandHandler.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/command/CommandHandler.java
@@ -25,7 +25,7 @@ import me.filoghost.chestcommands.MenuManager;
 import me.filoghost.chestcommands.Permissions;
 import me.filoghost.chestcommands.command.framework.CommandFramework;
 import me.filoghost.chestcommands.command.framework.CommandValidate;
-import me.filoghost.chestcommands.internal.AdvancedIconMenu;
+import me.filoghost.chestcommands.menu.AdvancedIconMenu;
 import me.filoghost.chestcommands.util.ErrorCollector;
 
 public class CommandHandler extends CommandFramework {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/listener/CommandListener.java b/Plugin/src/main/java/me/filoghost/chestcommands/listener/CommandListener.java
index 2e4e7de..df81549 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/listener/CommandListener.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/listener/CommandListener.java
@@ -20,7 +20,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
 import me.filoghost.chestcommands.MenuManager;
-import me.filoghost.chestcommands.internal.AdvancedIconMenu;
+import me.filoghost.chestcommands.menu.AdvancedIconMenu;
 
 public class CommandListener implements Listener {
 	
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/listener/InventoryListener.java b/Plugin/src/main/java/me/filoghost/chestcommands/listener/InventoryListener.java
index fd1ecb4..5646a99 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/listener/InventoryListener.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/listener/InventoryListener.java
@@ -30,7 +30,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import me.filoghost.chestcommands.ChestCommands;
 import me.filoghost.chestcommands.MenuManager;
 import me.filoghost.chestcommands.api.Icon;
-import me.filoghost.chestcommands.internal.BaseIconMenu;
+import me.filoghost.chestcommands.menu.BaseIconMenu;
 
 public class InventoryListener implements Listener {
 	
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/listener/SignListener.java b/Plugin/src/main/java/me/filoghost/chestcommands/listener/SignListener.java
index 6c02376..5f0acda 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/listener/SignListener.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/listener/SignListener.java
@@ -28,7 +28,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import me.filoghost.chestcommands.ChestCommands;
 import me.filoghost.chestcommands.MenuManager;
 import me.filoghost.chestcommands.Permissions;
-import me.filoghost.chestcommands.internal.AdvancedIconMenu;
+import me.filoghost.chestcommands.menu.AdvancedIconMenu;
 import me.filoghost.chestcommands.util.FileUtils;
 
 public class SignListener implements Listener {
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/AdvancedIcon.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/AdvancedIcon.java
similarity index 95%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/AdvancedIcon.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/AdvancedIcon.java
index a47fcdb..b6471ac 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/AdvancedIcon.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/AdvancedIcon.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;
+package me.filoghost.chestcommands.menu;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/AdvancedIconMenu.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/AdvancedIconMenu.java
similarity index 95%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/AdvancedIconMenu.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/AdvancedIconMenu.java
index 5a94e07..5ea2d03 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/AdvancedIconMenu.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/AdvancedIconMenu.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;
+package me.filoghost.chestcommands.menu;
 
 import java.util.List;
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/BaseIconMenu.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/BaseIconMenu.java
similarity index 94%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/BaseIconMenu.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/BaseIconMenu.java
index f5264a0..569c614 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/BaseIconMenu.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/BaseIconMenu.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;
+package me.filoghost.chestcommands.menu;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/Grid.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/Grid.java
similarity index 95%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/Grid.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/Grid.java
index a0a97a6..d76714a 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/Grid.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/Grid.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;
+package me.filoghost.chestcommands.menu;
 
 import me.filoghost.chestcommands.util.Preconditions;
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuInventoryHolder.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/MenuInventoryHolder.java
similarity index 94%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuInventoryHolder.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/MenuInventoryHolder.java
index 6076956..d413341 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuInventoryHolder.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/MenuInventoryHolder.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;
+package me.filoghost.chestcommands.menu;
 
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.Inventory;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/RequiredItem.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/RequiredItem.java
similarity index 94%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/RequiredItem.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/RequiredItem.java
index b3a8867..b6be637 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/RequiredItem.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/RequiredItem.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;
+package me.filoghost.chestcommands.menu;
 
 import org.bukkit.Material;
 import org.bukkit.inventory.Inventory;
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/ClickType.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/ClickType.java
similarity index 93%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/ClickType.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/ClickType.java
index 434d75d..6765eb6 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/ClickType.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/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.internal;
+package me.filoghost.chestcommands.menu.settings;
 
 import org.bukkit.event.block.Action;
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuSettings.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/MenuSettings.java
similarity index 93%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuSettings.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/MenuSettings.java
index 756d1eb..aa9b365 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/MenuSettings.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/MenuSettings.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;
+package me.filoghost.chestcommands.menu.settings;
 
 import me.filoghost.chestcommands.action.Action;
 
diff --git a/Plugin/src/main/java/me/filoghost/chestcommands/internal/OpenTrigger.java b/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/OpenTrigger.java
similarity index 93%
rename from Plugin/src/main/java/me/filoghost/chestcommands/internal/OpenTrigger.java
rename to Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/OpenTrigger.java
index 1ba0be9..fd8c23a 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/internal/OpenTrigger.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/menu/settings/OpenTrigger.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;
+package me.filoghost.chestcommands.menu.settings;
 
 import org.bukkit.Material;
 import org.bukkit.event.block.Action;
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 3030393..edd1b6e 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/parser/IconParser.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/parser/IconParser.java
@@ -26,8 +26,8 @@ import me.filoghost.chestcommands.ChestCommands;
 import me.filoghost.chestcommands.action.Action;
 import me.filoghost.chestcommands.config.AsciiPlaceholders;
 import me.filoghost.chestcommands.config.ConfigUtil;
-import me.filoghost.chestcommands.internal.AdvancedIcon;
-import me.filoghost.chestcommands.internal.RequiredItem;
+import me.filoghost.chestcommands.menu.AdvancedIcon;
+import me.filoghost.chestcommands.menu.RequiredItem;
 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 b5b5bb2..824eb2d 100644
--- a/Plugin/src/main/java/me/filoghost/chestcommands/parser/MenuParser.java
+++ b/Plugin/src/main/java/me/filoghost/chestcommands/parser/MenuParser.java
@@ -24,11 +24,11 @@ import me.filoghost.chestcommands.ChestCommands;
 import me.filoghost.chestcommands.action.Action;
 import me.filoghost.chestcommands.config.ConfigUtil;
 import me.filoghost.chestcommands.config.yaml.PluginConfig;
-import me.filoghost.chestcommands.internal.AdvancedIcon;
-import me.filoghost.chestcommands.internal.AdvancedIconMenu;
-import me.filoghost.chestcommands.internal.ClickType;
-import me.filoghost.chestcommands.internal.MenuSettings;
-import me.filoghost.chestcommands.internal.OpenTrigger;
+import me.filoghost.chestcommands.menu.AdvancedIcon;
+import me.filoghost.chestcommands.menu.AdvancedIconMenu;
+import me.filoghost.chestcommands.menu.settings.ClickType;
+import me.filoghost.chestcommands.menu.settings.MenuSettings;
+import me.filoghost.chestcommands.menu.settings.OpenTrigger;
 import me.filoghost.chestcommands.parser.IconParser.Coords;
 import me.filoghost.chestcommands.util.ErrorCollector;
 import me.filoghost.chestcommands.util.FormatUtils;