From 43d1457ebfe23196348649c245dfb942a0f00a1a Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 13 Feb 2021 23:20:22 -0500
Subject: [PATCH] Move bg/js/settings(2) (#1385)

* Move bg/js/settings/ to js/settings/

* Move bg/js/settings2/ to js/settings/
---
 .eslintrc.json                                |  2 +-
 ext/info.html                                 |  4 +-
 ext/{bg => }/js/settings/anki-controller.js   |  0
 .../js/settings/anki-templates-controller.js  |  0
 ext/{bg => }/js/settings/audio-controller.js  |  0
 ext/{bg => }/js/settings/backup-controller.js |  0
 .../js/settings/dictionary-controller.js      |  0
 .../settings/dictionary-import-controller.js  |  0
 ...extension-keyboard-shortcuts-controller.js |  0
 .../js/settings/generic-setting-controller.js |  0
 .../js/settings/keyboard-mouse-input-field.js |  0
 .../keyboard-shortcuts-controller.js          |  0
 ext/{bg => }/js/settings/main.js              |  0
 .../settings}/mecab-controller.js             |  0
 ext/{bg => }/js/settings/modal-controller.js  |  0
 ext/{bg => }/js/settings/modal-jquery.js      |  0
 ext/{bg => }/js/settings/modal.js             |  0
 .../settings}/nested-popups-controller.js     |  0
 .../settings/permissions-toggle-controller.js |  0
 .../js/settings/pitch-accents-preview-main.js |  0
 .../js/settings/popup-preview-controller.js   |  0
 .../js/settings/popup-preview-frame-main.js   |  0
 .../js/settings/popup-preview-frame.js        |  0
 .../settings}/popup-window-controller.js      |  0
 .../js/settings/profile-conditions-ui.js      |  0
 .../js/settings/profile-controller.js         |  0
 .../js/settings/scan-inputs-controller.js     |  0
 .../settings/scan-inputs-simple-controller.js |  0
 .../secondary-search-dictionary-controller.js |  0
 ...tence-termination-characters-controller.js |  0
 .../js/settings/settings-controller.js        |  0
 .../settings}/settings-display-controller.js  |  0
 .../settings}/settings-main.js                |  0
 ext/{bg => }/js/settings/status-footer.js     |  0
 .../js/settings/storage-controller.js         |  0
 ...ranslation-text-replacements-controller.js |  0
 ext/permissions.html                          |  4 +-
 ext/pitch-accents-preview.html                |  2 +-
 ext/popup-preview.html                        |  4 +-
 ext/settings-old.html                         | 38 ++++++------
 ext/settings.html                             | 58 +++++++++----------
 ext/welcome.html                              | 18 +++---
 42 files changed, 65 insertions(+), 65 deletions(-)
 rename ext/{bg => }/js/settings/anki-controller.js (100%)
 rename ext/{bg => }/js/settings/anki-templates-controller.js (100%)
 rename ext/{bg => }/js/settings/audio-controller.js (100%)
 rename ext/{bg => }/js/settings/backup-controller.js (100%)
 rename ext/{bg => }/js/settings/dictionary-controller.js (100%)
 rename ext/{bg => }/js/settings/dictionary-import-controller.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/extension-keyboard-shortcuts-controller.js (100%)
 rename ext/{bg => }/js/settings/generic-setting-controller.js (100%)
 rename ext/{bg => }/js/settings/keyboard-mouse-input-field.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/keyboard-shortcuts-controller.js (100%)
 rename ext/{bg => }/js/settings/main.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/mecab-controller.js (100%)
 rename ext/{bg => }/js/settings/modal-controller.js (100%)
 rename ext/{bg => }/js/settings/modal-jquery.js (100%)
 rename ext/{bg => }/js/settings/modal.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/nested-popups-controller.js (100%)
 rename ext/{bg => }/js/settings/permissions-toggle-controller.js (100%)
 rename ext/{bg => }/js/settings/pitch-accents-preview-main.js (100%)
 rename ext/{bg => }/js/settings/popup-preview-controller.js (100%)
 rename ext/{bg => }/js/settings/popup-preview-frame-main.js (100%)
 rename ext/{bg => }/js/settings/popup-preview-frame.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/popup-window-controller.js (100%)
 rename ext/{bg => }/js/settings/profile-conditions-ui.js (100%)
 rename ext/{bg => }/js/settings/profile-controller.js (100%)
 rename ext/{bg => }/js/settings/scan-inputs-controller.js (100%)
 rename ext/{bg => }/js/settings/scan-inputs-simple-controller.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/secondary-search-dictionary-controller.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/sentence-termination-characters-controller.js (100%)
 rename ext/{bg => }/js/settings/settings-controller.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/settings-display-controller.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/settings-main.js (100%)
 rename ext/{bg => }/js/settings/status-footer.js (100%)
 rename ext/{bg => }/js/settings/storage-controller.js (100%)
 rename ext/{bg/js/settings2 => js/settings}/translation-text-replacements-controller.js (100%)

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
similarity index 100%
rename from ext/bg/js/settings/anki-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/anki-templates-controller.js
rename to ext/js/settings/anki-templates-controller.js
diff --git a/ext/bg/js/settings/audio-controller.js b/ext/js/settings/audio-controller.js
similarity index 100%
rename from ext/bg/js/settings/audio-controller.js
rename to ext/js/settings/audio-controller.js
diff --git a/ext/bg/js/settings/backup-controller.js b/ext/js/settings/backup-controller.js
similarity index 100%
rename from ext/bg/js/settings/backup-controller.js
rename to ext/js/settings/backup-controller.js
diff --git a/ext/bg/js/settings/dictionary-controller.js b/ext/js/settings/dictionary-controller.js
similarity index 100%
rename from ext/bg/js/settings/dictionary-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/dictionary-import-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings2/extension-keyboard-shortcuts-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/generic-setting-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/keyboard-mouse-input-field.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings2/keyboard-shortcuts-controller.js
rename to ext/js/settings/keyboard-shortcuts-controller.js
diff --git a/ext/bg/js/settings/main.js b/ext/js/settings/main.js
similarity index 100%
rename from ext/bg/js/settings/main.js
rename to ext/js/settings/main.js
diff --git a/ext/bg/js/settings2/mecab-controller.js b/ext/js/settings/mecab-controller.js
similarity index 100%
rename from ext/bg/js/settings2/mecab-controller.js
rename to ext/js/settings/mecab-controller.js
diff --git a/ext/bg/js/settings/modal-controller.js b/ext/js/settings/modal-controller.js
similarity index 100%
rename from ext/bg/js/settings/modal-controller.js
rename to ext/js/settings/modal-controller.js
diff --git a/ext/bg/js/settings/modal-jquery.js b/ext/js/settings/modal-jquery.js
similarity index 100%
rename from ext/bg/js/settings/modal-jquery.js
rename to ext/js/settings/modal-jquery.js
diff --git a/ext/bg/js/settings/modal.js b/ext/js/settings/modal.js
similarity index 100%
rename from ext/bg/js/settings/modal.js
rename to ext/js/settings/modal.js
diff --git a/ext/bg/js/settings2/nested-popups-controller.js b/ext/js/settings/nested-popups-controller.js
similarity index 100%
rename from ext/bg/js/settings2/nested-popups-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/permissions-toggle-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/pitch-accents-preview-main.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/popup-preview-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/popup-preview-frame-main.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/popup-preview-frame.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings2/popup-window-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/profile-conditions-ui.js
rename to ext/js/settings/profile-conditions-ui.js
diff --git a/ext/bg/js/settings/profile-controller.js b/ext/js/settings/profile-controller.js
similarity index 100%
rename from ext/bg/js/settings/profile-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/scan-inputs-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/scan-inputs-simple-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings2/secondary-search-dictionary-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings2/sentence-termination-characters-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings/settings-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings2/settings-display-controller.js
rename to ext/js/settings/settings-display-controller.js
diff --git a/ext/bg/js/settings2/settings-main.js b/ext/js/settings/settings-main.js
similarity index 100%
rename from ext/bg/js/settings2/settings-main.js
rename to ext/js/settings/settings-main.js
diff --git a/ext/bg/js/settings/status-footer.js b/ext/js/settings/status-footer.js
similarity index 100%
rename from ext/bg/js/settings/status-footer.js
rename to ext/js/settings/status-footer.js
diff --git a/ext/bg/js/settings/storage-controller.js b/ext/js/settings/storage-controller.js
similarity index 100%
rename from ext/bg/js/settings/storage-controller.js
rename to 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
similarity index 100%
rename from ext/bg/js/settings2/translation-text-replacements-controller.js
rename to 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="/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="/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="/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="/bg/js/settings/main.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="/js/settings/keyboard-mouse-input-field.js"></script>
+<script src="/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="/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="/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="/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="/bg/js/settings2/settings-main.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>