diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityManager.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityManager.java
index 473a17d2f..f28427bb6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityManager.java
@@ -41,6 +41,13 @@ import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.communities.Community.PrivacySetting;
 import mineplex.core.communities.commands.CommunityCommand;
+import mineplex.core.communities.events.CommunityBrowserUpdateEvent;
+import mineplex.core.communities.events.CommunityDisbandEvent;
+import mineplex.core.communities.events.CommunityJoinRequestsUpdateEvent;
+import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
+import mineplex.core.communities.events.CommunityMembershipUpdateEvent;
+import mineplex.core.communities.events.CommunityNameUpdateEvent;
+import mineplex.core.communities.events.CommunitySettingUpdateEvent;
 import mineplex.core.communities.redis.CommunityChat;
 import mineplex.core.communities.redis.CommunityChatHandler;
 import mineplex.core.communities.redis.CommunityCloseJoinRequest;
@@ -65,7 +72,6 @@ import mineplex.core.communities.redis.CommunityUpdateName;
 import mineplex.core.communities.redis.CommunityUpdateNameHandler;
 import mineplex.core.communities.redis.CommunityUpdateSetting;
 import mineplex.core.communities.redis.CommunityUpdateSettingHandler;
-import mineplex.core.communities.storage.CommunityRepository;
 import mineplex.core.customdata.CustomDataManager;
 import mineplex.core.preferences.Preference;
 import mineplex.core.preferences.PreferencesManager;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/storage/CommunityRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityRepository.java
similarity index 99%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/storage/CommunityRepository.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityRepository.java
index d8a63c213..ae5c8eef1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/storage/CommunityRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityRepository.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.storage;
+package mineplex.core.communities;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/mcs/MCSTheme.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/MCSTheme.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/mcs/MCSTheme.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/MCSTheme.java
index 215cf9106..c62056dd7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/mcs/MCSTheme.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/MCSTheme.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.mcs;
+package mineplex.core.communities;
 
 import org.bukkit.Material;
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCommand.java
index f5010b330..6f13d2436 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityCommand.java
@@ -8,8 +8,8 @@ import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.communities.Community;
 import mineplex.core.communities.CommunityManager;
