diff --git a/src/buttondevteam/thebuttonmcchat/AnnouncerThread.java b/src/buttondevteam/chat/AnnouncerThread.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/AnnouncerThread.java
rename to src/buttondevteam/chat/AnnouncerThread.java
diff --git a/src/buttondevteam/thebuttonmcchat/Channel.java b/src/buttondevteam/chat/Channel.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/Channel.java
rename to src/buttondevteam/chat/Channel.java
diff --git a/src/buttondevteam/thebuttonmcchat/ChatFormatter.java b/src/buttondevteam/chat/ChatFormatter.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/ChatFormatter.java
rename to src/buttondevteam/chat/ChatFormatter.java
diff --git a/src/buttondevteam/thebuttonmcchat/ChatFormatterBuilder.java b/src/buttondevteam/chat/ChatFormatterBuilder.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/ChatFormatterBuilder.java
rename to src/buttondevteam/chat/ChatFormatterBuilder.java
diff --git a/src/buttondevteam/thebuttonmcchat/ChatPlayer.java b/src/buttondevteam/chat/ChatPlayer.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/ChatPlayer.java
rename to src/buttondevteam/chat/ChatPlayer.java
diff --git a/src/buttondevteam/thebuttonmcchat/ChatProcessing.java b/src/buttondevteam/chat/ChatProcessing.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/ChatProcessing.java
rename to src/buttondevteam/chat/ChatProcessing.java
diff --git a/src/buttondevteam/thebuttonmcchat/CreativeGlobalMechanic.java b/src/buttondevteam/chat/CreativeGlobalMechanic.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/CreativeGlobalMechanic.java
rename to src/buttondevteam/chat/CreativeGlobalMechanic.java
diff --git a/src/buttondevteam/thebuttonmcchat/FlairStates.java b/src/buttondevteam/chat/FlairStates.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/FlairStates.java
rename to src/buttondevteam/chat/FlairStates.java
diff --git a/src/buttondevteam/thebuttonmcchat/FormattedSection.java b/src/buttondevteam/chat/FormattedSection.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/FormattedSection.java
rename to src/buttondevteam/chat/FormattedSection.java
diff --git a/src/buttondevteam/thebuttonmcchat/JarUtils.java b/src/buttondevteam/chat/JarUtils.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/JarUtils.java
rename to src/buttondevteam/chat/JarUtils.java
diff --git a/src/buttondevteam/thebuttonmcchat/PlayerJoinTimerTask.java b/src/buttondevteam/chat/PlayerJoinTimerTask.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/PlayerJoinTimerTask.java
rename to src/buttondevteam/chat/PlayerJoinTimerTask.java
diff --git a/src/buttondevteam/thebuttonmcchat/PlayerListener.java b/src/buttondevteam/chat/PlayerListener.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/PlayerListener.java
rename to src/buttondevteam/chat/PlayerListener.java
diff --git a/src/buttondevteam/thebuttonmcchat/PluginMain.java b/src/buttondevteam/chat/PluginMain.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/PluginMain.java
rename to src/buttondevteam/chat/PluginMain.java
diff --git a/src/buttondevteam/thebuttonmcchat/TBMCChatAPI.java b/src/buttondevteam/chat/TBMCChatAPI.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/TBMCChatAPI.java
rename to src/buttondevteam/chat/TBMCChatAPI.java
diff --git a/src/buttondevteam/thebuttonmcchat/TellrawEvent.java b/src/buttondevteam/chat/TellrawEvent.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/TellrawEvent.java
rename to src/buttondevteam/chat/TellrawEvent.java
diff --git a/src/buttondevteam/thebuttonmcchat/TellrawPart.java b/src/buttondevteam/chat/TellrawPart.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/TellrawPart.java
rename to src/buttondevteam/chat/TellrawPart.java
diff --git a/src/buttondevteam/thebuttonmcchat/TellrawSerializableEnum.java b/src/buttondevteam/chat/TellrawSerializableEnum.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/TellrawSerializableEnum.java
rename to src/buttondevteam/chat/TellrawSerializableEnum.java
diff --git a/src/buttondevteam/thebuttonmcchat/TellrawSerializer.java b/src/buttondevteam/chat/TellrawSerializer.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/TellrawSerializer.java
rename to src/buttondevteam/chat/TellrawSerializer.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ChatonlyCommand.java b/src/buttondevteam/chat/commands/ChatonlyCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ChatonlyCommand.java
rename to src/buttondevteam/chat/commands/ChatonlyCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/CommandCaller.java b/src/buttondevteam/chat/commands/CommandCaller.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/CommandCaller.java
rename to src/buttondevteam/chat/commands/CommandCaller.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/MWikiCommand.java b/src/buttondevteam/chat/commands/MWikiCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/MWikiCommand.java
rename to src/buttondevteam/chat/commands/MWikiCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/OOCCommand.java b/src/buttondevteam/chat/commands/OOCCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/OOCCommand.java
rename to src/buttondevteam/chat/commands/OOCCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/TBMCCommandBase.java b/src/buttondevteam/chat/commands/TBMCCommandBase.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/TBMCCommandBase.java
rename to src/buttondevteam/chat/commands/TBMCCommandBase.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/UnlolCommand.java b/src/buttondevteam/chat/commands/UnlolCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/UnlolCommand.java
rename to src/buttondevteam/chat/commands/UnlolCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/YeehawCommand.java b/src/buttondevteam/chat/commands/YeehawCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/YeehawCommand.java
rename to src/buttondevteam/chat/commands/YeehawCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/appendtext/AppendTextCommandBase.java b/src/buttondevteam/chat/commands/appendtext/AppendTextCommandBase.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/appendtext/AppendTextCommandBase.java
rename to src/buttondevteam/chat/commands/appendtext/AppendTextCommandBase.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/appendtext/ShrugCommand.java b/src/buttondevteam/chat/commands/appendtext/ShrugCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/appendtext/ShrugCommand.java
rename to src/buttondevteam/chat/commands/appendtext/ShrugCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/appendtext/TableflipCommand.java b/src/buttondevteam/chat/commands/appendtext/TableflipCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/appendtext/TableflipCommand.java
rename to src/buttondevteam/chat/commands/appendtext/TableflipCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/appendtext/UnflipCommand.java b/src/buttondevteam/chat/commands/appendtext/UnflipCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/appendtext/UnflipCommand.java
rename to src/buttondevteam/chat/commands/appendtext/UnflipCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/AcceptCommand.java b/src/buttondevteam/chat/commands/ucmds/AcceptCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/AcceptCommand.java
rename to src/buttondevteam/chat/commands/ucmds/AcceptCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/CCommand.java b/src/buttondevteam/chat/commands/ucmds/CCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/CCommand.java
rename to src/buttondevteam/chat/commands/ucmds/CCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/HelpCommand.java b/src/buttondevteam/chat/commands/ucmds/HelpCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/HelpCommand.java
rename to src/buttondevteam/chat/commands/ucmds/HelpCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/IgnoreCommand.java b/src/buttondevteam/chat/commands/ucmds/IgnoreCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/IgnoreCommand.java
rename to src/buttondevteam/chat/commands/ucmds/IgnoreCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/KittycannonCommand.java b/src/buttondevteam/chat/commands/ucmds/KittycannonCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/KittycannonCommand.java
rename to src/buttondevteam/chat/commands/ucmds/KittycannonCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/NameCommand.java b/src/buttondevteam/chat/commands/ucmds/NameCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/NameCommand.java
rename to src/buttondevteam/chat/commands/ucmds/NameCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/OpmeCommand.java b/src/buttondevteam/chat/commands/ucmds/OpmeCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/OpmeCommand.java
rename to src/buttondevteam/chat/commands/ucmds/OpmeCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/UCommand.java b/src/buttondevteam/chat/commands/ucmds/UCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/UCommand.java
rename to src/buttondevteam/chat/commands/ucmds/UCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/UCommandBase.java b/src/buttondevteam/chat/commands/ucmds/UCommandBase.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/UCommandBase.java
rename to src/buttondevteam/chat/commands/ucmds/UCommandBase.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/AdminCommand.java b/src/buttondevteam/chat/commands/ucmds/admin/AdminCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/AdminCommand.java
rename to src/buttondevteam/chat/commands/ucmds/admin/AdminCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/AdminCommandBase.java b/src/buttondevteam/chat/commands/ucmds/admin/AdminCommandBase.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/AdminCommandBase.java
rename to src/buttondevteam/chat/commands/ucmds/admin/AdminCommandBase.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/ConfirmCommand.java b/src/buttondevteam/chat/commands/ucmds/admin/ConfirmCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/ConfirmCommand.java
rename to src/buttondevteam/chat/commands/ucmds/admin/ConfirmCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/DebugCommand.java b/src/buttondevteam/chat/commands/ucmds/admin/DebugCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/DebugCommand.java
rename to src/buttondevteam/chat/commands/ucmds/admin/DebugCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/GetLastErrorCommand.java b/src/buttondevteam/chat/commands/ucmds/admin/GetLastErrorCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/GetLastErrorCommand.java
rename to src/buttondevteam/chat/commands/ucmds/admin/GetLastErrorCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/PlayerInfoCommand.java b/src/buttondevteam/chat/commands/ucmds/admin/PlayerInfoCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/PlayerInfoCommand.java
rename to src/buttondevteam/chat/commands/ucmds/admin/PlayerInfoCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/ReloadCommand.java b/src/buttondevteam/chat/commands/ucmds/admin/ReloadCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/ReloadCommand.java
rename to src/buttondevteam/chat/commands/ucmds/admin/ReloadCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/SaveCommand.java b/src/buttondevteam/chat/commands/ucmds/admin/SaveCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/SaveCommand.java
rename to src/buttondevteam/chat/commands/ucmds/admin/SaveCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/SetFlairCommand.java b/src/buttondevteam/chat/commands/ucmds/admin/SetFlairCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/SetFlairCommand.java
rename to src/buttondevteam/chat/commands/ucmds/admin/SetFlairCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/UpdatePlugin.java b/src/buttondevteam/chat/commands/ucmds/admin/UpdatePlugin.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/admin/UpdatePlugin.java
rename to src/buttondevteam/chat/commands/ucmds/admin/UpdatePlugin.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/AddCommand.java b/src/buttondevteam/chat/commands/ucmds/announce/AddCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/AddCommand.java
rename to src/buttondevteam/chat/commands/ucmds/announce/AddCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/AnnounceCommand.java b/src/buttondevteam/chat/commands/ucmds/announce/AnnounceCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/AnnounceCommand.java
rename to src/buttondevteam/chat/commands/ucmds/announce/AnnounceCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/AnnounceCommandBase.java b/src/buttondevteam/chat/commands/ucmds/announce/AnnounceCommandBase.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/AnnounceCommandBase.java
rename to src/buttondevteam/chat/commands/ucmds/announce/AnnounceCommandBase.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/EditCommand.java b/src/buttondevteam/chat/commands/ucmds/announce/EditCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/EditCommand.java
rename to src/buttondevteam/chat/commands/ucmds/announce/EditCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/ListCommand.java b/src/buttondevteam/chat/commands/ucmds/announce/ListCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/ListCommand.java
rename to src/buttondevteam/chat/commands/ucmds/announce/ListCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/RemoveCommand.java b/src/buttondevteam/chat/commands/ucmds/announce/RemoveCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/RemoveCommand.java
rename to src/buttondevteam/chat/commands/ucmds/announce/RemoveCommand.java
diff --git a/src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/SetTimeCommand.java b/src/buttondevteam/chat/commands/ucmds/announce/SetTimeCommand.java
similarity index 100%
rename from src/buttondevteam/thebuttonmcchat/commands/ucmds/announce/SetTimeCommand.java
rename to src/buttondevteam/chat/commands/ucmds/announce/SetTimeCommand.java