48 files changed, 89 insertions, 89 deletions
diff --git a/ext/action-popup.html b/ext/action-popup.html
index e6dbdc44..79a3df88 100644
--- a/ext/action-popup.html
+++ b/ext/action-popup.html
@@ -89,9 +89,9 @@
 <script src="/js/input/hotkey-help-controller.js"></script>
 <script src="/js/input/hotkey-util.js"></script>
 
-<script src="/bg/js/permissions-util.js"></script>
+<script src="/js/data/permissions-util.js"></script>
 
-<script src="/bg/js/context-main.js"></script>
+<script src="/js/pages/action-popup-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/background.html b/ext/background.html
index 92c3b0aa..740bee57 100644
--- a/ext/background.html
+++ b/ext/background.html
@@ -26,28 +26,28 @@
         <script src="/js/language/dictionary-data-util.js"></script>
         <script src="/js/general/object-property-accessor.js"></script>
 
-        <script src="/bg/js/anki.js"></script>
-        <script src="/bg/js/audio-downloader.js"></script>
-        <script src="/bg/js/clipboard-monitor.js"></script>
-        <script src="/bg/js/clipboard-reader.js"></script>
-        <script src="/bg/js/database.js"></script>
-        <script src="/bg/js/deinflector.js"></script>
-        <script src="/bg/js/dictionary-database.js"></script>
-        <script src="/bg/js/json-schema.js"></script>
-        <script src="/bg/js/mecab.js"></script>
-        <script src="/bg/js/media-utility.js"></script>
-        <script src="/bg/js/options.js"></script>
-        <script src="/bg/js/permissions-util.js"></script>
-        <script src="/bg/js/profile-conditions.js"></script>
-        <script src="/bg/js/request-builder.js"></script>
-        <script src="/bg/js/native-simple-dom-parser.js"></script>
-        <script src="/bg/js/template-patcher.js"></script>
-        <script src="/bg/js/text-source-map.js"></script>
-        <script src="/bg/js/translator.js"></script>
+        <script src="/js/comm/anki.js"></script>
+        <script src="/js/media/audio-downloader.js"></script>
+        <script src="/js/comm/clipboard-monitor.js"></script>
+        <script src="/js/comm/clipboard-reader.js"></script>
+        <script src="/js/data/database.js"></script>
+        <script src="/js/language/deinflector.js"></script>
+        <script src="/js/language/dictionary-database.js"></script>
+        <script src="/js/data/json-schema.js"></script>
+        <script src="/js/comm/mecab.js"></script>
+        <script src="/js/media/media-utility.js"></script>
+        <script src="/js/data/options-util.js"></script>
+        <script src="/js/data/permissions-util.js"></script>
+        <script src="/js/background/profile-conditions.js"></script>
+        <script src="/js/background/request-builder.js"></script>
+        <script src="/js/dom/native-simple-dom-parser.js"></script>
+        <script src="/js/templates/template-patcher.js"></script>
+        <script src="/js/general/text-source-map.js"></script>
+        <script src="/js/language/translator.js"></script>
 
-        <script src="/bg/js/backend.js"></script>
+        <script src="/js/background/backend.js"></script>
 
-        <script src="/bg/js/background-main.js"></script>
+        <script src="/js/background/background-main.js"></script>
 
         <!--
             Due to a Firefox bug, this next element is purposefully terminated incorrectly.
diff --git a/ext/info.html b/ext/info.html
index d9a20e5e..aa00b103 100644
--- a/ext/info.html
+++ b/ext/info.html
@@ -65,11 +65,11 @@
 
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/bg/js/permissions-util.js"></script>
+<script src="/js/data/permissions-util.js"></script>
 <script src="/js/settings/settings-controller.js"></script>
 <script src="/js/settings/backup-controller.js"></script>
 
