refactor: group options-related logic in //src/common/options

Change-Id: Ib505da278accd878478399967efd72c8d89095ce
diff --git a/src/options/bgHandler.js b/src/options/bgHandler.js
index 52f0d10..828eb22 100644
--- a/src/options/bgHandler.js
+++ b/src/options/bgHandler.js
@@ -9,7 +9,7 @@
 // The "blockdrafts" feature was removed, but this logic has been kept in case
 // it is needed in the future.
 
-import {isOptionEnabled} from '../common/optionsUtils.js';
+import {isOptionEnabled} from '../common/options/optionsUtils.js';
 
 // List of features controled in the background:
 export var bgFeatures = [];
diff --git a/src/options/optionsCommon.js b/src/options/optionsCommon.js
index f8d5c14..badeaf1 100644
--- a/src/options/optionsCommon.js
+++ b/src/options/optionsCommon.js
@@ -1,6 +1,6 @@
 import {getDocURL, getDocURLWithRef, getExtVersion, isProdVersion} from '../common/extUtils.js';
-import {ensureOptPermissions, grantedOptPermissions, isPermissionsObjectEmpty, missingPermissions} from '../common/optionsPermissions.js';
-import {cleanUpOptions, optionsPrototype, specialOptions} from '../common/optionsUtils.js';
+import {ensureOptPermissions, grantedOptPermissions, isPermissionsObjectEmpty, missingPermissions} from '../common/options/optionsPermissions.js';
+import {cleanUpOptions, optionsPrototype, specialOptions} from '../common/options/optionsUtils.js';
 
 import optionsPage from './optionsPage.json5';