diff --git a/src/features/autoRefresh/autoRefresh.feature.ts b/src/features/autoRefresh/autoRefresh.feature.ts
index dd0959e..06ca388 100644
--- a/src/features/autoRefresh/autoRefresh.feature.ts
+++ b/src/features/autoRefresh/autoRefresh.feature.ts
@@ -1,6 +1,6 @@
 import Feature from '../../common/architecture/features/Feature';
 import { ConcreteScript } from '../../common/architecture/scripts/Script';
-import { OptionCodename } from '../../common/optionsPrototype';
+import { OptionCodename } from '../../common/options/optionsPrototype';
 import AutoRefreshNodeWatcherScript from './scripts/nodeWatcher.script';
 import AutoRefreshSetUpScript from './scripts/setUp.script';
 import AutoRefreshStylesScript from './scripts/styles.script';
diff --git a/src/features/autoRefresh/core/autoRefresh.js b/src/features/autoRefresh/core/autoRefresh.js
index c2d64d2..03e21d1 100644
--- a/src/features/autoRefresh/core/autoRefresh.js
+++ b/src/features/autoRefresh/core/autoRefresh.js
@@ -2,7 +2,7 @@
 
 import {CCApi} from '../../../common/api.js';
 import {getAuthUser} 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, softRefreshView} from '../../../contentScripts/communityConsole/utils/common.js';
diff --git a/src/features/extraInfo/core/index.js b/src/features/extraInfo/core/index.js
index d016904..29ae400 100644
--- a/src/features/extraInfo/core/index.js
+++ b/src/features/extraInfo/core/index.js
@@ -1,4 +1,4 @@
-import PartialOptionsWatcher from '../../../common/partialOptionsWatcher.js';
+import PartialOptionsWatcher from '../../../common/options/partialOptionsWatcher.js';
 
 import ProfileInfoHandler from './infoHandlers/profile.js';
 import ThreadInfoHandler from './infoHandlers/thread.js';
diff --git a/src/features/extraInfo/extraInfo.feature.ts b/src/features/extraInfo/extraInfo.feature.ts
index 63f0818..0f2ccd7 100644
--- a/src/features/extraInfo/extraInfo.feature.ts
+++ b/src/features/extraInfo/extraInfo.feature.ts
@@ -1,6 +1,6 @@
 import Feature from '../../common/architecture/features/Feature';
 import { ConcreteScript } from '../../common/architecture/scripts/Script';
-import { OptionCodename } from '../../common/optionsPrototype';
+import { OptionCodename } from '../../common/options/optionsPrototype';
 import CCExtraInfoDependencySetUpScript from './scripts/ccExtraInfoDependencySetUp.script';
 import CCExtraInfoInjectScript from './scripts/ccExtraInfoInject.script';
 import CCExtraInfoMainScript from './scripts/ccExtraInfoMain.script';
diff --git a/src/features/infiniteScroll/core/ccInfiniteScroll.js b/src/features/infiniteScroll/core/ccInfiniteScroll.js
index 93e693c..4dde91c 100644
--- a/src/features/infiniteScroll/core/ccInfiniteScroll.js
+++ b/src/features/infiniteScroll/core/ccInfiniteScroll.js
@@ -1,4 +1,4 @@
-import {getOptions, isOptionEnabled} from '../../../common/optionsUtils.js';
+import {getOptions, isOptionEnabled} from '../../../common/options/optionsUtils.js';
 
 const kInteropLoadMoreClasses = {
   // New (interop) UI without nested replies
diff --git a/src/features/infiniteScroll/infiniteScroll.feature.ts b/src/features/infiniteScroll/infiniteScroll.feature.ts
index 4f3ff41..b6dee6a 100644
--- a/src/features/infiniteScroll/infiniteScroll.feature.ts
+++ b/src/features/infiniteScroll/infiniteScroll.feature.ts
@@ -1,6 +1,6 @@
 import Feature from '../../common/architecture/features/Feature';
 import { ConcreteScript } from '../../common/architecture/scripts/Script';
-import { OptionCodename } from '../../common/optionsPrototype';
+import { OptionCodename } from '../../common/options/optionsPrototype';
 import CCInfiniteScrollScript from './scripts/ccInfiniteScroll.script';
 
 export default class InfiniteScrollFeature extends Feature {
diff --git a/src/features/workflows/core/communityConsole/import.js b/src/features/workflows/core/communityConsole/import.js
index 68eb5a7..92abaee 100644
--- a/src/features/workflows/core/communityConsole/import.js
+++ b/src/features/workflows/core/communityConsole/import.js
@@ -2,7 +2,7 @@
 
 import {recursiveParentElement} from '../../../../common/commonUtils.js';
 import {injectStylesheet} from '../../../../common/contentScriptsUtils.js';
-import {isOptionEnabled} from '../../../../common/optionsUtils.js';
+import {isOptionEnabled} from '../../../../common/options/optionsUtils.js';
 
 const kListCannedResponsesResponse = 'TWPT_ListCannedResponsesResponse';
 
diff --git a/src/features/workflows/core/communityConsole/workflows.js b/src/features/workflows/core/communityConsole/workflows.js
index 652df29..1110923 100644
--- a/src/features/workflows/core/communityConsole/workflows.js
+++ b/src/features/workflows/core/communityConsole/workflows.js
@@ -1,4 +1,4 @@
-import {isOptionEnabled} from '../../../../common/optionsUtils.js';
+import {isOptionEnabled} from '../../../../common/options/optionsUtils.js';
 import WorkflowsStorage from '../workflowsStorage.js';
 import {addElementToThreadListActions, shouldAddBtnToActionBar} from '../../../../contentScripts/communityConsole/utils/common.js';
 
diff --git a/src/features/workflows/workflows.feature.ts b/src/features/workflows/workflows.feature.ts
index 7a6976c..9033ecb 100644
--- a/src/features/workflows/workflows.feature.ts
+++ b/src/features/workflows/workflows.feature.ts
@@ -1,6 +1,6 @@
 import Feature from '../../common/architecture/features/Feature';
 import { ConcreteScript } from '../../common/architecture/scripts/Script';
-import { OptionCodename } from '../../common/optionsPrototype';
+import { OptionCodename } from '../../common/options/optionsPrototype';
 import WorkflowsDependenciesSetUpAtMainScript from './scripts/dependenciesSetUpAtMain.script';
 import WorkflowsDependenciesSetUpAtStartScript from './scripts/dependenciesSetUpAtStart.script';
 import WorkflowsNodeWatcherScript from './scripts/nodeWatcher.script';