5 files changed, 6 insertions, 5 deletions
diff --git a/ext/js/dictionary/dictionary-database.js b/ext/js/dictionary/dictionary-database.js
index 818392f4..1c52b7ab 100644
--- a/ext/js/dictionary/dictionary-database.js
+++ b/ext/js/dictionary/dictionary-database.js
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {log, stringReverse} from '../core.js';
+import {log} from '../core/logger.js';
+import {stringReverse} from '../core/utilities.js';
 import {Database} from '../data/database.js';
 
 export class DictionaryDatabase {
diff --git a/ext/js/dictionary/dictionary-importer-media-loader.js b/ext/js/dictionary/dictionary-importer-media-loader.js
index d94ff98e..86ed53f2 100644
--- a/ext/js/dictionary/dictionary-importer-media-loader.js
+++ b/ext/js/dictionary/dictionary-importer-media-loader.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {EventListenerCollection} from '../core.js';
+import {EventListenerCollection} from '../core/event-listener-collection.js';
 
 /**
  * Class used for loading and validating media during the dictionary import process.
diff --git a/ext/js/dictionary/dictionary-importer.js b/ext/js/dictionary/dictionary-importer.js
index 067c8a3a..c8f68d78 100644
--- a/ext/js/dictionary/dictionary-importer.js
+++ b/ext/js/dictionary/dictionary-importer.js
@@ -24,7 +24,7 @@ import {
     ZipReader as ZipReader0,
     configure
 } from '../../lib/zip.js';
-import {stringReverse} from '../core.js';
+import {stringReverse} from '../core/utilities.js';
 import {ExtensionError} from '../core/extension-error.js';
 import {parseJson} from '../core/json.js';
 import {toError} from '../core/to-error.js';
diff --git a/ext/js/dictionary/dictionary-worker-main.js b/ext/js/dictionary/dictionary-worker-main.js
index 16d013af..d63a3a20 100644
--- a/ext/js/dictionary/dictionary-worker-main.js
+++ b/ext/js/dictionary/dictionary-worker-main.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {log} from '../core.js';
+import {log} from '../core/logger.js';
 import {DictionaryWorkerHandler} from './dictionary-worker-handler.js';
 
 /** Entry point. */
diff --git a/ext/js/dictionary/dictionary-worker-media-loader.js b/ext/js/dictionary/dictionary-worker-media-loader.js
index cc380c2f..5c18e184 100644
--- a/ext/js/dictionary/dictionary-worker-media-loader.js
+++ b/ext/js/dictionary/dictionary-worker-media-loader.js
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {generateId} from '../core.js';
+import {generateId} from '../core/utilities.js';
 import {ExtensionError} from '../core/extension-error.js';
 
 /**