20 files changed, 48 insertions, 48 deletions
diff --git a/dev/data/manifest-variants.json b/dev/data/manifest-variants.json
index aa06bf58..72e07086 100644
--- a/dev/data/manifest-variants.json
+++ b/dev/data/manifest-variants.json
@@ -48,17 +48,17 @@
                     "js/language/text-scanner.js",
                     "js/dom/document-util.js",
                     "js/input/hotkey-handler.js",
-                    "fg/js/dom-text-scanner.js",
-                    "fg/js/popup.js",
-                    "fg/js/text-source-range.js",
-                    "fg/js/text-source-element.js",
-                    "fg/js/popup-factory.js",
-                    "fg/js/frame-ancestry-handler.js",
-                    "fg/js/frame-offset-forwarder.js",
-                    "fg/js/popup-proxy.js",
-                    "fg/js/popup-window.js",
-                    "fg/js/frontend.js",
-                    "fg/js/content-script-main.js"
+                    "js/dom/dom-text-scanner.js",
+                    "js/app/popup.js",
+                    "js/dom/text-source-range.js",
+                    "js/dom/text-source-element.js",
+                    "js/app/popup-factory.js",
+                    "js/comm/frame-ancestry-handler.js",
+                    "js/comm/frame-offset-forwarder.js",
+                    "js/app/popup-proxy.js",
+                    "js/app/popup-window.js",
+                    "js/app/frontend.js",
+                    "js/app/content-script-main.js"
                 ],
                 "match_about_blank": true,
                 "all_frames": true
diff --git a/ext/fg/js/content-script-main.js b/ext/js/app/content-script-main.js
index 5dee4c56..5dee4c56 100644
--- a/ext/fg/js/content-script-main.js
+++ b/ext/js/app/content-script-main.js
diff --git a/ext/fg/js/frontend.js b/ext/js/app/frontend.js
index a62b06bf..a62b06bf 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/js/app/frontend.js
diff --git a/ext/fg/js/popup-factory.js b/ext/js/app/popup-factory.js
index 7571d7ab..7571d7ab 100644
--- a/ext/fg/js/popup-factory.js
+++ b/ext/js/app/popup-factory.js
diff --git a/ext/fg/js/popup-proxy.js b/ext/js/app/popup-proxy.js
index b2e81824..b2e81824 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/js/app/popup-proxy.js
diff --git a/ext/fg/js/popup-window.js b/ext/js/app/popup-window.js
index 5fa0c647..5fa0c647 100644
--- a/ext/fg/js/popup-window.js
+++ b/ext/js/app/popup-window.js
diff --git a/ext/fg/js/popup.js b/ext/js/app/popup.js
index 75b74257..75b74257 100644
--- a/ext/fg/js/popup.js
+++ b/ext/js/app/popup.js
diff --git a/ext/fg/js/frame-ancestry-handler.js b/ext/js/comm/frame-ancestry-handler.js
index b1ed7114..b1ed7114 100644
--- a/ext/fg/js/frame-ancestry-handler.js
+++ b/ext/js/comm/frame-ancestry-handler.js
diff --git a/ext/fg/js/frame-offset-forwarder.js b/ext/js/comm/frame-offset-forwarder.js
index 0a0b4a18..0a0b4a18 100644
--- a/ext/fg/js/frame-offset-forwarder.js
+++ b/ext/js/comm/frame-offset-forwarder.js
diff --git a/ext/js/display/display.js b/ext/js/display/display.js
index ffadd055..c522fe14 100644
--- a/ext/js/display/display.js
+++ b/ext/js/display/display.js
@@ -1573,13 +1573,13 @@ class Display extends EventDispatcher {
         await dynamicLoader.loadScripts([
             '/js/language/text-scanner.js',
             '/js/comm/frame-client.js',
-            '/fg/js/popup.js',
-            '/fg/js/popup-proxy.js',
-            '/fg/js/popup-window.js',
-            '/fg/js/popup-factory.js',
-            '/fg/js/frame-ancestry-handler.js',
-            '/fg/js/frame-offset-forwarder.js',
-            '/fg/js/frontend.js'
+            '/js/app/popup.js',
+            '/js/app/popup-proxy.js',
+            '/js/app/popup-window.js',
+            '/js/app/popup-factory.js',
+            '/js/comm/frame-ancestry-handler.js',
+            '/js/comm/frame-offset-forwarder.js',
+            '/js/app/frontend.js'
         ]);
 
         const popupFactory = new PopupFactory(this._frameId);
diff --git a/ext/fg/js/float-main.js b/ext/js/display/popup-main.js
index 7c048b62..7c048b62 100644
--- a/ext/fg/js/float-main.js
+++ b/ext/js/display/popup-main.js
diff --git a/ext/fg/js/dom-text-scanner.js b/ext/js/dom/dom-text-scanner.js
index 71e74fc3..71e74fc3 100644
--- a/ext/fg/js/dom-text-scanner.js
+++ b/ext/js/dom/dom-text-scanner.js
diff --git a/ext/fg/js/text-source-element.js b/ext/js/dom/text-source-element.js
index 45186636..45186636 100644
--- a/ext/fg/js/text-source-element.js
+++ b/ext/js/dom/text-source-element.js
diff --git a/ext/fg/js/text-source-range.js b/ext/js/dom/text-source-range.js
index 377016da..377016da 100644
--- a/ext/fg/js/text-source-range.js
+++ b/ext/js/dom/text-source-range.js
diff --git a/ext/manifest.json b/ext/manifest.json
index 4ac53273..85aecc9c 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -47,17 +47,17 @@
                 "js/language/text-scanner.js",
                 "js/dom/document-util.js",
                 "js/input/hotkey-handler.js",
-                "fg/js/dom-text-scanner.js",
-                "fg/js/popup.js",
-                "fg/js/text-source-range.js",
-                "fg/js/text-source-element.js",
-                "fg/js/popup-factory.js",
-                "fg/js/frame-ancestry-handler.js",
-                "fg/js/frame-offset-forwarder.js",
-                "fg/js/popup-proxy.js",
-                "fg/js/popup-window.js",
-                "fg/js/frontend.js",
-                "fg/js/content-script-main.js"
+                "js/dom/dom-text-scanner.js",
+                "js/app/popup.js",
+                "js/dom/text-source-range.js",
+                "js/dom/text-source-element.js",
+                "js/app/popup-factory.js",
+                "js/comm/frame-ancestry-handler.js",
+                "js/comm/frame-offset-forwarder.js",
+                "js/app/popup-proxy.js",
+                "js/app/popup-window.js",
+                "js/app/frontend.js",
+                "js/app/content-script-main.js"
             ],
             "match_about_blank": true,
             "all_frames": true
