diff --git a/src/contentScripts/communityConsole/avatars.js b/src/contentScripts/communityConsole/avatars.js
index 66123b0..c9f6bb6 100644
--- a/src/contentScripts/communityConsole/avatars.js
+++ b/src/contentScripts/communityConsole/avatars.js
@@ -2,7 +2,7 @@
 
 import {CCApi} from '../../common/api.js';
 import {parseUrl} from '../../common/commonUtils.js';
-import PartialOptionsWatcher from '../../common/partialOptionsWatcher.js';
+import PartialOptionsWatcher from '../../common/options/partialOptionsWatcher.js';
 import {createPlainTooltip} from '../../common/tooltip.js';
 
 import AvatarsDB from './utils/AvatarsDB.js'
diff --git a/src/contentScripts/communityConsole/batchLock.js b/src/contentScripts/communityConsole/batchLock.js
index 29a3dc3..9479d31 100644
--- a/src/contentScripts/communityConsole/batchLock.js
+++ b/src/contentScripts/communityConsole/batchLock.js
@@ -1,4 +1,4 @@
-import {isOptionEnabled} from '../../common/optionsUtils.js';
+import {isOptionEnabled} from '../../common/options/optionsUtils.js';
 
 import {addButtonToThreadListActions, removeChildNodes, shouldAddBtnToActionBar, softRefreshView} from './utils/common.js';
 