-import mineplex.core.communities.gui.community.CommunityMembersPage;
-import mineplex.core.communities.gui.overview.CommunityOverviewPage;
+import mineplex.core.communities.gui.pages.CommunityMembersPage;
+import mineplex.core.communities.gui.pages.CommunityOverviewPage;
 
 public class CommunityCommand extends MultiCommandBase<CommunityManager>
 {
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityMenuCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityMenuCommand.java
index b798eb371..f56aea0e8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityMenuCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/commands/CommunityMenuCommand.java
@@ -4,7 +4,7 @@ import org.bukkit.entity.Player;
 
 import mineplex.core.command.CommandBase;
 import mineplex.core.communities.CommunityManager;
-import mineplex.core.communities.gui.overview.CommunityOverviewPage;
+import mineplex.core.communities.gui.pages.CommunityOverviewPage;
 
 public class CommunityMenuCommand extends CommandBase<CommunityManager>
 {
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityBrowserUpdateEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityBrowserUpdateEvent.java
similarity index 89%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityBrowserUpdateEvent.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityBrowserUpdateEvent.java
index d9dff9fe7..e98c8e0e0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityBrowserUpdateEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityBrowserUpdateEvent.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities;
+package mineplex.core.communities.events;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityDisbandEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityDisbandEvent.java
similarity index 84%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityDisbandEvent.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityDisbandEvent.java
index ce97ed20e..5b18fbb06 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityDisbandEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityDisbandEvent.java
@@ -1,8 +1,10 @@
-package mineplex.core.communities;
+package mineplex.core.communities.events;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+import mineplex.core.communities.Community;
+
 public class CommunityDisbandEvent extends Event
 {
 	private static final HandlerList handlers = new HandlerList();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityJoinRequestsUpdateEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityJoinRequestsUpdateEvent.java
similarity index 85%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityJoinRequestsUpdateEvent.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityJoinRequestsUpdateEvent.java
index 899ee7f5e..6afd26aa2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityJoinRequestsUpdateEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityJoinRequestsUpdateEvent.java
@@ -1,8 +1,10 @@
-package mineplex.core.communities;
+package mineplex.core.communities.events;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+import mineplex.core.communities.Community;
+
 public class CommunityJoinRequestsUpdateEvent extends Event
 {
 	private static final HandlerList handlers = new HandlerList();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityMemberDataUpdateEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityMemberDataUpdateEvent.java
similarity index 92%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityMemberDataUpdateEvent.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityMemberDataUpdateEvent.java
index 1fd22e0e1..712f230b1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityMemberDataUpdateEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityMemberDataUpdateEvent.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities;
+package mineplex.core.communities.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityMembershipUpdateEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityMembershipUpdateEvent.java
similarity index 85%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityMembershipUpdateEvent.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityMembershipUpdateEvent.java
index 959044ea3..10dea71df 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityMembershipUpdateEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityMembershipUpdateEvent.java
@@ -1,8 +1,10 @@
-package mineplex.core.communities;
+package mineplex.core.communities.events;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+import mineplex.core.communities.Community;
+
 public class CommunityMembershipUpdateEvent extends Event
 {
 	private static final HandlerList handlers = new HandlerList();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityNameUpdateEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityNameUpdateEvent.java
similarity index 85%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityNameUpdateEvent.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityNameUpdateEvent.java
index a583c6ee9..8e49a03f4 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityNameUpdateEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunityNameUpdateEvent.java
@@ -1,8 +1,10 @@
-package mineplex.core.communities;
+package mineplex.core.communities.events;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+import mineplex.core.communities.Community;
+
 public class CommunityNameUpdateEvent extends Event
 {
 	private static final HandlerList handlers = new HandlerList();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunitySettingUpdateEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunitySettingUpdateEvent.java
similarity index 85%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/CommunitySettingUpdateEvent.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunitySettingUpdateEvent.java
index 5f7185fdc..184cc2d86 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/CommunitySettingUpdateEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/events/CommunitySettingUpdateEvent.java
@@ -1,8 +1,10 @@
-package mineplex.core.communities;
+package mineplex.core.communities.events;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+import mineplex.core.communities.Community;
+
 public class CommunitySettingUpdateEvent extends Event
 {
 	private static final HandlerList handlers = new HandlerList();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/ActionButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/ActionButton.java
similarity index 79%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/ActionButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/ActionButton.java
index b7e1a94bc..56b9cd64b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/ActionButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/ActionButton.java
@@ -1,9 +1,10 @@
-package mineplex.core.communities.gui;
+package mineplex.core.communities.gui.buttons;
 
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
 import mineplex.core.common.util.Callback;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
 
 public class ActionButton extends CommunitiesGUIButton
 {
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/CommunitiesGUIButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunitiesGUIButton.java
similarity index 91%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/CommunitiesGUIButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunitiesGUIButton.java
index a18b7e1f2..53ff87165 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/CommunitiesGUIButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunitiesGUIButton.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui;
+package mineplex.core.communities.gui.buttons;
 
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/browser/CommunityBrowserButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityBrowserButton.java
similarity index 91%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/browser/CommunityBrowserButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityBrowserButton.java
index e999b2a8f..5d37d49c9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/browser/CommunityBrowserButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityBrowserButton.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.browser;
+package mineplex.core.communities.gui.buttons;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -8,8 +8,8 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.LineFormat;
 import mineplex.core.common.util.UtilText;
 import mineplex.core.communities.Community;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
-import mineplex.core.communities.gui.community.CommunityMembersPage;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
+import mineplex.core.communities.gui.pages.CommunityMembersPage;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityBrowserButton extends CommunitiesGUIButton
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityButton.java
similarity index 97%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityButton.java
index ee5696f5a..61a7dbb8b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityButton.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.community;
+package mineplex.core.communities.gui.buttons;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -13,7 +13,7 @@ import mineplex.core.common.util.UtilText;
 import mineplex.core.communities.Community;
 import mineplex.core.communities.Community.PrivacySetting;
 import mineplex.core.communities.CommunityRole;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityButton extends CommunitiesGUIButton
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityChatReadingButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityChatReadingButton.java
similarity index 90%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityChatReadingButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityChatReadingButton.java
index 38382123a..6b213f7eb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityChatReadingButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityChatReadingButton.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.community;
+package mineplex.core.communities.gui.buttons;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
 
 import mineplex.core.common.util.C;
 import mineplex.core.communities.Community;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityChatReadingButton extends CommunitiesGUIButton
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityJoinRequestButton.java
similarity index 92%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityJoinRequestButton.java
index ad9af1d6e..c177eaf21 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityJoinRequestButton.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.community;
+package mineplex.core.communities.gui.buttons;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -6,7 +6,7 @@ import org.bukkit.event.inventory.ClickType;
 import mineplex.core.communities.Community;
 import mineplex.core.communities.CommunityJoinRequestInfo;
 import mineplex.core.communities.CommunityRole;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
 
 public class CommunityJoinRequestButton extends CommunitiesGUIButton
 {
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMemberButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityMemberButton.java
similarity index 96%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMemberButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityMemberButton.java
index c3d5ac8ed..19bfb0717 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMemberButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityMemberButton.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.community;
+package mineplex.core.communities.gui.buttons;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -11,7 +11,7 @@ import mineplex.core.communities.Community;
 import mineplex.core.communities.CommunityManager;
 import mineplex.core.communities.CommunityMemberInfo;
 import mineplex.core.communities.CommunityRole;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
 
 public class CommunityMemberButton extends CommunitiesGUIButton
 {
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunitySettingButton.java
similarity index 98%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunitySettingButton.java
index 27a9bee13..4247cbbe2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunitySettingButton.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.community;
+package mineplex.core.communities.gui.buttons;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -17,7 +17,7 @@ import mineplex.core.communities.Community;
 import mineplex.core.communities.Community.PrivacySetting;
 import mineplex.core.communities.CommunityRole;
 import mineplex.core.communities.CommunitySetting;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
 import mineplex.core.game.GameDisplay;
 import mineplex.core.itemstack.ItemBuilder;
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityVisualizationButton.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityVisualizationButton.java
similarity index 91%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityVisualizationButton.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityVisualizationButton.java
index 64ca6a19d..b6ddae190 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityVisualizationButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/buttons/CommunityVisualizationButton.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.overview;
+package mineplex.core.communities.gui.buttons;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -9,8 +9,8 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.LineFormat;
 import mineplex.core.common.util.UtilText;
 import mineplex.core.communities.Community;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
-import mineplex.core.communities.gui.community.CommunityMembersPage;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
+import mineplex.core.communities.gui.pages.CommunityMembersPage;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityVisualizationButton extends CommunitiesGUIButton
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/CommunitiesGUIPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunitiesGUIPage.java
similarity index 95%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/CommunitiesGUIPage.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunitiesGUIPage.java
index 0c0ede477..864bbcecf 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/CommunitiesGUIPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunitiesGUIPage.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui;
+package mineplex.core.communities.gui.pages;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,6 +14,7 @@ import org.bukkit.inventory.Inventory;
 import mineplex.core.Managers;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.communities.CommunityManager;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/browser/CommunityBrowserPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityBrowserPage.java
similarity index 89%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/browser/CommunityBrowserPage.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityBrowserPage.java
index df8668add..4bdb67c79 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/browser/CommunityBrowserPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityBrowserPage.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.browser;
+package mineplex.core.communities.gui.pages;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,13 +8,11 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.C;
-import mineplex.core.communities.CommunityBrowserUpdateEvent;
-import mineplex.core.communities.CommunityDisbandEvent;
+import mineplex.core.communities.events.CommunityBrowserUpdateEvent;
+import mineplex.core.communities.events.CommunityDisbandEvent;
 import mineplex.core.communities.CommunityManager;
-import mineplex.core.communities.gui.ActionButton;
-import mineplex.core.communities.gui.CommunitiesGUIPage;
-import mineplex.core.communities.gui.overview.CommunityInvitesPage;
-import mineplex.core.communities.gui.overview.CommunityOverviewPage;
+import mineplex.core.communities.gui.buttons.CommunityBrowserButton;
+import mineplex.core.communities.gui.buttons.ActionButton;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityBrowserPage extends CommunitiesGUIPage
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityInvitesPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityInvitesPage.java
similarity index 89%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityInvitesPage.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityInvitesPage.java
index 93796bede..3122547d9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityInvitesPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityInvitesPage.java
@@ -1,15 +1,14 @@
-package mineplex.core.communities.gui.overview;
+package mineplex.core.communities.gui.pages;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.C;
-import mineplex.core.communities.CommunityDisbandEvent;
-import mineplex.core.communities.CommunityMemberDataUpdateEvent;
-import mineplex.core.communities.gui.ActionButton;
-import mineplex.core.communities.gui.CommunitiesGUIPage;
-import mineplex.core.communities.gui.browser.CommunityBrowserPage;
+import mineplex.core.communities.events.CommunityDisbandEvent;
+import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
+import mineplex.core.communities.gui.buttons.ActionButton;
+import mineplex.core.communities.gui.buttons.CommunityVisualizationButton;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityInvitesPage extends CommunitiesGUIPage
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestsPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityJoinRequestsPage.java
similarity index 89%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestsPage.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityJoinRequestsPage.java
index e1f82de22..4c94722b8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestsPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityJoinRequestsPage.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.community;
+package mineplex.core.communities.gui.pages;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -9,15 +9,16 @@ import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.C;
 import mineplex.core.communities.Community;
-import mineplex.core.communities.CommunityDisbandEvent;
+import mineplex.core.communities.events.CommunityDisbandEvent;
 import mineplex.core.communities.CommunityJoinRequestInfo;
-import mineplex.core.communities.CommunityJoinRequestsUpdateEvent;
-import mineplex.core.communities.CommunityMemberDataUpdateEvent;
-import mineplex.core.communities.CommunityMembershipUpdateEvent;
+import mineplex.core.communities.events.CommunityJoinRequestsUpdateEvent;
+import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
+import mineplex.core.communities.events.CommunityMembershipUpdateEvent;
 import mineplex.core.communities.CommunityRole;
-import mineplex.core.communities.gui.ActionButton;
-import mineplex.core.communities.gui.CommunitiesGUIPage;
-import mineplex.core.communities.gui.overview.CommunityOverviewPage;
+import mineplex.core.communities.gui.buttons.ActionButton;
+import mineplex.core.communities.gui.buttons.CommunityButton;
+import mineplex.core.communities.gui.buttons.CommunityChatReadingButton;
+import mineplex.core.communities.gui.buttons.CommunityJoinRequestButton;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityJoinRequestsPage extends CommunitiesGUIPage
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMembersPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityMembersPage.java
similarity index 88%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMembersPage.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityMembersPage.java
index 2513f0e69..1b37b2c03 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMembersPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityMembersPage.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.community;
+package mineplex.core.communities.gui.pages;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -9,16 +9,17 @@ import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.C;
 import mineplex.core.communities.Community;
-import mineplex.core.communities.CommunityDisbandEvent;
-import mineplex.core.communities.CommunityJoinRequestsUpdateEvent;
-import mineplex.core.communities.CommunityMemberDataUpdateEvent;
+import mineplex.core.communities.events.CommunityDisbandEvent;
+import mineplex.core.communities.events.CommunityJoinRequestsUpdateEvent;
+import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
 import mineplex.core.communities.CommunityMemberInfo;
-import mineplex.core.communities.CommunityMembershipUpdateEvent;
+import mineplex.core.communities.events.CommunityMembershipUpdateEvent;
 import mineplex.core.communities.CommunityRole;
-import mineplex.core.communities.gui.ActionButton;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
-import mineplex.core.communities.gui.CommunitiesGUIPage;
-import mineplex.core.communities.gui.overview.CommunityOverviewPage;
+import mineplex.core.communities.gui.buttons.ActionButton;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
+import mineplex.core.communities.gui.buttons.CommunityButton;
+import mineplex.core.communities.gui.buttons.CommunityChatReadingButton;
+import mineplex.core.communities.gui.buttons.CommunityMemberButton;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityMembersPage extends CommunitiesGUIPage
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityOverviewPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityOverviewPage.java
similarity index 90%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityOverviewPage.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityOverviewPage.java
index e8a9da5cc..832070a31 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/overview/CommunityOverviewPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunityOverviewPage.java
@@ -1,6 +1,5 @@
-package mineplex.core.communities.gui.overview;
+package mineplex.core.communities.gui.pages;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.bukkit.Material;
@@ -9,11 +8,10 @@ import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.C;
 import mineplex.core.communities.Community;
-import mineplex.core.communities.CommunityDisbandEvent;
-import mineplex.core.communities.CommunityMemberDataUpdateEvent;
-import mineplex.core.communities.gui.ActionButton;
-import mineplex.core.communities.gui.CommunitiesGUIPage;
-import mineplex.core.communities.gui.browser.CommunityBrowserPage;
+import mineplex.core.communities.events.CommunityDisbandEvent;
+import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
+import mineplex.core.communities.gui.buttons.ActionButton;
+import mineplex.core.communities.gui.buttons.CommunityVisualizationButton;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunityOverviewPage extends CommunitiesGUIPage
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingsPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunitySettingsPage.java
similarity index 87%
rename from Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingsPage.java
rename to Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunitySettingsPage.java
index 44031723a..5d7cc26a8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingsPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/pages/CommunitySettingsPage.java
@@ -1,4 +1,4 @@
-package mineplex.core.communities.gui.community;
+package mineplex.core.communities.gui.pages;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -6,17 +6,18 @@ import org.bukkit.event.EventHandler;
 
 import mineplex.core.common.util.C;
 import mineplex.core.communities.Community;
-import mineplex.core.communities.CommunityDisbandEvent;
-import mineplex.core.communities.CommunityJoinRequestsUpdateEvent;
-import mineplex.core.communities.CommunityMemberDataUpdateEvent;
-import mineplex.core.communities.CommunityMembershipUpdateEvent;
+import mineplex.core.communities.events.CommunityDisbandEvent;
+import mineplex.core.communities.events.CommunityJoinRequestsUpdateEvent;
+import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
+import mineplex.core.communities.events.CommunityMembershipUpdateEvent;
 import mineplex.core.communities.CommunityRole;
 import mineplex.core.communities.CommunitySetting;
-import mineplex.core.communities.CommunitySettingUpdateEvent;
-import mineplex.core.communities.gui.ActionButton;
-import mineplex.core.communities.gui.CommunitiesGUIButton;
-import mineplex.core.communities.gui.CommunitiesGUIPage;
-import mineplex.core.communities.gui.overview.CommunityOverviewPage;
+import mineplex.core.communities.events.CommunitySettingUpdateEvent;
+import mineplex.core.communities.gui.buttons.ActionButton;
+import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
+import mineplex.core.communities.gui.buttons.CommunityButton;
+import mineplex.core.communities.gui.buttons.CommunityChatReadingButton;
+import mineplex.core.communities.gui.buttons.CommunitySettingButton;
 import mineplex.core.itemstack.ItemBuilder;
 
 public class CommunitySettingsPage extends CommunitiesGUIPage
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index 08ff73511..3376507dc 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -42,7 +42,7 @@ import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTextBottom;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.communities.Community;
-import mineplex.core.communities.CommunityDisbandEvent;
+import mineplex.core.communities.events.CommunityDisbandEvent;
 import mineplex.core.communities.CommunityManager;
 import mineplex.core.communities.CommunityRole;
 import mineplex.core.itemstack.ItemStackFactory;