diff --git a/client/src/builtin/E2EE.js b/client/src/builtin/E2EE/E2EE.js
similarity index 99%
rename from client/src/builtin/E2EE.js
rename to client/src/builtin/E2EE/E2EE.js
index 82e1a363..682f1bf7 100644
--- a/client/src/builtin/E2EE.js
+++ b/client/src/builtin/E2EE/E2EE.js
@@ -9,7 +9,7 @@
 */
 
 import { Settings, Cache, Events } from 'modules';
-import BuiltinModule from './BuiltinModule';
+import BuiltinModule from '../BuiltinModule';
 import { Reflection, ReactComponents, MonkeyPatch, Patcher, DiscordApi, Security } from 'modules';
 import { VueInjector, Modals, Toasts } from 'ui';
 import { ClientLogger as Logger, ClientIPC } from 'common';
diff --git a/client/src/builtin/E2EEComponent.vue b/client/src/builtin/E2EE/E2EEComponent.vue
similarity index 98%
rename from client/src/builtin/E2EEComponent.vue
rename to client/src/builtin/E2EE/E2EEComponent.vue
index 81bfda70..1d943ff1 100644
--- a/client/src/builtin/E2EEComponent.vue
+++ b/client/src/builtin/E2EE/E2EEComponent.vue
@@ -45,7 +45,7 @@
     import { E2EE } from 'builtin';
     import { Settings, DiscordApi, Reflection } from 'modules';
     import { Toasts } from 'ui';
