start sorting

src/index.js

@@ -19,17 +19,17 @@ const globalKeys = Object.keys(Globals);
 for (const key of globalKeys) deprecateGlobal(key, Globals[key]);
 
 
-import BdApi from "./bdApi";
-import BDV2 from "./v2";
-import pluginModule from "./pluginModule";
-import themeModule from "./themeModule";
-import Utils from "./utils";
-import BDEvents from "./bdEvents";
-import settingsPanel from "./settingsPanel";
-import DataStore from "./dataStore";
-import emoteModule from "./emoteModule";
-import ContentManager from "./contentManager";
-import ClassNormalizer from "./classNormalizer";
+import BdApi from "./modules/bdApi";
+import BDV2 from "./modules/v2";
+import pluginModule from "./modules/pluginModule";
+import themeModule from "./modules/themeModule";
+import Utils from "./modules/utils";
+import BDEvents from "./modules/bdEvents";
+import settingsPanel from "./modules/settingsPanel";
+import DataStore from "./modules/dataStore";
+import emoteModule from "./modules/emoteModule";
+import ContentManager from "./modules/contentManager";
+import ClassNormalizer from "./modules/classNormalizer";
 
 deprecateGlobal("BDV2", BDV2);
 deprecateGlobal("pluginModule", pluginModule);
@@ -44,7 +44,7 @@ deprecateGlobal("ClassNormalizer", ClassNormalizer);
 
 window.BdApi = BdApi;
 
