22 files changed, 31 insertions, 31 deletions
diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js
index d19c3b45..182f11aa 100644
--- a/ext/js/background/backend.js
+++ b/ext/js/background/backend.js
@@ -29,9 +29,9 @@ import {log} from '../core/log.js';
 import {isObjectNotArray} from '../core/object-utilities.js';
 import {clone, deferPromise, promiseTimeout} from '../core/utilities.js';
 import {isNoteDataValid} from '../data/anki-util.js';
+import {arrayBufferToBase64} from '../data/array-buffer-util.js';
 import {OptionsUtil} from '../data/options-util.js';
 import {getAllPermissions, hasPermissions, hasRequiredPermissionsForOptions} from '../data/permissions-util.js';
-import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js';
 import {DictionaryDatabase} from '../dictionary/dictionary-database.js';
 import {Environment} from '../extension/environment.js';
 import {ObjectPropertyAccessor} from '../general/object-property-accessor.js';
diff --git a/ext/js/background/offscreen-proxy.js b/ext/js/background/offscreen-proxy.js
index 59d1291e..30c6862a 100644
--- a/ext/js/background/offscreen-proxy.js
+++ b/ext/js/background/offscreen-proxy.js
@@ -18,7 +18,7 @@
 
 import {ExtensionError} from '../core/extension-error.js';
 import {isObjectNotArray} from '../core/object-utilities.js';