-<script src="/bg/js/info-main.js"></script>
+<script src="/js/pages/info-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/bg/js/backend.js b/ext/js/background/backend.js
index 3bb23310..3bb23310 100644
--- a/ext/bg/js/backend.js
+++ b/ext/js/background/backend.js
diff --git a/ext/bg/js/background-main.js b/ext/js/background/background-main.js
index 01e57d0f..01e57d0f 100644
--- a/ext/bg/js/background-main.js
+++ b/ext/js/background/background-main.js
diff --git a/ext/bg/js/profile-conditions.js b/ext/js/background/profile-conditions.js
index 8e6c7163..8e6c7163 100644
--- a/ext/bg/js/profile-conditions.js
+++ b/ext/js/background/profile-conditions.js
diff --git a/ext/bg/js/request-builder.js b/ext/js/background/request-builder.js
index dda5825d..dda5825d 100644
--- a/ext/bg/js/request-builder.js
+++ b/ext/js/background/request-builder.js
diff --git a/ext/bg/js/anki.js b/ext/js/comm/anki.js
index 251e0e0c..251e0e0c 100644
--- a/ext/bg/js/anki.js
+++ b/ext/js/comm/anki.js
diff --git a/ext/bg/js/clipboard-monitor.js b/ext/js/comm/clipboard-monitor.js
index 7379d7ad..7379d7ad 100644
--- a/ext/bg/js/clipboard-monitor.js
+++ b/ext/js/comm/clipboard-monitor.js
diff --git a/ext/bg/js/clipboard-reader.js b/ext/js/comm/clipboard-reader.js
index 275c2d60..275c2d60 100644
--- a/ext/bg/js/clipboard-reader.js
+++ b/ext/js/comm/clipboard-reader.js
diff --git a/ext/bg/js/mecab.js b/ext/js/comm/mecab.js
index 4eff2927..4eff2927 100644
--- a/ext/bg/js/mecab.js
+++ b/ext/js/comm/mecab.js
diff --git a/ext/bg/js/anki-note-builder.js b/ext/js/data/anki-note-builder.js
index e1399f66..e1399f66 100644
--- a/ext/bg/js/anki-note-builder.js
+++ b/ext/js/data/anki-note-builder.js
diff --git a/ext/bg/js/anki-note-data.js b/ext/js/data/anki-note-data.js
index a7d0f9f6..a7d0f9f6 100644
--- a/ext/bg/js/anki-note-data.js
+++ b/ext/js/data/anki-note-data.js
diff --git a/ext/bg/js/database.js b/ext/js/data/database.js
index 068f4a5f..068f4a5f 100644
--- a/ext/bg/js/database.js
+++ b/ext/js/data/database.js
diff --git a/ext/bg/js/json-schema.js b/ext/js/data/json-schema.js
index 7b6b9c53..7b6b9c53 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/js/data/json-schema.js
diff --git a/ext/bg/js/options.js b/ext/js/data/options-util.js
index 1105dfed..1105dfed 100644
--- a/ext/bg/js/options.js
+++ b/ext/js/data/options-util.js
diff --git a/ext/bg/js/permissions-util.js b/ext/js/data/permissions-util.js
index bd3a18ce..bd3a18ce 100644
--- a/ext/bg/js/permissions-util.js
+++ b/ext/js/data/permissions-util.js
diff --git a/ext/bg/js/query-parser.js b/ext/js/display/query-parser.js
index 05ebfa27..05ebfa27 100644
--- a/ext/bg/js/query-parser.js
+++ b/ext/js/display/query-parser.js
diff --git a/ext/bg/js/search-display-controller.js b/ext/js/display/search-display-controller.js
index a295346d..a295346d 100644
--- a/ext/bg/js/search-display-controller.js
+++ b/ext/js/display/search-display-controller.js
diff --git a/ext/bg/js/search-main.js b/ext/js/display/search-main.js
index c7ec595a..c7ec595a 100644
--- a/ext/bg/js/search-main.js
+++ b/ext/js/display/search-main.js
diff --git a/ext/bg/js/native-simple-dom-parser.js b/ext/js/dom/native-simple-dom-parser.js
index 27dadec0..27dadec0 100644
--- a/ext/bg/js/native-simple-dom-parser.js
+++ b/ext/js/dom/native-simple-dom-parser.js
diff --git a/ext/bg/js/simple-dom-parser.js b/ext/js/dom/simple-dom-parser.js
index 7c57ca98..7c57ca98 100644
--- a/ext/bg/js/simple-dom-parser.js
+++ b/ext/js/dom/simple-dom-parser.js
diff --git a/ext/bg/js/text-source-map.js b/ext/js/general/text-source-map.js
index 49b6d99f..49b6d99f 100644
--- a/ext/bg/js/text-source-map.js
+++ b/ext/js/general/text-source-map.js
diff --git a/ext/bg/js/deinflector.js b/ext/js/language/deinflector.js
index 8fee3f01..8fee3f01 100644
--- a/ext/bg/js/deinflector.js
+++ b/ext/js/language/deinflector.js
diff --git a/ext/bg/js/dictionary-database.js b/ext/js/language/dictionary-database.js
index b363ed25..b363ed25 100644
--- a/ext/bg/js/dictionary-database.js
+++ b/ext/js/language/dictionary-database.js
diff --git a/ext/bg/js/dictionary-importer.js b/ext/js/language/dictionary-importer.js
index 4cb608db..4cb608db 100644
--- a/ext/bg/js/dictionary-importer.js
+++ b/ext/js/language/dictionary-importer.js
diff --git a/ext/bg/js/translator.js b/ext/js/language/translator.js
index 729c8294..729c8294 100644
--- a/ext/bg/js/translator.js
+++ b/ext/js/language/translator.js
diff --git a/ext/bg/js/audio-downloader.js b/ext/js/media/audio-downloader.js
index 4e77419b..4e77419b 100644
--- a/ext/bg/js/audio-downloader.js
+++ b/ext/js/media/audio-downloader.js
diff --git a/ext/bg/js/media-utility.js b/ext/js/media/media-utility.js
index b4fbe04d..b4fbe04d 100644
--- a/ext/bg/js/media-utility.js
+++ b/ext/js/media/media-utility.js
diff --git a/ext/bg/js/context-main.js b/ext/js/pages/action-popup-main.js
index 5cc56745..5cc56745 100644
--- a/ext/bg/js/context-main.js
+++ b/ext/js/pages/action-popup-main.js
diff --git a/ext/bg/js/generic-page-main.js b/ext/js/pages/generic-page-main.js
index db1a770a..db1a770a 100644
--- a/ext/bg/js/generic-page-main.js
+++ b/ext/js/pages/generic-page-main.js
diff --git a/ext/bg/js/info-main.js b/ext/js/pages/info-main.js
index 6cf82595..6cf82595 100644
--- a/ext/bg/js/info-main.js
+++ b/ext/js/pages/info-main.js
diff --git a/ext/bg/js/permissions-main.js b/ext/js/pages/permissions-main.js
index 5b17a5dd..5b17a5dd 100644
--- a/ext/bg/js/permissions-main.js
+++ b/ext/js/pages/permissions-main.js
diff --git a/ext/bg/js/welcome-main.js b/ext/js/pages/welcome-main.js
index 57b265dc..57b265dc 100644
--- a/ext/bg/js/welcome-main.js
+++ b/ext/js/pages/welcome-main.js
diff --git a/ext/bg/js/template-patcher.js b/ext/js/templates/template-patcher.js
index 57178957..57178957 100644
--- a/ext/bg/js/template-patcher.js
+++ b/ext/js/templates/template-patcher.js
diff --git a/ext/bg/js/template-renderer-frame-api.js b/ext/js/templates/template-renderer-frame-api.js
index 4936a2af..4936a2af 100644
--- a/ext/bg/js/template-renderer-frame-api.js
+++ b/ext/js/templates/template-renderer-frame-api.js
diff --git a/ext/bg/js/template-renderer-frame-main.js b/ext/js/templates/template-renderer-frame-main.js
index d25eb56d..d25eb56d 100644
--- a/ext/bg/js/template-renderer-frame-main.js
+++ b/ext/js/templates/template-renderer-frame-main.js
diff --git a/ext/bg/js/template-renderer-proxy.js b/ext/js/templates/template-renderer-proxy.js
index 6a49832b..6a49832b 100644
--- a/ext/bg/js/template-renderer-proxy.js
+++ b/ext/js/templates/template-renderer-proxy.js
diff --git a/ext/bg/js/template-renderer.js b/ext/js/templates/template-renderer.js
index ae39e478..ae39e478 100644
--- a/ext/bg/js/template-renderer.js
+++ b/ext/js/templates/template-renderer.js
diff --git a/ext/legal.html b/ext/legal.html
index 644ad831..0f2cfd67 100644
--- a/ext/legal.html
+++ b/ext/legal.html
@@ -221,7 +221,7 @@ THE SOFTWARE.
 <!-- Scripts -->
 <script src="/js/dom/document-focus-controller.js"></script>
 