-    import { MiLock, MiImagePlus, MiIcVpnKey } from '../ui/components/common/MaterialIcon';
+    import { MiLock, MiImagePlus, MiIcVpnKey } from 'commoncomponents';
 
     export default {
         components: {
diff --git a/client/src/builtin/E2EEMessageButton.vue b/client/src/builtin/E2EE/E2EEMessageButton.vue
similarity index 90%
rename from client/src/builtin/E2EEMessageButton.vue
rename to client/src/builtin/E2EE/E2EEMessageButton.vue
index 9edf4968..ded7b5bc 100644
--- a/client/src/builtin/E2EEMessageButton.vue
+++ b/client/src/builtin/E2EE/E2EEMessageButton.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-    import { MiLock } from '../ui/components/common/MaterialIcon';
+    import { MiLock } from 'commoncomponents';
 
     export default {
         components: {
diff --git a/client/src/builtin/E2EE/index.js b/client/src/builtin/E2EE/index.js
new file mode 100644
index 00000000..4a176cf8
--- /dev/null
+++ b/client/src/builtin/E2EE/index.js
@@ -0,0 +1,3 @@
+export { default as default } from './E2EE';
+export { default as E2EEComponent } from './E2EEComponent.vue';
+export { default as E2EEMessageButton } from './E2EEMessageButton.vue';
diff --git a/client/src/builtin/EmoteAc.js b/client/src/builtin/Emotes/EmoteAc.js
similarity index 91%
rename from client/src/builtin/EmoteAc.js
rename to client/src/builtin/Emotes/EmoteAc.js
index a0e8ecbe..5f2708aa 100644
--- a/client/src/builtin/EmoteAc.js
+++ b/client/src/builtin/Emotes/EmoteAc.js
@@ -9,18 +9,11 @@
 */
 
 import { Settings } from 'modules';
-
-import BuiltinModule from './BuiltinModule';
-import EmoteModule from './EmoteModule';
-import GlobalAc from '../ui/autocomplete';
+import BuiltinModule from '../BuiltinModule';
+import EmoteModule, { EMOTE_SOURCES } from './EmoteModule';
+import GlobalAc from 'autocomplete';
 import { BdContextMenu } from 'ui';
 
-const EMOTE_SOURCES = [
-    'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0',
-    'https://cdn.frankerfacez.com/emoticon/:id/1',
-    'https://cdn.betterttv.net/emote/:id/1x'
-]
-
 export default new class EmoteAc extends BuiltinModule {
 
     /* Getters */
diff --git a/client/src/builtin/EmoteComponent.js b/client/src/builtin/Emotes/EmoteComponent.js
similarity index 81%
rename from client/src/builtin/EmoteComponent.js
rename to client/src/builtin/Emotes/EmoteComponent.js
index 10383ca4..0c719ac5 100644
--- a/client/src/builtin/EmoteComponent.js
+++ b/client/src/builtin/Emotes/EmoteComponent.js
@@ -8,15 +8,10 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import VrWrapper from '../ui/vrwrapper';
+import VrWrapper from '../../ui/vrwrapper';
+import { EMOTE_SOURCES } from '.';
 import EmoteComponent from './EmoteComponent.vue';
 
-const EMOTE_SOURCES = [
-    'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0',
-    'https://cdn.frankerfacez.com/emoticon/:id/1',
-    'https://cdn.betterttv.net/emote/:id/1x'
-]
-
 export default class Emote extends VrWrapper {
 
     constructor(type, id, name) {
diff --git a/client/src/builtin/EmoteComponent.vue b/client/src/builtin/Emotes/EmoteComponent.vue
similarity index 94%
rename from client/src/builtin/EmoteComponent.vue
rename to client/src/builtin/Emotes/EmoteComponent.vue
index 8fd6e892..9e5db8a0 100644
--- a/client/src/builtin/EmoteComponent.vue
+++ b/client/src/builtin/Emotes/EmoteComponent.vue
@@ -5,7 +5,7 @@
 <script>
     import { ClientLogger as Logger } from 'common';
     import EmoteModule from './EmoteModule';
-    import { MiStar } from '../ui/components/common';
+    import { MiStar } from 'commoncomponents';
 
     export default {
         components: {
diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/Emotes/EmoteModule.js
similarity index 98%
rename from client/src/builtin/EmoteModule.js
rename to client/src/builtin/Emotes/EmoteModule.js
index 6afb718e..3e4c1136 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/Emotes/EmoteModule.js
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import BuiltinModule from './BuiltinModule';
+import BuiltinModule from '../BuiltinModule';
 import path from 'path';
 import { request } from 'vendor';
 
@@ -17,11 +17,8 @@ import { DiscordApi, Settings, Globals, Reflection, ReactComponents, Database }
 import { DiscordContextMenu } from 'ui';
 
 import Emote from './EmoteComponent.js';
-import Autocomplete from '../ui/components/common/Autocomplete.vue';
 
-import GlobalAc from '../ui/autocomplete';
-
-const EMOTE_SOURCES = [
+export const EMOTE_SOURCES = [
     'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0',
     'https://cdn.frankerfacez.com/emoticon/:id/1',
     'https://cdn.betterttv.net/emote/:id/1x'
diff --git a/client/src/builtin/Emotes/index.js b/client/src/builtin/Emotes/index.js
new file mode 100644
index 00000000..b0bc9173
--- /dev/null
+++ b/client/src/builtin/Emotes/index.js
@@ -0,0 +1,4 @@
+export { default as EmoteModule, EMOTE_SOURCES } from './EmoteModule';
+export { default as Emote } from './EmoteComponent';
+export { default as EmoteComponent } from './EmoteComponent.vue';
+export { default as EmoteAc } from './EmoteAc';
diff --git a/client/src/builtin/Manager.js b/client/src/builtin/Manager.js
index 238b3365..2660532d 100644
--- a/client/src/builtin/Manager.js
+++ b/client/src/builtin/Manager.js
@@ -1,4 +1,4 @@
-import { default as EmoteModule } from './EmoteModule';
+import { EmoteModule, EmoteAc } from './Emotes';
 import { default as ReactDevtoolsModule } from './ReactDevtoolsModule';
 import { default as VueDevtoolsModule } from './VueDevToolsModule';
 import { default as TrackingProtection } from './TrackingProtection';
@@ -8,7 +8,6 @@ import { default as TwentyFourHour } from './24Hour';
 import { default as KillClyde } from './KillClyde';
 import { default as BlockedMessages } from './BlockedMessages';
 import { default as VoiceDisconnect } from './VoiceDisconnect';
-import { default as EmoteAc } from './EmoteAc';
 
 export default class {
     static initAll() {
diff --git a/client/src/builtin/builtin.js b/client/src/builtin/builtin.js
index e6b33526..ed39630e 100644
--- a/client/src/builtin/builtin.js
+++ b/client/src/builtin/builtin.js
@@ -1,4 +1,4 @@
-export { default as EmoteModule } from './EmoteModule';
+export { EmoteModule, EmoteAc } from './Emotes';
 export { default as ReactDevtoolsModule } from './ReactDevtoolsModule';
 export { default as VueDevtoolsModule } from './VueDevToolsModule';
 export { default as TrackingProtection } from './TrackingProtection';