-import Core from "./core";
+import Core from "./modules/core";
 export default class CoreWrapper {
     constructor(bdConfig) {
         this.mainCore = new Core(bdConfig);

src/modules/24hour.js

@@ -1,4 +1,4 @@
-import {settingsCookie} from "./0globals";
+import {settingsCookie} from "../0globals";
 import BDV2 from "./v2";
 import Utils from "./utils";
 

src/modules/bdApi.js

@@ -1,4 +1,4 @@
-import {pluginCookie, themeCookie, bdplugins, bdthemes, settingsCookie, settings, bdEmotes} from "./0globals";
+import {pluginCookie, themeCookie, bdplugins, bdthemes, settingsCookie, settings, bdEmotes} from "../0globals";
 import mainCore from "./core";
 import Utils from "./utils";
 import BDV2 from "./v2";

src/modules/coloredText.js

@@ -1,4 +1,4 @@
-import {settingsCookie} from "./0globals";
+import {settingsCookie} from "../0globals";
 import BDV2 from "./v2";
 import Utils from "./utils";
 

src/modules/contentManager.js

@@ -1,5 +1,5 @@
 
-import {bdConfig, bdplugins, bdthemes} from "./0globals";
+import {bdConfig, bdplugins, bdthemes} from "../0globals";
 import pluginModule from "./pluginModule";
 import themeModule from "./themeModule";
 import Utils from "./utils";

src/modules/core.js

@@ -1,4 +1,4 @@
-import {bdConfig, minSupportedVersion, bbdVersion, settingsCookie, bdpluginErrors, bdthemeErrors, bbdChangelog, defaultCookie} from "./0globals";
+import {bdConfig, minSupportedVersion, bbdVersion, settingsCookie, bdpluginErrors, bdthemeErrors, bbdChangelog, defaultCookie} from "../0globals";
 import Utils from "./utils";
 import emoteModule from "./emoteModule";
 import quickEmoteMenu from "./quickEmoteMenu";
@@ -12,7 +12,7 @@ import themeModule from "./themeModule";
 import DataStore from "./dataStore";
 import WebpackModules from "./webpackModules";
 
-import BDLogo from "./react/bdLogo";
+import BDLogo from "../ui/bdLogo";
 
 function Core(config) {
     Object.assign(bdConfig, config);

src/modules/dataStore.js

@@ -1,4 +1,4 @@
-import {bdConfig} from "./0globals";
+import {bdConfig} from "../0globals";
 import Utils from "./utils";
 import ContentManager from "./contentManager";
 

src/modules/emoteModule.js

@@ -1,9 +1,9 @@
-import {bdConfig, settingsCookie, bemotes, bdEmoteSettingIDs, bdEmotes} from "./0globals";
+import {bdConfig, settingsCookie, bemotes, bdEmoteSettingIDs, bdEmotes} from "../0globals";
 import DataStore from "./dataStore";
 import BDV2 from "./v2";
 import Utils from "./utils";
 
-import BDEmote from "./react/bdEmote";
+import BDEmote from "../ui/bdEmote";
 
 function EmoteModule() {
     Object.defineProperty(this, "categories", {

src/modules/pluginModule.js

@@ -1,4 +1,4 @@
-import {bdpluginErrors, pluginCookie, settingsCookie, bdplugins} from "./0globals";
+import {bdpluginErrors, pluginCookie, settingsCookie, bdplugins} from "../0globals";
 import ContentManager from "./contentManager";
 import DataStore from "./dataStore";
 import BDEvents from "./bdEvents";

src/modules/publicServers.js

@@ -1,10 +1,10 @@
-import {settingsCookie} from "./0globals";
+import {settingsCookie} from "../0globals";
 import BDV2 from "./v2";
 import webpackModules from "./webpackModules";
 import Utils from "./utils";
 
-import V2C_PublicServers from "./react/publicServers";
-import Layer from "./react/layer";
+import V2C_PublicServers from "../ui/publicServers";
+import Layer from "../ui/layer";
 
 export default new class V2_PublicServers {
 

src/modules/quickEmoteMenu.js

@@ -1,4 +1,4 @@
-import {settingsCookie, bdEmotes} from "./0globals";
+import {settingsCookie, bdEmotes} from "../0globals";
 import DataStore from "./dataStore";
 import BDV2 from "./v2";
 import Utils from "./utils";

src/modules/settingsPanel.js

@@ -1,4 +1,4 @@
-import {settings, settingsCookie, bdplugins, bdthemes} from "./0globals";
+import {settings, settingsCookie, bdplugins, bdthemes} from "../0globals";
 import DataStore from "./dataStore";
 import V2_SettingsPanel_Sidebar from "./settingsPanelSidebar";
 import Utils from "./utils";
@@ -17,18 +17,18 @@ import ClassNormalizer from "./classNormalizer";
 import dMode from "./devMode";
 import quickEmoteMenu from "./quickEmoteMenu";
 
-import Tools from "./react/tools";
-import ReloadIcon from "./react/reloadIcon";
-import TooltipWrap from "./react/tooltipWrap";
-import Scroller from "./react/scroller";
-import List from "./react/list";
-import PluginCard from "./react/pluginCard";
-import ThemeCard from "./react/themeCard";
-import SectionedSettingsPanel from "./react/sectionedSettingsPanel";
-import SettingsPanel from "./react/settingsPanel";
-import CssEditor from "./react/cssEditor";
-import ContentColumn from "./react/contentColumn";
-import ErrorBoundary from "./react/errorBoundary";
+import Tools from "../ui/tools";
+import ReloadIcon from "../ui/reloadIcon";
+import TooltipWrap from "../ui/tooltipWrap";
+import Scroller from "../ui/scroller";
+import List from "../ui/list";
+import PluginCard from "../ui/pluginCard";
+import ThemeCard from "../ui/themeCard";
+import SectionedSettingsPanel from "../ui/sectionedSettingsPanel";
+import SettingsPanel from "../ui/settingsPanel";
+import CssEditor from "../ui/cssEditor";
+import ContentColumn from "../ui/contentColumn";
+import ErrorBoundary from "../ui/errorBoundary";
 
 export default new class V2_SettingsPanel {
 

src/modules/settingsPanelSidebar.js

@@ -1,7 +1,7 @@
 import Utils from "./utils";
 import BDV2 from "./v2";
 
-import SideBar from "./react/sidebar";
+import SideBar from "../ui/sidebar";
 
 export default class V2_SettingsPanel_Sidebar {
 

src/modules/themeModule.js

@@ -1,4 +1,4 @@
-import {bdthemeErrors, themeCookie, settingsCookie, bdthemes} from "./0globals";
+import {bdthemeErrors, themeCookie, settingsCookie, bdthemes} from "../0globals";
 import ContentManager from "./contentManager";
 import DataStore from "./dataStore";
 import BDEvents from "./bdEvents";

src/modules/v2.js

@@ -1,4 +1,4 @@
-import {settings} from "./0globals";
+import {settings} from "../0globals";
 
 export default new class V2 {
 

src/ui/bdEmote.js

@@ -1,6 +1,6 @@
 import {settingsCookie} from "../0globals";
-import quickEmoteMenu from "../quickEmoteMenu";
-import BDV2 from "../v2";
+import quickEmoteMenu from "../modules/quickEmoteMenu";
+import BDV2 from "../modules/v2";
 
 export default class BDEmote extends BDV2.reactComponent {
     constructor(props) {

src/ui/bdLogo.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class BDLogo extends BDV2.reactComponent {
     render() {

src/ui/checkbox.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_Checkbox extends BDV2.reactComponent {
     constructor(props) {

src/ui/contentColumn.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_ContentColumn extends BDV2.reactComponent {
     constructor(props) {

src/ui/cssEditor.js

@@ -1,7 +1,7 @@
 import {settingsCookie} from "../0globals";
-import Settings from "../settingsPanel";
-import BDV2 from "../v2";
-import DataStore from "../dataStore";
+import Settings from "../modules/settingsPanel";
+import BDV2 from "../modules/v2";
+import DataStore from "../modules/dataStore";
 
 import SettingsTitle from "./settingsTitle";
 import Checkbox from "./checkbox";

src/ui/cssEditorDetached.js

@@ -1,7 +1,7 @@
 import {settingsCookie} from "../0globals";
-import Settings from "../settingsPanel";
-import BDV2 from "../v2";
-import DataStore from "../dataStore";
+import Settings from "../modules/settingsPanel";
+import BDV2 from "../modules/v2";
+import DataStore from "../modules/dataStore";
 
 import Checkbox from "./checkbox";
 

src/ui/errorBoundary.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class BDErrorBoundary extends BDV2.reactComponent {
     constructor(props) {

src/ui/layer.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_Layer extends BDV2.reactComponent {
 

src/ui/list.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_List extends BDV2.reactComponent {
     constructor(props) {

src/ui/pluginCard.js

@@ -1,7 +1,7 @@
 import {settingsCookie, pluginCookie, bdplugins} from "../0globals";
-import BDV2 from "../v2";
-import pluginModule from "../pluginModule";
-import Utils from "../utils";
+import BDV2 from "../modules/v2";
+import pluginModule from "../modules/pluginModule";
+import Utils from "../modules/utils";
 
 import XSvg from "./xSvg";
 import ReloadIcon from "./reloadIcon";

src/ui/publicServers.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 import Tools from "./tools";
 import ServerCard from "./serverCard";

src/ui/reloadIcon.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_ReloadIcon extends BDV2.reactComponent {
     constructor(props) {

src/ui/scroller.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_Scroller extends BDV2.reactComponent {
 

src/ui/sectionedSettingsPanel.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 import SettingsGroup from "./settingsGroup";
 

src/ui/serverCard.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_ServerCard extends BDV2.reactComponent {
     constructor(props) {

src/ui/settingsGroup.js

@@ -1,5 +1,5 @@
 import {settingsCookie} from "../0globals";
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 import SettingsTitle from "./settingsTitle";
 import Switch from "./switch";

src/ui/settingsPanel.js

@@ -1,5 +1,5 @@
 import {settingsCookie} from "../0globals";
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 import SettingsTitle from "./settingsTitle";
 import Switch from "./switch";

src/ui/settingsTitle.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_SettingsTitle extends BDV2.reactComponent {
     constructor(props) {

src/ui/sidebar.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 import TabBarSeparator from "./tabBarSeparator";
 import TabBarHeader from "./tabBarHeader";

src/ui/sidebarView.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 import Scroller from "./scroller";
 

src/ui/switch.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_Switch extends BDV2.reactComponent {
 

src/ui/tabBarHeader.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_TabBarHeader extends BDV2.reactComponent {
     constructor(props) {

src/ui/tabBarItem.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_TabBarItem extends BDV2.reactComponent {
 

src/ui/tabBarSeparator.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_TabBarSeparator extends BDV2.reactComponent {
     constructor(props) {

src/ui/themeCard.js

@@ -1,7 +1,7 @@
 import {settingsCookie, themeCookie, bdthemes} from "../0globals";
-import Utils from "../utils";
-import BDV2 from "../v2";
-import themeModule from "../themeModule";
+import Utils from "../modules/utils";
+import BDV2 from "../modules/v2";
+import themeModule from "../modules/pluginModule";
 
 import ReloadIcon from "./reloadIcon";
 import TooltipWrap from "./tooltipWrap";

src/ui/tools.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 import XSvg from "./xSvg";
 

src/ui/tooltipWrap.js

@@ -1,5 +1,5 @@
-import BDV2 from "../v2";
-import Utils from "../utils";
+import BDV2 from "../modules/v2";
+import Utils from "../modules/utils";
 
 export default function(Component, options) {
     const {style = "black", side = "top", text = ""} = options;

src/ui/xSvg.js

@@ -1,4 +1,4 @@
-import BDV2 from "../v2";
+import BDV2 from "../modules/v2";
 
 export default class V2C_XSvg extends BDV2.reactComponent {
     constructor(props) {