-import {base64ToArrayBuffer} from '../data/sandbox/array-buffer-util.js';
+import {base64ToArrayBuffer} from '../data/array-buffer-util.js';
 
 /**
  * This class is responsible for creating and communicating with an offscreen document.
diff --git a/ext/js/background/offscreen.js b/ext/js/background/offscreen.js
index e38d4ba3..b0b11c93 100644
--- a/ext/js/background/offscreen.js
+++ b/ext/js/background/offscreen.js
@@ -18,7 +18,7 @@
 
 import {ClipboardReader} from '../comm/clipboard-reader.js';
 import {createApiMap, invokeApiMapHandler} from '../core/api-map.js';
-import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js';
+import {arrayBufferToBase64} from '../data/array-buffer-util.js';
 import {DictionaryDatabase} from '../dictionary/dictionary-database.js';
 import {Translator} from '../language/translator.js';
 
diff --git a/ext/js/data/anki-note-builder.js b/ext/js/data/anki-note-builder.js
index 32d4b593..e156103a 100644
--- a/ext/js/data/anki-note-builder.js
+++ b/ext/js/data/anki-note-builder.js
@@ -25,14 +25,14 @@ export class AnkiNoteBuilder {
     /**
      * Initiate an instance of AnkiNoteBuilder.
      * @param {import('anki-note-builder').MinimalApi} api
-     * @param {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/sandbox/template-renderer.js').TemplateRenderer} templateRenderer
+     * @param {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/template-renderer.js').TemplateRenderer} templateRenderer
      */
     constructor(api, templateRenderer) {
         /** @type {import('anki-note-builder').MinimalApi} */
         this._api = api;
         /** @type {RegExp} */
         this._markerPattern = cloneFieldMarkerPattern(true);
-        /** @type {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/sandbox/template-renderer.js').TemplateRenderer} */
+        /** @type {import('../templates/template-renderer-proxy.js').TemplateRendererProxy|import('../templates/template-renderer.js').TemplateRenderer} */
         this._templateRenderer = templateRenderer;
         /** @type {import('anki-note-builder').BatchedRequestGroup[]} */
         this._batchedRequests = [];
diff --git a/ext/js/data/sandbox/anki-note-data-creator.js b/ext/js/data/anki-note-data-creator.js
index d0456b0f..fbeb8cee 100644
--- a/ext/js/data/sandbox/anki-note-data-creator.js
+++ b/ext/js/data/anki-note-data-creator.js
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {getDisambiguations, getGroupedPronunciations, getPronunciationsOfType, getTermFrequency, groupTermTags} from '../../dictionary/dictionary-data-util.js';
-import {distributeFurigana, distributeFuriganaInflected} from '../../language/ja/japanese.js';
+import {getDisambiguations, getGroupedPronunciations, getPronunciationsOfType, getTermFrequency, groupTermTags} from '../dictionary/dictionary-data-util.js';
+import {distributeFurigana, distributeFuriganaInflected} from '../language/ja/japanese.js';
 
 /**
  * Creates a compatibility representation of the specified data.
diff --git a/ext/js/data/sandbox/array-buffer-util.js b/ext/js/data/array-buffer-util.js
index 487fcd24..487fcd24 100644
--- a/ext/js/data/sandbox/array-buffer-util.js
+++ b/ext/js/data/array-buffer-util.js
diff --git a/ext/js/data/sandbox/string-util.js b/ext/js/data/string-util.js
index 45e52f08..45e52f08 100644
--- a/ext/js/data/sandbox/string-util.js
+++ b/ext/js/data/string-util.js
diff --git a/ext/js/display/display-content-manager.js b/ext/js/display/display-content-manager.js
index c61c3aca..28fdc709 100644
--- a/ext/js/display/display-content-manager.js
+++ b/ext/js/display/display-content-manager.js
@@ -17,7 +17,7 @@
  */
 
 import {EventListenerCollection} from '../core/event-listener-collection.js';
-import {base64ToArrayBuffer} from '../data/sandbox/array-buffer-util.js';
+import {base64ToArrayBuffer} from '../data/array-buffer-util.js';
 
 /**
  * The content manager which is used when generating HTML display content.
diff --git a/ext/js/display/display-generator.js b/ext/js/display/display-generator.js
index 0caf4d71..8a388a38 100644
--- a/ext/js/display/display-generator.js
+++ b/ext/js/display/display-generator.js
@@ -21,8 +21,8 @@ import {getDisambiguations, getGroupedPronunciations, getTermFrequency, groupKan
 import {HtmlTemplateCollection} from '../dom/html-template-collection.js';
 import {distributeFurigana, getKanaMorae, getPitchCategory, isCodePointKanji} from '../language/ja/japanese.js';
 import {getLanguageFromText} from '../language/text-utilities.js';
-import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from './sandbox/pronunciation-generator.js';
-import {StructuredContentGenerator} from './sandbox/structured-content-generator.js';
+import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from './pronunciation-generator.js';
+import {StructuredContentGenerator} from './structured-content-generator.js';
 
 export class DisplayGenerator {
     /**
diff --git a/ext/js/display/sandbox/pronunciation-generator.js b/ext/js/display/pronunciation-generator.js
index f28520be..2c03eb94 100644
--- a/ext/js/display/sandbox/pronunciation-generator.js
+++ b/ext/js/display/pronunciation-generator.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {getKanaDiacriticInfo, isMoraPitchHigh} from '../../language/ja/japanese.js';
+import {getKanaDiacriticInfo, isMoraPitchHigh} from '../language/ja/japanese.js';
 
 /**
  * @param {string[]} morae
diff --git a/ext/js/display/sandbox/structured-content-generator.js b/ext/js/display/structured-content-generator.js
index 90a47158..a7fd9f3d 100644
--- a/ext/js/display/sandbox/structured-content-generator.js
+++ b/ext/js/display/structured-content-generator.js
@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {getLanguageFromText} from '../../language/text-utilities.js';
+import {getLanguageFromText} from '../language/text-utilities.js';
 
 export class StructuredContentGenerator {
     /**
-     * @param {import('../../display/display-content-manager.js').DisplayContentManager|import('../../templates/sandbox/anki-template-renderer-content-manager.js').AnkiTemplateRendererContentManager} contentManager
+     * @param {import('./display-content-manager.js').DisplayContentManager|import('../templates/anki-template-renderer-content-manager.js').AnkiTemplateRendererContentManager} contentManager
      * @param {Document} document
      */
     constructor(contentManager, document) {
-        /** @type {import('../../display/display-content-manager.js').DisplayContentManager|import('../../templates/sandbox/anki-template-renderer-content-manager.js').AnkiTemplateRendererContentManager} */
+        /** @type {import('./display-content-manager.js').DisplayContentManager|import('../templates/anki-template-renderer-content-manager.js').AnkiTemplateRendererContentManager} */
         this._contentManager = contentManager;
         /** @type {Document} */
         this._document = document;
diff --git a/ext/js/dom/sandbox/css-style-applier.js b/ext/js/dom/css-style-applier.js
index ea3f1a28..ba49d6aa 100644
--- a/ext/js/dom/sandbox/css-style-applier.js
+++ b/ext/js/dom/css-style-applier.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {readResponseJson} from '../../core/json.js';
+import {readResponseJson} from '../core/json.js';
 
 /**
  * This class is used to apply CSS styles to elements using a consistent method
diff --git a/ext/js/dom/dom-text-scanner.js b/ext/js/dom/dom-text-scanner.js
index e263d9f3..b86d6586 100644
--- a/ext/js/dom/dom-text-scanner.js
+++ b/ext/js/dom/dom-text-scanner.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {readCodePointsBackward, readCodePointsForward} from '../data/sandbox/string-util.js';
+import {readCodePointsBackward, readCodePointsForward} from '../data/string-util.js';
 
 /**
  * A class used to scan text in a document.
diff --git a/ext/js/dom/text-source-element.js b/ext/js/dom/text-source-element.js
index b2829e75..d91e75f3 100644
--- a/ext/js/dom/text-source-element.js
+++ b/ext/js/dom/text-source-element.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {readCodePointsBackward, readCodePointsForward} from '../data/sandbox/string-util.js';
+import {readCodePointsBackward, readCodePointsForward} from '../data/string-util.js';
 import {convertMultipleRectZoomCoordinates} from './document-util.js';
 
 /**
diff --git a/ext/js/media/audio-downloader.js b/ext/js/media/audio-downloader.js
index 4cb3eb81..b3d2d55c 100644
--- a/ext/js/media/audio-downloader.js
+++ b/ext/js/media/audio-downloader.js
@@ -19,8 +19,8 @@
 import {RequestBuilder} from '../background/request-builder.js';
 import {ExtensionError} from '../core/extension-error.js';
 import {readResponseJson} from '../core/json.js';
+import {arrayBufferToBase64} from '../data/array-buffer-util.js';
 import {JsonSchema} from '../data/json-schema.js';
-import {arrayBufferToBase64} from '../data/sandbox/array-buffer-util.js';
 import {NativeSimpleDOMParser} from '../dom/native-simple-dom-parser.js';
 import {SimpleDOMParser} from '../dom/simple-dom-parser.js';
 import {isStringEntirelyKana} from '../language/ja/japanese.js';
diff --git a/ext/js/pages/settings/backup-controller.js b/ext/js/pages/settings/backup-controller.js
index dd739d39..5c168849 100644
--- a/ext/js/pages/settings/backup-controller.js
+++ b/ext/js/pages/settings/backup-controller.js
@@ -21,9 +21,9 @@ import {parseJson} from '../../core/json.js';
 import {log} from '../../core/log.js';
 import {isObjectNotArray} from '../../core/object-utilities.js';
 import {toError} from '../../core/to-error.js';
+import {arrayBufferUtf8Decode} from '../../data/array-buffer-util.js';
 import {OptionsUtil} from '../../data/options-util.js';
 import {getAllPermissions} from '../../data/permissions-util.js';
-import {arrayBufferUtf8Decode} from '../../data/sandbox/array-buffer-util.js';
 import {querySelectorNotNull} from '../../dom/query-selector.js';
 import {DictionaryController} from './dictionary-controller.js';
 
diff --git a/ext/js/templates/sandbox/anki-template-renderer-content-manager.js b/ext/js/templates/anki-template-renderer-content-manager.js
index 664746bf..664746bf 100644
--- a/ext/js/templates/sandbox/anki-template-renderer-content-manager.js
+++ b/ext/js/templates/anki-template-renderer-content-manager.js
diff --git a/ext/js/templates/sandbox/anki-template-renderer.js b/ext/js/templates/anki-template-renderer.js
index 022716c3..4bb56a4b 100644
--- a/ext/js/templates/sandbox/anki-template-renderer.js
+++ b/ext/js/templates/anki-template-renderer.js
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {Handlebars} from '../../../lib/handlebars.js';
-import {createAnkiNoteData} from '../../data/sandbox/anki-note-data-creator.js';
-import {getPronunciationsOfType, isNonNounVerbOrAdjective} from '../../dictionary/dictionary-data-util.js';
-import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from '../../display/sandbox/pronunciation-generator.js';
-import {StructuredContentGenerator} from '../../display/sandbox/structured-content-generator.js';
-import {CssStyleApplier} from '../../dom/sandbox/css-style-applier.js';
-import {convertHiraganaToKatakana, convertKatakanaToHiragana, distributeFurigana, getKanaMorae, getPitchCategory, isMoraPitchHigh} from '../../language/ja/japanese.js';
+import {Handlebars} from '../../lib/handlebars.js';
+import {createAnkiNoteData} from '../data/anki-note-data-creator.js';
+import {getPronunciationsOfType, isNonNounVerbOrAdjective} from '../dictionary/dictionary-data-util.js';
+import {createPronunciationDownstepPosition, createPronunciationGraph, createPronunciationText} from '../display/pronunciation-generator.js';
+import {StructuredContentGenerator} from '../display/structured-content-generator.js';
+import {CssStyleApplier} from '../dom/css-style-applier.js';
+import {convertHiraganaToKatakana, convertKatakanaToHiragana, distributeFurigana, getKanaMorae, getPitchCategory, isMoraPitchHigh} from '../language/ja/japanese.js';
 import {AnkiTemplateRendererContentManager} from './anki-template-renderer-content-manager.js';
 import {TemplateRendererMediaProvider} from './template-renderer-media-provider.js';
 import {TemplateRenderer} from './template-renderer.js';
diff --git a/ext/js/templates/sandbox/template-renderer-frame-api.js b/ext/js/templates/template-renderer-frame-api.js
index a0017d70..cd9b4232 100644
--- a/ext/js/templates/sandbox/template-renderer-frame-api.js
+++ b/ext/js/templates/template-renderer-frame-api.js
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {createApiMap, invokeApiMapHandler} from '../../core/api-map.js';
-import {parseJson} from '../../core/json.js';
+import {createApiMap, invokeApiMapHandler} from '../core/api-map.js';
+import {parseJson} from '../core/json.js';
 
 export class TemplateRendererFrameApi {
     /**
diff --git a/ext/js/templates/sandbox/template-renderer-frame-main.js b/ext/js/templates/template-renderer-frame-main.js
index 4ab7d2bc..4ab7d2bc 100644
--- a/ext/js/templates/sandbox/template-renderer-frame-main.js
+++ b/ext/js/templates/template-renderer-frame-main.js
diff --git a/ext/js/templates/sandbox/template-renderer-media-provider.js b/ext/js/templates/template-renderer-media-provider.js
index 29dd29ae..2f238e20 100644
--- a/ext/js/templates/sandbox/template-renderer-media-provider.js
+++ b/ext/js/templates/template-renderer-media-provider.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {Handlebars} from '../../../lib/handlebars.js';
+import {Handlebars} from '../../lib/handlebars.js';
 
 export class TemplateRendererMediaProvider {
     constructor() {
diff --git a/ext/js/templates/sandbox/template-renderer.js b/ext/js/templates/template-renderer.js
index 84eb6a19..7bb93aa2 100644
--- a/ext/js/templates/sandbox/template-renderer.js
+++ b/ext/js/templates/template-renderer.js
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {Handlebars} from '../../../lib/handlebars.js';
-import {ExtensionError} from '../../core/extension-error.js';
+import {Handlebars} from '../../lib/handlebars.js';
+import {ExtensionError} from '../core/extension-error.js';
 
 export class TemplateRenderer {
     constructor() {