-<script src="/bg/js/generic-page-main.js"></script>
+<script src="/js/pages/generic-page-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/permissions.html b/ext/permissions.html
index 67dc5f85..23d3412a 100644
--- a/ext/permissions.html
+++ b/ext/permissions.html
@@ -168,11 +168,11 @@
 
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/bg/js/permissions-util.js"></script>
+<script src="/js/data/permissions-util.js"></script>
 <script src="/js/settings/permissions-toggle-controller.js"></script>
 <script src="/js/settings/settings-controller.js"></script>
 
-<script src="/bg/js/permissions-main.js"></script>
+<script src="/js/pages/permissions-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/popup.html b/ext/popup.html
index e31237dd..9f3220bc 100644
--- a/ext/popup.html
+++ b/ext/popup.html
@@ -121,10 +121,10 @@
 <script src="/js/dom/html-template-collection.js"></script>
 <script src="/js/media/text-to-speech-audio.js"></script>
 
-<script src="/bg/js/anki-note-builder.js"></script>
-<script src="/bg/js/template-renderer-proxy.js"></script>
+<script src="/js/data/anki-note-builder.js"></script>
+<script src="/js/templates/template-renderer-proxy.js"></script>
 
-<script src="/bg/js/query-parser.js"></script>
+<script src="/js/display/query-parser.js"></script>
 
 <script src="/js/display/popup-main.js"></script>
 
