diff --git a/src/SEQTA.ts b/src/SEQTA.ts
index a595c806..b6e141ef 100644
--- a/src/SEQTA.ts
+++ b/src/SEQTA.ts
@@ -13,11 +13,11 @@ import Popup from 'url:./interface/index.html'
 
 import Color from 'color'
 import MenuitemSVGKey from './seqta/content/MenuItemSVGKey.json'
-import { MessageHandler } from './seqta/utils/MessageListener'
+import { MessageHandler } from './seqta/utils/listeners/MessageListener'
 import { SettingsState } from "./types/storage"
 import ShortcutLinks from './seqta/content/links.json'
 import Sortable  from 'sortablejs'
-import StorageListener from './seqta/utils/StorageListener'
+import StorageListener from './seqta/utils/listeners/StorageListener'
 import { appendBackgroundToUI } from './seqta/ui/ImageBackgrounds'
 import assessmentsicon from './seqta/icons/assessmentsIcon'
 import browser from 'webextension-polyfill'
diff --git a/src/seqta/utils/MessageListener.ts b/src/seqta/utils/listeners/MessageListener.ts
similarity index 95%
rename from src/seqta/utils/MessageListener.ts
rename to src/seqta/utils/listeners/MessageListener.ts
index 883fbca4..65938afe 100644
--- a/src/seqta/utils/MessageListener.ts
+++ b/src/seqta/utils/listeners/MessageListener.ts
@@ -1,7 +1,7 @@
 import browser from 'webextension-polyfill'
 
-import { MenuOptionsOpen, OpenMenuOptions, OpenWhatsNewPopup, closeSettings } from '../../SEQTA';
-import { deleteTheme, disableTheme, downloadTheme, listThemes, setTheme } from '../ui/Themes';
+import { MenuOptionsOpen, OpenMenuOptions, OpenWhatsNewPopup, closeSettings } from '../../../SEQTA';
+import { deleteTheme, disableTheme, downloadTheme, listThemes, setTheme } from '../../ui/Themes';
 
 export class MessageHandler {
   constructor() {
diff --git a/src/seqta/utils/StorageListener.ts b/src/seqta/utils/listeners/StorageListener.ts
similarity index 95%
rename from src/seqta/utils/StorageListener.ts
rename to src/seqta/utils/listeners/StorageListener.ts
index 33e26cbe..edd3a40c 100644
--- a/src/seqta/utils/StorageListener.ts
+++ b/src/seqta/utils/listeners/StorageListener.ts
@@ -8,10 +8,10 @@ import {
   addShortcuts,
   disableNotificationCollector,
   enableNotificationCollector,
-} from '../../SEQTA';
-import { updateBgDurations } from '../ui/Animation';
-import { getDarkMode, updateAllColors } from '../ui/colors/Manager';
-import { appendBackgroundToUI } from '../ui/ImageBackgrounds';
+} from '../../../SEQTA';
+import { updateBgDurations } from '../../ui/Animation';
+import { getDarkMode, updateAllColors } from '../../ui/colors/Manager';
+import { appendBackgroundToUI } from '../../ui/ImageBackgrounds';
 
 
 export default class StorageListener {