9 files changed, 24 insertions, 24 deletions
diff --git a/test/test-database.js b/test/test-database.js
index 8b075fd4..ae827318 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -25,11 +25,11 @@ const vm = new DatabaseVM();
 vm.execute([
     'js/core.js',
     'js/general/cache-map.js',
-    'bg/js/json-schema.js',
-    'bg/js/media-utility.js',
-    'bg/js/dictionary-importer.js',
-    'bg/js/database.js',
-    'bg/js/dictionary-database.js'
+    'js/data/json-schema.js',
+    'js/media/media-utility.js',
+    'js/language/dictionary-importer.js',
+    'js/data/database.js',
+    'js/language/dictionary-database.js'
 ]);
 const DictionaryImporter = vm.get('DictionaryImporter');
 const DictionaryDatabase = vm.get('DictionaryDatabase');
diff --git a/test/test-deinflector.js b/test/test-deinflector.js
index dbc1f7e2..a5d6c06f 100644
--- a/test/test-deinflector.js
+++ b/test/test-deinflector.js
@@ -881,7 +881,7 @@ function testDeinflections() {
     ];
 
     const vm = new VM();
-    vm.execute(['bg/js/deinflector.js']);
+    vm.execute(['js/language/deinflector.js']);
     const [Deinflector] = vm.get(['Deinflector']);
 
     const deinflectionReasions = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'ext', 'data/deinflect.json')));
diff --git a/test/test-japanese.js b/test/test-japanese.js
index e2be2315..590d3157 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -23,7 +23,7 @@ const vm = new VM();
 vm.execute([
     'lib/wanakana.min.js',
     'js/language/japanese-util.js',
-    'bg/js/text-source-map.js'
+    'js/general/text-source-map.js'
 ]);
 const [JapaneseUtil, TextSourceMap, wanakana] = vm.get(['JapaneseUtil', 'TextSourceMap', 'wanakana']);
 const jp = new JapaneseUtil(wanakana);
diff --git a/test/test-options-util.js b/test/test-options-util.js
index 3e3f93bc..20b1f3f4 100644
--- a/test/test-options-util.js
+++ b/test/test-options-util.js
@@ -49,9 +49,9 @@ function createVM(extDir) {
     vm.execute([
         'js/core.js',
         'js/general/cache-map.js',
-        'bg/js/json-schema.js',
-        'bg/js/template-patcher.js',
-        'bg/js/options.js'
+        'js/data/json-schema.js',
+        'js/templates/template-patcher.js',
+        'js/data/options-util.js'
     ]);
 
     return vm;
diff --git a/test/test-profile-conditions.js b/test/test-profile-conditions.js
index 7ceda8c4..e1e6a72c 100644
--- a/test/test-profile-conditions.js
+++ b/test/test-profile-conditions.js
@@ -24,8 +24,8 @@ const vm = new VM({});
 vm.execute([
     'js/core.js',
     'js/general/cache-map.js',
-    'bg/js/json-schema.js',
-    'bg/js/profile-conditions.js'
+    'js/data/json-schema.js',
+    'js/background/profile-conditions.js'
 ]);
 const [JsonSchemaValidator, ProfileConditions] = vm.get(['JsonSchemaValidator', 'ProfileConditions']);
 
diff --git a/test/test-schema.js b/test/test-schema.js
index 2c48f5f5..7a1ea9bc 100644
--- a/test/test-schema.js
+++ b/test/test-schema.js
@@ -23,7 +23,7 @@ const vm = new VM();
 vm.execute([
     'js/core.js',
     'js/general/cache-map.js',
-    'bg/js/json-schema.js'
+    'js/data/json-schema.js'
 ]);
 const JsonSchemaValidator = vm.get('JsonSchemaValidator');
 
diff --git a/test/test-sw.js b/test/test-sw.js
index 803bb0c2..498a0a32 100644
--- a/test/test-sw.js
+++ b/test/test-sw.js
@@ -38,9 +38,9 @@ function getAllHtmlScriptPaths(fileName) {
 function convertBackgroundScriptsToServiceWorkerScripts(scripts) {
     // Use parse5-based SimpleDOMParser
     scripts.splice(0, 0, '/lib/parse5.js');
-    const index = scripts.indexOf('/bg/js/native-simple-dom-parser.js');
+    const index = scripts.indexOf('/js/dom/native-simple-dom-parser.js');
     assert.ok(index >= 0);
-    scripts[index] = '/bg/js/simple-dom-parser.js';
+    scripts[index] = '/js/dom/simple-dom-parser.js';
 }
 
 function main() {
diff --git a/test/test-text-source-map.js b/test/test-text-source-map.js
index 68bb97b0..9f0c17bd 100644
--- a/test/test-text-source-map.js
+++ b/test/test-text-source-map.js
@@ -20,7 +20,7 @@ const {testMain} = require('../dev/util');
 const {VM} = require('../dev/vm');
 
 const vm = new VM();
-vm.execute(['bg/js/text-source-map.js']);
+vm.execute(['js/general/text-source-map.js']);
 const TextSourceMap = vm.get('TextSourceMap');
 
 
diff --git a/test/test-translator.js b/test/test-translator.js
index e1161a15..2d7b6baa 100644
--- a/test/test-translator.js
+++ b/test/test-translator.js
@@ -39,14 +39,14 @@ async function createVM() {
         'js/core.js',
         'js/general/cache-map.js',
         'js/language/japanese-util.js',
-        'bg/js/json-schema.js',
-        'bg/js/media-utility.js',
-        'bg/js/dictionary-importer.js',
-        'bg/js/database.js',
-        'bg/js/dictionary-database.js',
-        'bg/js/text-source-map.js',
-        'bg/js/deinflector.js',
-        'bg/js/translator.js'
+        'js/data/json-schema.js',
+        'js/media/media-utility.js',
+        'js/language/dictionary-importer.js',
+        'js/data/database.js',
+        'js/language/dictionary-database.js',
+        'js/general/text-source-map.js',
+        'js/language/deinflector.js',
+        'js/language/translator.js'
     ]);
     const [
         DictionaryImporter,