diff --git a/ext/popup-preview.html b/ext/popup-preview.html
index 18aec551..6f6ff8b1 100644
--- a/ext/popup-preview.html
+++ b/ext/popup-preview.html
@@ -46,14 +46,14 @@
 
 <script src="/js/dom/document-util.js"></script>
 <script src="/js/input/hotkey-handler.js"></script>
-<script src="/fg/js/dom-text-scanner.js"></script>
-<script src="/fg/js/popup.js"></script>
-<script src="/fg/js/text-source-range.js"></script>
-<script src="/fg/js/text-source-element.js"></script>
-<script src="/fg/js/popup-factory.js"></script>
-<script src="/fg/js/frontend.js"></script>
-<script src="/fg/js/frame-ancestry-handler.js"></script>
-<script src="/fg/js/frame-offset-forwarder.js"></script>
+<script src="/js/dom/dom-text-scanner.js"></script>
+<script src="/js/app/popup.js"></script>
+<script src="/js/dom/text-source-range.js"></script>
+<script src="/js/dom/text-source-element.js"></script>
+<script src="/js/app/popup-factory.js"></script>
+<script src="/js/app/frontend.js"></script>
+<script src="/js/comm/frame-ancestry-handler.js"></script>
+<script src="/js/comm/frame-offset-forwarder.js"></script>
 <script src="/bg/js/settings/popup-preview-frame.js"></script>
 
 <script src="/bg/js/settings/popup-preview-frame-main.js"></script>
diff --git a/ext/popup.html b/ext/popup.html
index 274340ca..e31237dd 100644
--- a/ext/popup.html
+++ b/ext/popup.html
@@ -96,9 +96,9 @@
 <script src="/js/language/japanese-util.js"></script>
 
 <script src="/js/dom/document-util.js"></script>
-<script src="/fg/js/dom-text-scanner.js"></script>
-<script src="/fg/js/text-source-range.js"></script>
-<script src="/fg/js/text-source-element.js"></script>
+<script src="/js/dom/dom-text-scanner.js"></script>
+<script src="/js/dom/text-source-range.js"></script>
+<script src="/js/dom/text-source-element.js"></script>
 <script src="/js/media/audio-system.js"></script>
 <script src="/js/language/dictionary-data-util.js"></script>
 <script src="/js/display/display.js"></script>
@@ -126,7 +126,7 @@
 
 <script src="/bg/js/query-parser.js"></script>
 
-<script src="/fg/js/float-main.js"></script>
+<script src="/js/display/popup-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/search.html b/ext/search.html
index 384493c8..1efef61e 100644
--- a/ext/search.html
+++ b/ext/search.html
@@ -83,9 +83,9 @@
 
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/document-util.js"></script>
-<script src="/fg/js/dom-text-scanner.js"></script>
-<script src="/fg/js/text-source-range.js"></script>
-<script src="/fg/js/text-source-element.js"></script>
+<script src="/js/dom/dom-text-scanner.js"></script>
+<script src="/js/dom/text-source-range.js"></script>
+<script src="/js/dom/text-source-element.js"></script>
 <script src="/js/media/audio-system.js"></script>
 <script src="/js/language/dictionary-data-util.js"></script>
 <script src="/js/display/display.js"></script>
diff --git a/test/test-document-util.js b/test/test-document-util.js
index 5c6a3894..52fabf97 100644
--- a/test/test-document-util.js
+++ b/test/test-document-util.js
@@ -94,9 +94,9 @@ async function testDocument1() {
 
     const vm = new VM({document, window, Range, Node});
     vm.execute([
-        'fg/js/dom-text-scanner.js',
-        'fg/js/text-source-range.js',
-        'fg/js/text-source-element.js',
+        'js/dom/dom-text-scanner.js',
+        'js/dom/text-source-range.js',
+        'js/dom/text-source-element.js',
         'js/dom/document-util.js'
     ]);
     const [DOMTextScanner, TextSourceRange, TextSourceElement, DocumentUtil] = vm.get([
diff --git a/test/test-dom-text-scanner.js b/test/test-dom-text-scanner.js
index 6fac695a..31eca1e7 100644
--- a/test/test-dom-text-scanner.js
+++ b/test/test-dom-text-scanner.js
@@ -166,7 +166,7 @@ async function testDocument1() {
         window.getComputedStyle = createAbsoluteGetComputedStyle(window);
 
         const vm = new VM({document, window, Range, Node});
-        vm.execute('fg/js/dom-text-scanner.js');
+        vm.execute('js/dom/dom-text-scanner.js');
         const DOMTextScanner = vm.get('DOMTextScanner');
 
         await testDomTextScanner(dom, {DOMTextScanner});