diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7d2ad74
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.env
+.DS_Store
+.release
+.install
+.lua/*
+.vscode
+.idea
diff --git a/Chatter.lua b/Chatter/Chatter.lua
similarity index 100%
rename from Chatter.lua
rename to Chatter/Chatter.lua
diff --git a/Chatter.toc b/Chatter/Chatter.toc
similarity index 100%
rename from Chatter.toc
rename to Chatter/Chatter.toc
diff --git a/Libs/AceTab-3.0/AceConfigTab-3.0.lua b/Chatter/Libs/AceTab-3.0/AceConfigTab-3.0.lua
similarity index 100%
rename from Libs/AceTab-3.0/AceConfigTab-3.0.lua
rename to Chatter/Libs/AceTab-3.0/AceConfigTab-3.0.lua
diff --git a/Libs/AceTab-3.0/AceTab-3.0.lua b/Chatter/Libs/AceTab-3.0/AceTab-3.0.lua
similarity index 100%
rename from Libs/AceTab-3.0/AceTab-3.0.lua
rename to Chatter/Libs/AceTab-3.0/AceTab-3.0.lua
diff --git a/Libs/AceTab-3.0/AceTab-3.0.xml b/Chatter/Libs/AceTab-3.0/AceTab-3.0.xml
similarity index 100%
rename from Libs/AceTab-3.0/AceTab-3.0.xml
rename to Chatter/Libs/AceTab-3.0/AceTab-3.0.xml
diff --git a/Libs/LibSink-2.0/LibSink-2.0.lua b/Chatter/Libs/LibSink-2.0/LibSink-2.0.lua
similarity index 100%
rename from Libs/LibSink-2.0/LibSink-2.0.lua
rename to Chatter/Libs/LibSink-2.0/LibSink-2.0.lua
diff --git a/Libs/LibSink-2.0/lib.xml b/Chatter/Libs/LibSink-2.0/lib.xml
similarity index 100%
rename from Libs/LibSink-2.0/lib.xml
rename to Chatter/Libs/LibSink-2.0/lib.xml
diff --git a/Localization/deDE.lua b/Chatter/Localization/deDE.lua
similarity index 100%
rename from Localization/deDE.lua
rename to Chatter/Localization/deDE.lua
diff --git a/Localization/enUS.lua b/Chatter/Localization/enUS.lua
similarity index 100%
rename from Localization/enUS.lua
rename to Chatter/Localization/enUS.lua
diff --git a/Localization/esES.lua b/Chatter/Localization/esES.lua
similarity index 100%
rename from Localization/esES.lua
rename to Chatter/Localization/esES.lua
diff --git a/Localization/frFR.lua b/Chatter/Localization/frFR.lua
similarity index 100%
rename from Localization/frFR.lua
rename to Chatter/Localization/frFR.lua
diff --git a/Localization/koKR.lua b/Chatter/Localization/koKR.lua
similarity index 100%
rename from Localization/koKR.lua
rename to Chatter/Localization/koKR.lua
diff --git a/Localization/ruRU.lua b/Chatter/Localization/ruRU.lua
similarity index 100%
rename from Localization/ruRU.lua
rename to Chatter/Localization/ruRU.lua
diff --git a/Localization/zhCN.lua b/Chatter/Localization/zhCN.lua
similarity index 100%
rename from Localization/zhCN.lua
rename to Chatter/Localization/zhCN.lua
diff --git a/Localization/zhTW.lua b/Chatter/Localization/zhTW.lua
similarity index 100%
rename from Localization/zhTW.lua
rename to Chatter/Localization/zhTW.lua
diff --git a/Modules/AllResize.lua b/Chatter/Modules/AllResize.lua
similarity index 100%
rename from Modules/AllResize.lua
rename to Chatter/Modules/AllResize.lua
diff --git a/Modules/AltNames.lua b/Chatter/Modules/AltNames.lua
similarity index 100%
rename from Modules/AltNames.lua
rename to Chatter/Modules/AltNames.lua
diff --git a/Modules/AutoLogChat.lua b/Chatter/Modules/AutoLogChat.lua
similarity index 100%
rename from Modules/AutoLogChat.lua
rename to Chatter/Modules/AutoLogChat.lua
diff --git a/Modules/AutoPopup.lua b/Chatter/Modules/AutoPopup.lua
similarity index 100%
rename from Modules/AutoPopup.lua
rename to Chatter/Modules/AutoPopup.lua
diff --git a/Modules/BNet.lua b/Chatter/Modules/BNet.lua
similarity index 100%
rename from Modules/BNet.lua
rename to Chatter/Modules/BNet.lua
diff --git a/Modules/Buttons.lua b/Chatter/Modules/Buttons.lua
similarity index 100%
rename from Modules/Buttons.lua
rename to Chatter/Modules/Buttons.lua
diff --git a/Modules/ChannelColors.lua b/Chatter/Modules/ChannelColors.lua
similarity index 100%
rename from Modules/ChannelColors.lua
rename to Chatter/Modules/ChannelColors.lua
diff --git a/Modules/ChannelNames.lua b/Chatter/Modules/ChannelNames.lua
similarity index 100%
rename from Modules/ChannelNames.lua
rename to Chatter/Modules/ChannelNames.lua
diff --git a/Modules/ChatFading.lua b/Chatter/Modules/ChatFading.lua
similarity index 100%
rename from Modules/ChatFading.lua
rename to Chatter/Modules/ChatFading.lua
diff --git a/Modules/ChatFont.lua b/Chatter/Modules/ChatFont.lua
similarity index 100%
rename from Modules/ChatFont.lua
rename to Chatter/Modules/ChatFont.lua
diff --git a/Modules/ChatFrameBorders.lua b/Chatter/Modules/ChatFrameBorders.lua
similarity index 100%
rename from Modules/ChatFrameBorders.lua
rename to Chatter/Modules/ChatFrameBorders.lua
diff --git a/Modules/ChatFrameBorders.xml b/Chatter/Modules/ChatFrameBorders.xml
similarity index 100%
rename from Modules/ChatFrameBorders.xml
rename to Chatter/Modules/ChatFrameBorders.xml
diff --git a/Modules/ChatLink.Lua b/Chatter/Modules/ChatLink.Lua
similarity index 100%
rename from Modules/ChatLink.Lua
rename to Chatter/Modules/ChatLink.Lua
diff --git a/Modules/ChatScroll.lua b/Chatter/Modules/ChatScroll.lua
similarity index 100%
rename from Modules/ChatScroll.lua
rename to Chatter/Modules/ChatScroll.lua
diff --git a/Modules/ChatTabs.lua b/Chatter/Modules/ChatTabs.lua
similarity index 100%
rename from Modules/ChatTabs.lua
rename to Chatter/Modules/ChatTabs.lua
diff --git a/Modules/ClickInvite.lua b/Chatter/Modules/ClickInvite.lua
similarity index 100%
rename from Modules/ClickInvite.lua
rename to Chatter/Modules/ClickInvite.lua
diff --git a/Modules/CopyChat.lua b/Chatter/Modules/CopyChat.lua
similarity index 100%
rename from Modules/CopyChat.lua
rename to Chatter/Modules/CopyChat.lua
diff --git a/Modules/DelayGMOTD.lua b/Chatter/Modules/DelayGMOTD.lua
similarity index 100%
rename from Modules/DelayGMOTD.lua
rename to Chatter/Modules/DelayGMOTD.lua
diff --git a/Modules/EditBox.lua b/Chatter/Modules/EditBox.lua
similarity index 100%
rename from Modules/EditBox.lua
rename to Chatter/Modules/EditBox.lua
diff --git a/Modules/EditBoxHistory.lua b/Chatter/Modules/EditBoxHistory.lua
similarity index 100%
rename from Modules/EditBoxHistory.lua
rename to Chatter/Modules/EditBoxHistory.lua
diff --git a/Modules/GroupSay.lua b/Chatter/Modules/GroupSay.lua
similarity index 100%
rename from Modules/GroupSay.lua
rename to Chatter/Modules/GroupSay.lua
diff --git a/Modules/Highlight.lua b/Chatter/Modules/Highlight.lua
similarity index 100%
rename from Modules/Highlight.lua
rename to Chatter/Modules/Highlight.lua
diff --git a/Modules/Justify.lua b/Chatter/Modules/Justify.lua
similarity index 100%
rename from Modules/Justify.lua
rename to Chatter/Modules/Justify.lua
diff --git a/Modules/LinkHover.lua b/Chatter/Modules/LinkHover.lua
similarity index 100%
rename from Modules/LinkHover.lua
rename to Chatter/Modules/LinkHover.lua
diff --git a/Modules/PlayerNames.lua b/Chatter/Modules/PlayerNames.lua
similarity index 100%
rename from Modules/PlayerNames.lua
rename to Chatter/Modules/PlayerNames.lua
diff --git a/Modules/Scrollback.lua b/Chatter/Modules/Scrollback.lua
similarity index 100%
rename from Modules/Scrollback.lua
rename to Chatter/Modules/Scrollback.lua
diff --git a/Modules/ServerStorage.lua b/Chatter/Modules/ServerStorage.lua
similarity index 100%
rename from Modules/ServerStorage.lua
rename to Chatter/Modules/ServerStorage.lua
diff --git a/Modules/SplitText.lua b/Chatter/Modules/SplitText.lua
similarity index 100%
rename from Modules/SplitText.lua
rename to Chatter/Modules/SplitText.lua
diff --git a/Modules/StickyChannels.lua b/Chatter/Modules/StickyChannels.lua
similarity index 100%
rename from Modules/StickyChannels.lua
rename to Chatter/Modules/StickyChannels.lua
diff --git a/Modules/Telltarget.lua b/Chatter/Modules/Telltarget.lua
similarity index 100%
rename from Modules/Telltarget.lua
rename to Chatter/Modules/Telltarget.lua
diff --git a/Modules/Timestamps.lua b/Chatter/Modules/Timestamps.lua
similarity index 100%
rename from Modules/Timestamps.lua
rename to Chatter/Modules/Timestamps.lua
diff --git a/Modules/TinyChat.lua b/Chatter/Modules/TinyChat.lua
similarity index 100%
rename from Modules/TinyChat.lua
rename to Chatter/Modules/TinyChat.lua
diff --git a/Modules/UrlCopy.lua b/Chatter/Modules/UrlCopy.lua
similarity index 100%
rename from Modules/UrlCopy.lua
rename to Chatter/Modules/UrlCopy.lua
diff --git a/modules.xml b/Chatter/modules.xml
similarity index 100%
rename from modules.xml
rename to Chatter/modules.xml