diff --git a/ext/search.html b/ext/search.html
index 1efef61e..65e04949 100644
--- a/ext/search.html
+++ b/ext/search.html
@@ -104,14 +104,14 @@
 <script src="/js/dom/html-template-collection.js"></script>
 <script src="/js/media/text-to-speech-audio.js"></script>
 
-<script src="/bg/js/anki-note-builder.js"></script>
-<script src="/bg/js/template-renderer-proxy.js"></script>
+<script src="/js/data/anki-note-builder.js"></script>
+<script src="/js/templates/template-renderer-proxy.js"></script>
 
-<script src="/bg/js/query-parser.js"></script>
-<script src="/bg/js/clipboard-monitor.js"></script>
-<script src="/bg/js/search-display-controller.js"></script>
+<script src="/js/display/query-parser.js"></script>
+<script src="/js/comm/clipboard-monitor.js"></script>
+<script src="/js/display/search-display-controller.js"></script>
 
-<script src="/bg/js/search-main.js"></script>
+<script src="/js/display/search-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/settings-old.html b/ext/settings-old.html
index d95c4ee4..8b541ab3 100644
--- a/ext/settings-old.html
+++ b/ext/settings-old.html
@@ -1297,17 +1297,17 @@
         <script src="/js/general/task-accumulator.js"></script>
         <script src="/js/media/text-to-speech-audio.js"></script>
 