diff --git a/src/contentScripts/communityConsole/dragAndDropFix.js b/src/contentScripts/communityConsole/dragAndDropFix.js
index d2b93d0..0839071 100644
--- a/src/contentScripts/communityConsole/dragAndDropFix.js
+++ b/src/contentScripts/communityConsole/dragAndDropFix.js
@@ -1,4 +1,4 @@
-import {isOptionEnabled} from '../../common/optionsUtils.js';
+import {isOptionEnabled} from '../../common/options/optionsUtils.js';
 
 export function applyDragAndDropFix(node) {
   console.debug('Adding link drag&drop fix to ', node);
diff --git a/src/contentScripts/communityConsole/flattenThreads/replyActionHandler.js b/src/contentScripts/communityConsole/flattenThreads/replyActionHandler.js
index 99ef0fc..182f962 100644
--- a/src/contentScripts/communityConsole/flattenThreads/replyActionHandler.js
+++ b/src/contentScripts/communityConsole/flattenThreads/replyActionHandler.js
@@ -1,7 +1,7 @@
 import {waitFor} from 'poll-until-promise';
 
 import {parseUrl} from '../../../common/commonUtils';
-import {getOptions} from '../../../common/optionsUtils';
+import {getOptions} from '../../../common/options/optionsUtils';
 
 const kOpenReplyEditorIntervalInMs = 500;
 const kOpenReplyEditorTimeoutInMs = 10 * 1000;
diff --git a/src/contentScripts/communityConsole/main.js b/src/contentScripts/communityConsole/main.js
index 6cbfced..32576e4 100644
--- a/src/contentScripts/communityConsole/main.js
+++ b/src/contentScripts/communityConsole/main.js
@@ -1,5 +1,5 @@
 import {injectScript, injectStyles, injectStylesheet} from '../../common/contentScriptsUtils.js';
-import {getOptions} from '../../common/optionsUtils.js';
+import {getOptions} from '../../common/options/optionsUtils.js';
 import XHRProxyKillSwitchHandler from '../../xhrInterceptor/killSwitchHandler.js';
 import {injectPreviousPostsLinksUnifiedProfileIfEnabled} from '../utilsCommon/unifiedProfiles.js';
 
diff --git a/src/contentScripts/communityConsole/start.js b/src/contentScripts/communityConsole/start.js
index cf5a7a5..cace3aa 100644
--- a/src/contentScripts/communityConsole/start.js
+++ b/src/contentScripts/communityConsole/start.js
@@ -1,5 +1,5 @@
 import {injectStylesheet} from '../../common/contentScriptsUtils.js';
-import {getOptions} from '../../common/optionsUtils.js';
+import {getOptions} from '../../common/options/optionsUtils.js';
 
 import FlattenThreadsReplyActionHandler from './flattenThreads/replyActionHandler.js';
 
diff --git a/src/contentScripts/communityConsole/threadToolbar/threadToolbar.js b/src/contentScripts/communityConsole/threadToolbar/threadToolbar.js
index 6344e3c..db11640 100644
--- a/src/contentScripts/communityConsole/threadToolbar/threadToolbar.js
+++ b/src/contentScripts/communityConsole/threadToolbar/threadToolbar.js
@@ -1,4 +1,4 @@
-import {getOptions} from '../../../common/optionsUtils.js';
+import {getOptions} from '../../../common/options/optionsUtils.js';
 import {softRefreshView} from '../utils/common.js';
 
 import * as consts from './constants.js';
diff --git a/src/contentScripts/publicForum.js b/src/contentScripts/publicForum.js
index 043e8c9..d03976b 100644
--- a/src/contentScripts/publicForum.js
+++ b/src/contentScripts/publicForum.js
@@ -1,4 +1,4 @@
-import {getOptions} from '../common/optionsUtils.js';
+import {getOptions} from '../common/options/optionsUtils.js';
 
 var intersectionObserver;
 
diff --git a/src/contentScripts/publicProfile.js b/src/contentScripts/publicProfile.js
index 9c36ae1..9608ee0 100644
--- a/src/contentScripts/publicProfile.js
+++ b/src/contentScripts/publicProfile.js
@@ -1,4 +1,4 @@
-import {getOptions} from '../common/optionsUtils.js';
+import {getOptions} from '../common/options/optionsUtils.js';
 import {parseView} from '../common/TWBasicUtils.js';
 
 import PerForumStatsSection from './communityConsole/utils/PerForumStatsSection.js';
diff --git a/src/contentScripts/publicProfileStart.js b/src/contentScripts/publicProfileStart.js
index 5238337..fbe6540 100644
--- a/src/contentScripts/publicProfileStart.js
+++ b/src/contentScripts/publicProfileStart.js
@@ -1,5 +1,5 @@
 import {injectScript} from '../common/contentScriptsUtils.js';
-import {getOptions} from '../common/optionsUtils.js';
+import {getOptions} from '../common/options/optionsUtils.js';
 
 getOptions('perforumstats').then(options => {
   if (options?.perforumstats)
diff --git a/src/contentScripts/publicThread.js b/src/contentScripts/publicThread.js
index 4d98bee..bc12236 100644
--- a/src/contentScripts/publicThread.js
+++ b/src/contentScripts/publicThread.js
@@ -1,5 +1,5 @@
 import {injectStylesheet} from '../common/contentScriptsUtils.js';
-import {getOptions} from '../common/optionsUtils.js';
+import {getOptions} from '../common/options/optionsUtils.js';
 import {redirectIfApplicable} from '../redirect/index.js';
 
 const kLoadMoreButtons = [
diff --git a/src/contentScripts/publicThreadStart.js b/src/contentScripts/publicThreadStart.js
index 9581aec..a95485b 100644
--- a/src/contentScripts/publicThreadStart.js
+++ b/src/contentScripts/publicThreadStart.js
@@ -1,5 +1,5 @@
 import {injectStylesheet} from '../common/contentScriptsUtils.js';
-import {getOptions} from '../common/optionsUtils.js';
+import {getOptions} from '../common/options/optionsUtils.js';
 import {setUpRedirectIfEnabled} from '../redirect/setup.js';
 
 getOptions(['uispacing', 'redirect']).then(options => {
diff --git a/src/contentScripts/utilsCommon/unifiedProfiles.js b/src/contentScripts/utilsCommon/unifiedProfiles.js
index e1ba59f..eccb4b6 100644
--- a/src/contentScripts/utilsCommon/unifiedProfiles.js
+++ b/src/contentScripts/utilsCommon/unifiedProfiles.js
@@ -2,7 +2,7 @@
 
 import {createImmuneLink} from '../../common/commonUtils.js';
 import {escapeUsername} from '../../common/communityConsoleUtils.js';
-import {isOptionEnabled} from '../../common/optionsUtils.js';
+import {isOptionEnabled} from '../../common/options/optionsUtils.js';
 import {createPlainTooltip} from '../../common/tooltip.js';
 import {createExtBadge} from '../communityConsole/utils/common.js';