42 files changed, 70 insertions, 70 deletions
diff --git a/.eslintrc.json b/.eslintrc.json
index 3dcefb91..b345234c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -134,7 +134,7 @@
             }
         },
         {
-            "files": ["ext/bg/js/settings/*.js"],
+            "files": ["ext/js/settings/*.js"],
             "env": {
                 "jquery": true
             }
diff --git a/ext/info.html b/ext/info.html
index a520ad52..d9a20e5e 100644
--- a/ext/info.html
+++ b/ext/info.html
@@ -66,8 +66,8 @@
 <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="/bg/js/settings/settings-controller.js"></script>
-<script src="/bg/js/settings/backup-controller.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>
 
diff --git a/ext/bg/js/settings/anki-controller.js b/ext/js/settings/anki-controller.js
index db3e3c14..db3e3c14 100644
--- a/ext/bg/js/settings/anki-controller.js
+++ b/ext/js/settings/anki-controller.js
diff --git a/ext/bg/js/settings/anki-templates-controller.js b/ext/js/settings/anki-templates-controller.js
index 31bd1e92..31bd1e92 100644
--- a/ext/bg/js/settings/anki-templates-controller.js
+++ b/ext/js/settings/anki-templates-controller.js
diff --git a/ext/bg/js/settings/audio-controller.js b/ext/js/settings/audio-controller.js
index e62383a8..e62383a8 100644
--- a/ext/bg/js/settings/audio-controller.js
+++ b/ext/js/settings/audio-controller.js
diff --git a/ext/bg/js/settings/backup-controller.js b/ext/js/settings/backup-controller.js
index 8837b927..8837b927 100644
--- a/ext/bg/js/settings/backup-controller.js
+++ b/ext/js/settings/backup-controller.js
diff --git a/ext/bg/js/settings/dictionary-controller.js b/ext/js/settings/dictionary-controller.js
index ea9f7503..ea9f7503 100644
--- a/ext/bg/js/settings/dictionary-controller.js
+++ b/ext/js/settings/dictionary-controller.js
diff --git a/ext/bg/js/settings/dictionary-import-controller.js b/ext/js/settings/dictionary-import-controller.js
index c4ad9e59..c4ad9e59 100644
--- a/ext/bg/js/settings/dictionary-import-controller.js
+++ b/ext/js/settings/dictionary-import-controller.js
diff --git a/ext/bg/js/settings2/extension-keyboard-shortcuts-controller.js b/ext/js/settings/extension-keyboard-shortcuts-controller.js
index 9c930703..9c930703 100644
--- a/ext/bg/js/settings2/extension-keyboard-shortcuts-controller.js
+++ b/ext/js/settings/extension-keyboard-shortcuts-controller.js
diff --git a/ext/bg/js/settings/generic-setting-controller.js b/ext/js/settings/generic-setting-controller.js
index 7d6fc2e6..7d6fc2e6 100644
--- a/ext/bg/js/settings/generic-setting-controller.js
+++ b/ext/js/settings/generic-setting-controller.js
diff --git a/ext/bg/js/settings/keyboard-mouse-input-field.js b/ext/js/settings/keyboard-mouse-input-field.js
index 09477519..09477519 100644
--- a/ext/bg/js/settings/keyboard-mouse-input-field.js
+++ b/ext/js/settings/keyboard-mouse-input-field.js
diff --git a/ext/bg/js/settings2/keyboard-shortcuts-controller.js b/ext/js/settings/keyboard-shortcuts-controller.js
index 0dcfa2ee..0dcfa2ee 100644
--- a/ext/bg/js/settings2/keyboard-shortcuts-controller.js
+++ b/ext/js/settings/keyboard-shortcuts-controller.js
diff --git a/ext/bg/js/settings/main.js b/ext/js/settings/main.js
index 9786d196..9786d196 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/js/settings/main.js
diff --git a/ext/bg/js/settings2/mecab-controller.js b/ext/js/settings/mecab-controller.js
index ff2a4a66..ff2a4a66 100644
--- a/ext/bg/js/settings2/mecab-controller.js
+++ b/ext/js/settings/mecab-controller.js
diff --git a/ext/bg/js/settings/modal-controller.js b/ext/js/settings/modal-controller.js
index fe4f911b..fe4f911b 100644
--- a/ext/bg/js/settings/modal-controller.js
+++ b/ext/js/settings/modal-controller.js
diff --git a/ext/bg/js/settings/modal-jquery.js b/ext/js/settings/modal-jquery.js
index 8c69ae6d..8c69ae6d 100644
--- a/ext/bg/js/settings/modal-jquery.js
+++ b/ext/js/settings/modal-jquery.js
diff --git a/ext/bg/js/settings/modal.js b/ext/js/settings/modal.js
index 2ef49540..2ef49540 100644
--- a/ext/bg/js/settings/modal.js
+++ b/ext/js/settings/modal.js
diff --git a/ext/bg/js/settings2/nested-popups-controller.js b/ext/js/settings/nested-popups-controller.js
index 1ebc7389..1ebc7389 100644
--- a/ext/bg/js/settings2/nested-popups-controller.js
+++ b/ext/js/settings/nested-popups-controller.js
diff --git a/ext/bg/js/settings/permissions-toggle-controller.js b/ext/js/settings/permissions-toggle-controller.js
index f80e7585..f80e7585 100644
--- a/ext/bg/js/settings/permissions-toggle-controller.js
+++ b/ext/js/settings/permissions-toggle-controller.js
diff --git a/ext/bg/js/settings/pitch-accents-preview-main.js b/ext/js/settings/pitch-accents-preview-main.js
index f292170a..f292170a 100644
--- a/ext/bg/js/settings/pitch-accents-preview-main.js
+++ b/ext/js/settings/pitch-accents-preview-main.js
diff --git a/ext/bg/js/settings/popup-preview-controller.js b/ext/js/settings/popup-preview-controller.js
index f98b0679..f98b0679 100644
--- a/ext/bg/js/settings/popup-preview-controller.js
+++ b/ext/js/settings/popup-preview-controller.js
diff --git a/ext/bg/js/settings/popup-preview-frame-main.js b/ext/js/settings/popup-preview-frame-main.js
index dcbc0d96..dcbc0d96 100644
--- a/ext/bg/js/settings/popup-preview-frame-main.js
+++ b/ext/js/settings/popup-preview-frame-main.js
diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/js/settings/popup-preview-frame.js
index 56100fb3..56100fb3 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/js/settings/popup-preview-frame.js
diff --git a/ext/bg/js/settings2/popup-window-controller.js b/ext/js/settings/popup-window-controller.js
index cc83db68..cc83db68 100644
--- a/ext/bg/js/settings2/popup-window-controller.js
+++ b/ext/js/settings/popup-window-controller.js
diff --git a/ext/bg/js/settings/profile-conditions-ui.js b/ext/js/settings/profile-conditions-ui.js
index 5fda1dc0..5fda1dc0 100644
--- a/ext/bg/js/settings/profile-conditions-ui.js
+++ b/ext/js/settings/profile-conditions-ui.js
diff --git a/ext/bg/js/settings/profile-controller.js b/ext/js/settings/profile-controller.js
index 914fc679..914fc679 100644
--- a/ext/bg/js/settings/profile-controller.js
+++ b/ext/js/settings/profile-controller.js
diff --git a/ext/bg/js/settings/scan-inputs-controller.js b/ext/js/settings/scan-inputs-controller.js
index eb179c6a..eb179c6a 100644
--- a/ext/bg/js/settings/scan-inputs-controller.js
+++ b/ext/js/settings/scan-inputs-controller.js
diff --git a/ext/bg/js/settings/scan-inputs-simple-controller.js b/ext/js/settings/scan-inputs-simple-controller.js
index 01f044c2..01f044c2 100644
--- a/ext/bg/js/settings/scan-inputs-simple-controller.js
+++ b/ext/js/settings/scan-inputs-simple-controller.js
diff --git a/ext/bg/js/settings2/secondary-search-dictionary-controller.js b/ext/js/settings/secondary-search-dictionary-controller.js
index 2fb3de67..2fb3de67 100644
--- a/ext/bg/js/settings2/secondary-search-dictionary-controller.js
+++ b/ext/js/settings/secondary-search-dictionary-controller.js
diff --git a/ext/bg/js/settings2/sentence-termination-characters-controller.js b/ext/js/settings/sentence-termination-characters-controller.js
index d62771ec..d62771ec 100644
--- a/ext/bg/js/settings2/sentence-termination-characters-controller.js
+++ b/ext/js/settings/sentence-termination-characters-controller.js
diff --git a/ext/bg/js/settings/settings-controller.js b/ext/js/settings/settings-controller.js
index 11a9435c..11a9435c 100644
--- a/ext/bg/js/settings/settings-controller.js
+++ b/ext/js/settings/settings-controller.js
diff --git a/ext/bg/js/settings2/settings-display-controller.js b/ext/js/settings/settings-display-controller.js
index 9d3e5459..9d3e5459 100644
--- a/ext/bg/js/settings2/settings-display-controller.js
+++ b/ext/js/settings/settings-display-controller.js
diff --git a/ext/bg/js/settings2/settings-main.js b/ext/js/settings/settings-main.js
index 24248110..24248110 100644
--- a/ext/bg/js/settings2/settings-main.js
+++ b/ext/js/settings/settings-main.js
diff --git a/ext/bg/js/settings/status-footer.js b/ext/js/settings/status-footer.js
index c03e6775..c03e6775 100644
--- a/ext/bg/js/settings/status-footer.js
+++ b/ext/js/settings/status-footer.js
diff --git a/ext/bg/js/settings/storage-controller.js b/ext/js/settings/storage-controller.js
index c27c8690..c27c8690 100644
--- a/ext/bg/js/settings/storage-controller.js
+++ b/ext/js/settings/storage-controller.js
diff --git a/ext/bg/js/settings2/translation-text-replacements-controller.js b/ext/js/settings/translation-text-replacements-controller.js
index 8d13f7e9..8d13f7e9 100644
--- a/ext/bg/js/settings2/translation-text-replacements-controller.js
+++ b/ext/js/settings/translation-text-replacements-controller.js
diff --git a/ext/permissions.html b/ext/permissions.html
index 06dcf5bf..67dc5f85 100644
--- a/ext/permissions.html
+++ b/ext/permissions.html
@@ -169,8 +169,8 @@
 <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="/bg/js/settings/permissions-toggle-controller.js"></script>
-<script src="/bg/js/settings/settings-controller.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>
 
diff --git a/ext/pitch-accents-preview.html b/ext/pitch-accents-preview.html
index 9653b9c5..38ee2363 100644
--- a/ext/pitch-accents-preview.html
+++ b/ext/pitch-accents-preview.html
@@ -57,7 +57,7 @@
 <script src="/js/display/display-generator.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
 
-<script src="/bg/js/settings/pitch-accents-preview-main.js"></script>
+<script src="/js/settings/pitch-accents-preview-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/popup-preview.html b/ext/popup-preview.html
index 6f6ff8b1..a331017d 100644
--- a/ext/popup-preview.html
+++ b/ext/popup-preview.html
@@ -54,9 +54,9 @@
 <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="/js/settings/popup-preview-frame.js"></script>
 
-<script src="/bg/js/settings/popup-preview-frame-main.js"></script>
+<script src="/js/settings/popup-preview-frame-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/settings-old.html b/ext/settings-old.html
index 26f7770b..d95c4ee4 100644
--- a/ext/settings-old.html
+++ b/ext/settings-old.html
@@ -1309,26 +1309,26 @@
         <script src="/bg/js/template-patcher.js"></script>
         <script src="/bg/js/template-renderer-proxy.js"></script>
 
-        <script src="/bg/js/settings/keyboard-mouse-input-field.js"></script>
-        <script src="/bg/js/settings/modal-jquery.js"></script>
-        <script src="/bg/js/settings/profile-conditions-ui.js"></script>
-
-        <script src="/bg/js/settings/anki-controller.js"></script>
-        <script src="/bg/js/settings/anki-templates-controller.js"></script>
-        <script src="/bg/js/settings/audio-controller.js"></script>
-        <script src="/bg/js/settings/backup-controller.js"></script>
-        <script src="/bg/js/settings/permissions-toggle-controller.js"></script>
-        <script src="/bg/js/settings/dictionary-controller.js"></script>
-        <script src="/bg/js/settings/dictionary-import-controller.js"></script>
-        <script src="/bg/js/settings/generic-setting-controller.js"></script>
-        <script src="/bg/js/settings/modal-controller.js"></script>
-        <script src="/bg/js/settings/popup-preview-controller.js"></script>
-        <script src="/bg/js/settings/profile-controller.js"></script>
-        <script src="/bg/js/settings/scan-inputs-controller.js"></script>
-        <script src="/bg/js/settings/scan-inputs-simple-controller.js"></script>
-        <script src="/bg/js/settings/settings-controller.js"></script>
-        <script src="/bg/js/settings/storage-controller.js"></script>
-
-        <script src="/bg/js/settings/main.js"></script>
+        <script src="/js/settings/keyboard-mouse-input-field.js"></script>
+        <script src="/js/settings/modal-jquery.js"></script>
+        <script src="/js/settings/profile-conditions-ui.js"></script>
+
+        <script src="/js/settings/anki-controller.js"></script>
+        <script src="/js/settings/anki-templates-controller.js"></script>
+        <script src="/js/settings/audio-controller.js"></script>
+        <script src="/js/settings/backup-controller.js"></script>
+        <script src="/js/settings/permissions-toggle-controller.js"></script>
+        <script src="/js/settings/dictionary-controller.js"></script>
+        <script src="/js/settings/dictionary-import-controller.js"></script>
+        <script src="/js/settings/generic-setting-controller.js"></script>
+        <script src="/js/settings/modal-controller.js"></script>
+        <script src="/js/settings/popup-preview-controller.js"></script>
+        <script src="/js/settings/profile-controller.js"></script>
+        <script src="/js/settings/scan-inputs-controller.js"></script>
+        <script src="/js/settings/scan-inputs-simple-controller.js"></script>
+        <script src="/js/settings/settings-controller.js"></script>
+        <script src="/js/settings/storage-controller.js"></script>
+
+        <script src="/js/settings/main.js"></script>
     </body>
 </html>
diff --git a/ext/settings.html b/ext/settings.html
index 8fb715c1..eece5157 100644
--- a/ext/settings.html
+++ b/ext/settings.html
@@ -3223,38 +3223,38 @@
 <script src="/bg/js/template-patcher.js"></script>
 <script src="/bg/js/template-renderer-proxy.js"></script>
 
-<script src="/bg/js/settings/keyboard-mouse-input-field.js"></script>
-<script src="/bg/js/settings/profile-conditions-ui.js"></script>
-
-<script src="/bg/js/settings/anki-controller.js"></script>
-<script src="/bg/js/settings/anki-templates-controller.js"></script>
-<script src="/bg/js/settings/audio-controller.js"></script>
-<script src="/bg/js/settings/backup-controller.js"></script>
-<script src="/bg/js/settings/permissions-toggle-controller.js"></script>
-<script src="/bg/js/settings/dictionary-controller.js"></script>
-<script src="/bg/js/settings/dictionary-import-controller.js"></script>
-<script src="/bg/js/settings/generic-setting-controller.js"></script>
-<script src="/bg/js/settings/modal.js"></script>
-<script src="/bg/js/settings/modal-controller.js"></script>
-<script src="/bg/js/settings/popup-preview-controller.js"></script>
-<script src="/bg/js/settings/profile-controller.js"></script>
-<script src="/bg/js/settings/scan-inputs-controller.js"></script>
-<script src="/bg/js/settings/scan-inputs-simple-controller.js"></script>
-<script src="/bg/js/settings/settings-controller.js"></script>
-<script src="/bg/js/settings/status-footer.js"></script>
-<script src="/bg/js/settings/storage-controller.js"></script>
-
-<script src="/bg/js/settings2/extension-keyboard-shortcuts-controller.js"></script>
-<script src="/bg/js/settings2/keyboard-shortcuts-controller.js"></script>
-<script src="/bg/js/settings2/mecab-controller.js"></script>
-<script src="/bg/js/settings2/nested-popups-controller.js"></script>
-<script src="/bg/js/settings2/popup-window-controller.js"></script>
-<script src="/bg/js/settings2/secondary-search-dictionary-controller.js"></script>
-<script src="/bg/js/settings2/sentence-termination-characters-controller.js"></script>
-<script src="/bg/js/settings2/settings-display-controller.js"></script>
-<script src="/bg/js/settings2/translation-text-replacements-controller.js"></script>
-
-<script src="/bg/js/settings2/settings-main.js"></script>
+<script src="/js/settings/keyboard-mouse-input-field.js"></script>
+<script src="/js/settings/profile-conditions-ui.js"></script>
+
+<script src="/js/settings/anki-controller.js"></script>
+<script src="/js/settings/anki-templates-controller.js"></script>
+<script src="/js/settings/audio-controller.js"></script>
+<script src="/js/settings/backup-controller.js"></script>
+<script src="/js/settings/permissions-toggle-controller.js"></script>
+<script src="/js/settings/dictionary-controller.js"></script>
+<script src="/js/settings/dictionary-import-controller.js"></script>
+<script src="/js/settings/generic-setting-controller.js"></script>
+<script src="/js/settings/modal.js"></script>
+<script src="/js/settings/modal-controller.js"></script>
+<script src="/js/settings/popup-preview-controller.js"></script>
+<script src="/js/settings/profile-controller.js"></script>
+<script src="/js/settings/scan-inputs-controller.js"></script>
+<script src="/js/settings/scan-inputs-simple-controller.js"></script>
+<script src="/js/settings/settings-controller.js"></script>
+<script src="/js/settings/status-footer.js"></script>
+<script src="/js/settings/storage-controller.js"></script>
+
+<script src="/js/settings/extension-keyboard-shortcuts-controller.js"></script>
+<script src="/js/settings/keyboard-shortcuts-controller.js"></script>
+<script src="/js/settings/mecab-controller.js"></script>
+<script src="/js/settings/nested-popups-controller.js"></script>
+<script src="/js/settings/popup-window-controller.js"></script>
+<script src="/js/settings/secondary-search-dictionary-controller.js"></script>
+<script src="/js/settings/sentence-termination-characters-controller.js"></script>
+<script src="/js/settings/settings-display-controller.js"></script>
+<script src="/js/settings/translation-text-replacements-controller.js"></script>
+
+<script src="/js/settings/settings-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/welcome.html b/ext/welcome.html
index 4c7657c8..98992aec 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -338,16 +338,16 @@
 <script src="/bg/js/media-utility.js"></script>
 <script src="/bg/js/permissions-util.js"></script>
 
-<script src="/bg/js/settings/dictionary-controller.js"></script>
-<script src="/bg/js/settings/dictionary-import-controller.js"></script>
-<script src="/bg/js/settings/generic-setting-controller.js"></script>
-<script src="/bg/js/settings/modal.js"></script>
-<script src="/bg/js/settings/modal-controller.js"></script>
-<script src="/bg/js/settings/scan-inputs-simple-controller.js"></script>
-<script src="/bg/js/settings/settings-controller.js"></script>
-<script src="/bg/js/settings/status-footer.js"></script>
+<script src="/js/settings/dictionary-controller.js"></script>
+<script src="/js/settings/dictionary-import-controller.js"></script>
+<script src="/js/settings/generic-setting-controller.js"></script>
+<script src="/js/settings/modal.js"></script>
+<script src="/js/settings/modal-controller.js"></script>
+<script src="/js/settings/scan-inputs-simple-controller.js"></script>
+<script src="/js/settings/settings-controller.js"></script>
+<script src="/js/settings/status-footer.js"></script>
 
-<script src="/bg/js/settings2/settings-display-controller.js"></script>
+<script src="/js/settings/settings-display-controller.js"></script>
 
 <script src="/bg/js/welcome-main.js"></script>