-        <script src="/bg/js/anki.js"></script>
-        <script src="/bg/js/anki-note-builder.js"></script>
-        <script src="/bg/js/options.js"></script>
-        <script src="/bg/js/database.js"></script>
-        <script src="/bg/js/dictionary-database.js"></script>
-        <script src="/bg/js/dictionary-importer.js"></script>
-        <script src="/bg/js/json-schema.js"></script>
-        <script src="/bg/js/media-utility.js"></script>
-        <script src="/bg/js/permissions-util.js"></script>
-        <script src="/bg/js/template-patcher.js"></script>
-        <script src="/bg/js/template-renderer-proxy.js"></script>
+        <script src="/js/comm/anki.js"></script>
+        <script src="/js/data/anki-note-builder.js"></script>
+        <script src="/js/data/options-util.js"></script>
+        <script src="/js/data/database.js"></script>
+        <script src="/js/language/dictionary-database.js"></script>
+        <script src="/js/language/dictionary-importer.js"></script>
+        <script src="/js/data/json-schema.js"></script>
+        <script src="/js/media/media-utility.js"></script>
+        <script src="/js/data/permissions-util.js"></script>
+        <script src="/js/templates/template-patcher.js"></script>
+        <script src="/js/templates/template-renderer-proxy.js"></script>
 
         <script src="/js/settings/keyboard-mouse-input-field.js"></script>
         <script src="/js/settings/modal-jquery.js"></script>
diff --git a/ext/settings.html b/ext/settings.html
index eece5157..faea4aa3 100644
--- a/ext/settings.html
+++ b/ext/settings.html
@@ -3211,17 +3211,17 @@
 <script src="/js/general/task-accumulator.js"></script>
 <script src="/js/media/text-to-speech-audio.js"></script>
 
-<script src="/bg/js/anki.js"></script>
-<script src="/bg/js/anki-note-builder.js"></script>
-<script src="/bg/js/options.js"></script>
-<script src="/bg/js/database.js"></script>
-<script src="/bg/js/dictionary-database.js"></script>
-<script src="/bg/js/dictionary-importer.js"></script>
-<script src="/bg/js/json-schema.js"></script>
-<script src="/bg/js/media-utility.js"></script>
-<script src="/bg/js/permissions-util.js"></script>
-<script src="/bg/js/template-patcher.js"></script>
-<script src="/bg/js/template-renderer-proxy.js"></script>
+<script src="/js/comm/anki.js"></script>
+<script src="/js/data/anki-note-builder.js"></script>
+<script src="/js/data/options-util.js"></script>
+<script src="/js/data/database.js"></script>
+<script src="/js/language/dictionary-database.js"></script>
+<script src="/js/language/dictionary-importer.js"></script>
+<script src="/js/data/json-schema.js"></script>
+<script src="/js/media/media-utility.js"></script>
+<script src="/js/data/permissions-util.js"></script>
+<script src="/js/templates/template-patcher.js"></script>
+<script src="/js/templates/template-renderer-proxy.js"></script>
 
 <script src="/js/settings/keyboard-mouse-input-field.js"></script>
 <script src="/js/settings/profile-conditions-ui.js"></script>
