11 files changed, 17 insertions, 17 deletions
diff --git a/test/test-cache-map.js b/test/test-cache-map.js
index 4d19015b..b01f5ed8 100644
--- a/test/test-cache-map.js
+++ b/test/test-cache-map.js
@@ -21,7 +21,7 @@ const {VM} = require('../dev/vm');
 
 const vm = new VM({console});
 vm.execute([
-    'mixed/js/cache-map.js'
+    'js/general/cache-map.js'
 ]);
 const CacheMap = vm.get('CacheMap');
 
diff --git a/test/test-core.js b/test/test-core.js
index cb315c08..cf9a5c35 100644
--- a/test/test-core.js
+++ b/test/test-core.js
@@ -30,7 +30,7 @@ const vm = new VM({
     }
 });
 vm.execute([
-    'mixed/js/core.js'
+    'js/core.js'
 ]);
 const [DynamicProperty, deepEqual] = vm.get(['DynamicProperty', 'deepEqual']);
 
diff --git a/test/test-database.js b/test/test-database.js
index 4ac0dae6..8b075fd4 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -23,8 +23,8 @@ const {DatabaseVM} = require('../dev/database-vm');
 
 const vm = new DatabaseVM();
 vm.execute([
-    'mixed/js/core.js',
-    'mixed/js/cache-map.js',
+    'js/core.js',
+    'js/general/cache-map.js',
     'bg/js/json-schema.js',
     'bg/js/media-utility.js',
     'bg/js/dictionary-importer.js',
diff --git a/test/test-document-util.js b/test/test-document-util.js
index 2311e25f..5c6a3894 100644
--- a/test/test-document-util.js
+++ b/test/test-document-util.js
@@ -97,7 +97,7 @@ async function testDocument1() {
         'fg/js/dom-text-scanner.js',
         'fg/js/text-source-range.js',
         'fg/js/text-source-element.js',
-        'mixed/js/document-util.js'
+        'js/dom/document-util.js'
     ]);
     const [DOMTextScanner, TextSourceRange, TextSourceElement, DocumentUtil] = vm.get([
         'DOMTextScanner',
diff --git a/test/test-hotkey-util.js b/test/test-hotkey-util.js
index 1388c538..eb4cf0b3 100644
--- a/test/test-hotkey-util.js
+++ b/test/test-hotkey-util.js
@@ -26,7 +26,7 @@ function clone(value) {
 
 function createHotkeyUtil() {
     const vm = new VM();
-    vm.execute(['mixed/js/hotkey-util.js']);
+    vm.execute(['js/input/hotkey-util.js']);
     const [HotkeyUtil] = vm.get(['HotkeyUtil']);
     return new HotkeyUtil();
 }
diff --git a/test/test-japanese.js b/test/test-japanese.js
index e83b0c1b..e2be2315 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -22,7 +22,7 @@ const {VM} = require('../dev/vm');
 const vm = new VM();
 vm.execute([
     'lib/wanakana.min.js',
-    'mixed/js/japanese.js',
+    'js/language/japanese-util.js',
     'bg/js/text-source-map.js'
 ]);
 const [JapaneseUtil, TextSourceMap, wanakana] = vm.get(['JapaneseUtil', 'TextSourceMap', 'wanakana']);
diff --git a/test/test-object-property-accessor.js b/test/test-object-property-accessor.js
index 920cfc81..b3f05c7e 100644
--- a/test/test-object-property-accessor.js
+++ b/test/test-object-property-accessor.js
@@ -20,7 +20,7 @@ const {testMain} = require('../dev/util');
 const {VM} = require('../dev/vm');
 
 const vm = new VM({});
-vm.execute('mixed/js/object-property-accessor.js');
+vm.execute('js/general/object-property-accessor.js');
 const ObjectPropertyAccessor = vm.get('ObjectPropertyAccessor');
 
 
diff --git a/test/test-options-util.js b/test/test-options-util.js
index e4bc4e94..3e3f93bc 100644
--- a/test/test-options-util.js
+++ b/test/test-options-util.js
@@ -47,8 +47,8 @@ function createVM(extDir) {
 
     const vm = new VM({chrome, fetch});
     vm.execute([
-        'mixed/js/core.js',
-        'mixed/js/cache-map.js',
+        'js/core.js',
+        'js/general/cache-map.js',
         'bg/js/json-schema.js',
         'bg/js/template-patcher.js',
         'bg/js/options.js'
diff --git a/test/test-profile-conditions.js b/test/test-profile-conditions.js
index 40788920..7ceda8c4 100644
--- a/test/test-profile-conditions.js
+++ b/test/test-profile-conditions.js
@@ -22,8 +22,8 @@ const {VM} = require('../dev/vm');
 
 const vm = new VM({});
 vm.execute([
-    'mixed/js/core.js',
-    'mixed/js/cache-map.js',
+    'js/core.js',
+    'js/general/cache-map.js',
     'bg/js/json-schema.js',
     'bg/js/profile-conditions.js'
 ]);
diff --git a/test/test-schema.js b/test/test-schema.js
index f0ebd669..2c48f5f5 100644
--- a/test/test-schema.js
+++ b/test/test-schema.js
@@ -21,8 +21,8 @@ const {VM} = require('../dev/vm');
 
 const vm = new VM();
 vm.execute([
-    'mixed/js/core.js',
-    'mixed/js/cache-map.js',
+    'js/core.js',
+    'js/general/cache-map.js',
     'bg/js/json-schema.js'
 ]);
 const JsonSchemaValidator = vm.get('JsonSchemaValidator');
diff --git a/test/test-translator.js b/test/test-translator.js
index 778a7ce1..e1161a15 100644
--- a/test/test-translator.js
+++ b/test/test-translator.js
@@ -36,9 +36,9 @@ async function createVM() {
     // Set up VM
     const vm = new DatabaseVM();
     vm.execute([
-        'mixed/js/core.js',
-        'mixed/js/cache-map.js',
-        'mixed/js/japanese.js',
+        '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',