diff --git a/ext/sw.js b/ext/sw.js
index 2cc9a6c3..23f9732c 100644
--- a/ext/sw.js
+++ b/ext/sw.js
@@ -25,24 +25,24 @@ self.importScripts(
     '/js/general/cache-map.js',
     '/js/language/dictionary-data-util.js',
     '/js/general/object-property-accessor.js',
-    '/bg/js/anki.js',
-    '/bg/js/audio-downloader.js',
-    '/bg/js/clipboard-monitor.js',
-    '/bg/js/clipboard-reader.js',
-    '/bg/js/database.js',
-    '/bg/js/deinflector.js',
-    '/bg/js/dictionary-database.js',
-    '/bg/js/json-schema.js',
-    '/bg/js/mecab.js',
-    '/bg/js/media-utility.js',
-    '/bg/js/options.js',
-    '/bg/js/permissions-util.js',
-    '/bg/js/profile-conditions.js',
-    '/bg/js/request-builder.js',
-    '/bg/js/simple-dom-parser.js',
-    '/bg/js/template-patcher.js',
-    '/bg/js/text-source-map.js',
-    '/bg/js/translator.js',
-    '/bg/js/backend.js',
-    '/bg/js/background-main.js'
+    '/js/comm/anki.js',
+    '/js/media/audio-downloader.js',
+    '/js/comm/clipboard-monitor.js',
+    '/js/comm/clipboard-reader.js',
+    '/js/data/database.js',
+    '/js/language/deinflector.js',
+    '/js/language/dictionary-database.js',
+    '/js/data/json-schema.js',
+    '/js/comm/mecab.js',
+    '/js/media/media-utility.js',
+    '/js/data/options-util.js',
+    '/js/data/permissions-util.js',
+    '/js/background/profile-conditions.js',
+    '/js/background/request-builder.js',
+    '/js/dom/simple-dom-parser.js',
+    '/js/templates/template-patcher.js',
+    '/js/general/text-source-map.js',
+    '/js/language/translator.js',
+    '/js/background/backend.js',
+    '/js/background/background-main.js'
 );
diff --git a/ext/template-renderer.html b/ext/template-renderer.html
index 11c19067..7245ed62 100644
--- a/ext/template-renderer.html
+++ b/ext/template-renderer.html
@@ -16,9 +16,9 @@
     <script src="/lib/handlebars.min.js"></script>
     <script src="/js/language/dictionary-data-util.js"></script>
     <script src="/js/language/japanese-util.js"></script>
-    <script src="/bg/js/anki-note-data.js"></script>
-    <script src="/bg/js/template-renderer.js"></script>
-    <script src="/bg/js/template-renderer-frame-api.js"></script>
-    <script src="/bg/js/template-renderer-frame-main.js"></script>
+    <script src="/js/data/anki-note-data.js"></script>
+    <script src="/js/templates/template-renderer.js"></script>
+    <script src="/js/templates/template-renderer-frame-api.js"></script>
+    <script src="/js/templates/template-renderer-frame-main.js"></script>
 </body>
 </html>
diff --git a/ext/welcome.html b/ext/welcome.html
index 98992aec..16dd964d 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -331,12 +331,12 @@
 <script src="/js/dom/selector-observer.js"></script>
 <script src="/js/general/task-accumulator.js"></script>
 
-<script src="/bg/js/database.js"></script>
-<script src="/bg/js/dictionary-database.js"></script>
-<script src="/bg/js/dictionary-importer.js"></script>
-<script src="/bg/js/json-schema.js"></script>
-<script src="/bg/js/media-utility.js"></script>
-<script src="/bg/js/permissions-util.js"></script>
+<script src="/js/data/database.js"></script>
+<script src="/js/language/dictionary-database.js"></script>
+<script src="/js/language/dictionary-importer.js"></script>
+<script src="/js/data/json-schema.js"></script>
+<script src="/js/media/media-utility.js"></script>
+<script src="/js/data/permissions-util.js"></script>
 
 <script src="/js/settings/dictionary-controller.js"></script>
 <script src="/js/settings/dictionary-import-controller.js"></script>
@@ -349,7 +349,7 @@
 
 <script src="/js/settings/settings-display-controller.js"></script>
 
-<script src="/bg/js/welcome-main.js"></script>
+<script src="/js/pages/welcome-main.js"></script>
 
 </body>
 </html>