diff --git a/.eslintrc.json b/.eslintrc.json
index 8f8dc4e9..9571d853 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -140,7 +140,7 @@
             }
         },
         {
-            "files": ["ext/js/settings/modal-jquery.js"],
+            "files": ["ext/js/pages/settings/modal-jquery.js"],
             "env": {
                 "jquery": true
             }
diff --git a/ext/info.html b/ext/info.html
index 3000070a..5622ae4b 100644
--- a/ext/info.html
+++ b/ext/info.html
@@ -67,8 +67,8 @@
 <script src="/js/data/permissions-util.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/js/settings/backup-controller.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
+<script src="/js/pages/settings/backup-controller.js"></script>
+<script src="/js/pages/settings/settings-controller.js"></script>
 
 <script src="/js/pages/info-main.js"></script>
 
diff --git a/ext/js/settings/anki-controller.js b/ext/js/pages/settings/anki-controller.js
similarity index 100%
rename from ext/js/settings/anki-controller.js
rename to ext/js/pages/settings/anki-controller.js
diff --git a/ext/js/settings/anki-templates-controller.js b/ext/js/pages/settings/anki-templates-controller.js
similarity index 100%
rename from ext/js/settings/anki-templates-controller.js
rename to ext/js/pages/settings/anki-templates-controller.js
diff --git a/ext/js/settings/audio-controller.js b/ext/js/pages/settings/audio-controller.js
similarity index 100%
rename from ext/js/settings/audio-controller.js
rename to ext/js/pages/settings/audio-controller.js
diff --git a/ext/js/settings/backup-controller.js b/ext/js/pages/settings/backup-controller.js
similarity index 100%
rename from ext/js/settings/backup-controller.js
rename to ext/js/pages/settings/backup-controller.js
diff --git a/ext/js/settings/dictionary-controller.js b/ext/js/pages/settings/dictionary-controller.js
similarity index 100%
rename from ext/js/settings/dictionary-controller.js
rename to ext/js/pages/settings/dictionary-controller.js
diff --git a/ext/js/settings/dictionary-import-controller.js b/ext/js/pages/settings/dictionary-import-controller.js
similarity index 100%
rename from ext/js/settings/dictionary-import-controller.js
rename to ext/js/pages/settings/dictionary-import-controller.js
diff --git a/ext/js/settings/extension-keyboard-shortcuts-controller.js b/ext/js/pages/settings/extension-keyboard-shortcuts-controller.js
similarity index 100%
rename from ext/js/settings/extension-keyboard-shortcuts-controller.js
rename to ext/js/pages/settings/extension-keyboard-shortcuts-controller.js
diff --git a/ext/js/settings/generic-setting-controller.js b/ext/js/pages/settings/generic-setting-controller.js
similarity index 100%
rename from ext/js/settings/generic-setting-controller.js
rename to ext/js/pages/settings/generic-setting-controller.js
diff --git a/ext/js/settings/keyboard-mouse-input-field.js b/ext/js/pages/settings/keyboard-mouse-input-field.js
similarity index 100%
rename from ext/js/settings/keyboard-mouse-input-field.js
rename to ext/js/pages/settings/keyboard-mouse-input-field.js
diff --git a/ext/js/settings/keyboard-shortcuts-controller.js b/ext/js/pages/settings/keyboard-shortcuts-controller.js
similarity index 100%
rename from ext/js/settings/keyboard-shortcuts-controller.js
rename to ext/js/pages/settings/keyboard-shortcuts-controller.js
diff --git a/ext/js/settings/main.js b/ext/js/pages/settings/main.js
similarity index 100%
rename from ext/js/settings/main.js
rename to ext/js/pages/settings/main.js
diff --git a/ext/js/settings/mecab-controller.js b/ext/js/pages/settings/mecab-controller.js
similarity index 100%
rename from ext/js/settings/mecab-controller.js
rename to ext/js/pages/settings/mecab-controller.js
diff --git a/ext/js/settings/modal-controller.js b/ext/js/pages/settings/modal-controller.js
similarity index 100%
rename from ext/js/settings/modal-controller.js
rename to ext/js/pages/settings/modal-controller.js
diff --git a/ext/js/settings/modal-jquery.js b/ext/js/pages/settings/modal-jquery.js
similarity index 100%
rename from ext/js/settings/modal-jquery.js
rename to ext/js/pages/settings/modal-jquery.js
diff --git a/ext/js/settings/modal.js b/ext/js/pages/settings/modal.js
similarity index 100%
rename from ext/js/settings/modal.js
rename to ext/js/pages/settings/modal.js
diff --git a/ext/js/settings/nested-popups-controller.js b/ext/js/pages/settings/nested-popups-controller.js
similarity index 100%
rename from ext/js/settings/nested-popups-controller.js
rename to ext/js/pages/settings/nested-popups-controller.js
diff --git a/ext/js/settings/permissions-toggle-controller.js b/ext/js/pages/settings/permissions-toggle-controller.js
similarity index 100%
rename from ext/js/settings/permissions-toggle-controller.js
rename to ext/js/pages/settings/permissions-toggle-controller.js
diff --git a/ext/js/settings/pitch-accents-preview-main.js b/ext/js/pages/settings/pitch-accents-preview-main.js
similarity index 100%
rename from ext/js/settings/pitch-accents-preview-main.js
rename to ext/js/pages/settings/pitch-accents-preview-main.js
diff --git a/ext/js/settings/popup-preview-controller.js b/ext/js/pages/settings/popup-preview-controller.js
similarity index 100%
rename from ext/js/settings/popup-preview-controller.js
rename to ext/js/pages/settings/popup-preview-controller.js
diff --git a/ext/js/settings/popup-preview-frame-main.js b/ext/js/pages/settings/popup-preview-frame-main.js
similarity index 100%
rename from ext/js/settings/popup-preview-frame-main.js
rename to ext/js/pages/settings/popup-preview-frame-main.js
diff --git a/ext/js/settings/popup-preview-frame.js b/ext/js/pages/settings/popup-preview-frame.js
similarity index 100%
rename from ext/js/settings/popup-preview-frame.js
rename to ext/js/pages/settings/popup-preview-frame.js
diff --git a/ext/js/settings/popup-window-controller.js b/ext/js/pages/settings/popup-window-controller.js
similarity index 100%
rename from ext/js/settings/popup-window-controller.js
rename to ext/js/pages/settings/popup-window-controller.js
diff --git a/ext/js/settings/profile-conditions-ui.js b/ext/js/pages/settings/profile-conditions-ui.js
similarity index 100%
rename from ext/js/settings/profile-conditions-ui.js
rename to ext/js/pages/settings/profile-conditions-ui.js
diff --git a/ext/js/settings/profile-controller.js b/ext/js/pages/settings/profile-controller.js
similarity index 100%
rename from ext/js/settings/profile-controller.js
rename to ext/js/pages/settings/profile-controller.js
diff --git a/ext/js/settings/scan-inputs-controller.js b/ext/js/pages/settings/scan-inputs-controller.js
similarity index 100%
rename from ext/js/settings/scan-inputs-controller.js
rename to ext/js/pages/settings/scan-inputs-controller.js
diff --git a/ext/js/settings/scan-inputs-simple-controller.js b/ext/js/pages/settings/scan-inputs-simple-controller.js
similarity index 100%
rename from ext/js/settings/scan-inputs-simple-controller.js
rename to ext/js/pages/settings/scan-inputs-simple-controller.js
diff --git a/ext/js/settings/secondary-search-dictionary-controller.js b/ext/js/pages/settings/secondary-search-dictionary-controller.js
similarity index 100%
rename from ext/js/settings/secondary-search-dictionary-controller.js
rename to ext/js/pages/settings/secondary-search-dictionary-controller.js
diff --git a/ext/js/settings/sentence-termination-characters-controller.js b/ext/js/pages/settings/sentence-termination-characters-controller.js
similarity index 100%
rename from ext/js/settings/sentence-termination-characters-controller.js
rename to ext/js/pages/settings/sentence-termination-characters-controller.js
diff --git a/ext/js/settings/settings-controller.js b/ext/js/pages/settings/settings-controller.js
similarity index 100%
rename from ext/js/settings/settings-controller.js
rename to ext/js/pages/settings/settings-controller.js
diff --git a/ext/js/settings/settings-display-controller.js b/ext/js/pages/settings/settings-display-controller.js
similarity index 100%
rename from ext/js/settings/settings-display-controller.js
rename to ext/js/pages/settings/settings-display-controller.js
diff --git a/ext/js/settings/settings-main.js b/ext/js/pages/settings/settings-main.js
similarity index 100%
rename from ext/js/settings/settings-main.js
rename to ext/js/pages/settings/settings-main.js
diff --git a/ext/js/settings/status-footer.js b/ext/js/pages/settings/status-footer.js
similarity index 100%
rename from ext/js/settings/status-footer.js
rename to ext/js/pages/settings/status-footer.js
diff --git a/ext/js/settings/storage-controller.js b/ext/js/pages/settings/storage-controller.js
similarity index 100%
rename from ext/js/settings/storage-controller.js
rename to ext/js/pages/settings/storage-controller.js
diff --git a/ext/js/settings/translation-text-replacements-controller.js b/ext/js/pages/settings/translation-text-replacements-controller.js
similarity index 100%
rename from ext/js/settings/translation-text-replacements-controller.js
rename to ext/js/pages/settings/translation-text-replacements-controller.js
diff --git a/ext/permissions.html b/ext/permissions.html
index fc4d2f8d..38599689 100644
--- a/ext/permissions.html
+++ b/ext/permissions.html
@@ -170,8 +170,8 @@
 <script src="/js/data/permissions-util.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/js/settings/permissions-toggle-controller.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
+<script src="/js/pages/settings/permissions-toggle-controller.js"></script>
+<script src="/js/pages/settings/settings-controller.js"></script>
 
 <script src="/js/pages/permissions-main.js"></script>
 
diff --git a/ext/pitch-accents-preview.html b/ext/pitch-accents-preview.html
index a3c6f875..45e103f0 100644
--- a/ext/pitch-accents-preview.html
+++ b/ext/pitch-accents-preview.html
@@ -58,7 +58,7 @@
 <script src="/js/display/display-generator.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
 
-<script src="/js/settings/pitch-accents-preview-main.js"></script>
+<script src="/js/pages/settings/pitch-accents-preview-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/popup-preview.html b/ext/popup-preview.html
index 3ca46232..dbdc59f6 100644
--- a/ext/popup-preview.html
+++ b/ext/popup-preview.html
@@ -54,10 +54,10 @@
 <script src="/js/dom/text-source-range.js"></script>
 <script src="/js/input/hotkey-handler.js"></script>
 <script src="/js/language/text-scanner.js"></script>
+<script src="/js/pages/settings/popup-preview-frame.js"></script>
 <script src="/js/script/dynamic-loader.js"></script>
-<script src="/js/settings/popup-preview-frame.js"></script>
 
-<script src="/js/settings/popup-preview-frame-main.js"></script>
+<script src="/js/pages/settings/popup-preview-frame-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/settings-old.html b/ext/settings-old.html
index 4c35218f..6cc74f2c 100644
--- a/ext/settings-old.html
+++ b/ext/settings-old.html
@@ -1307,27 +1307,27 @@
         <script src="/js/media/audio-system.js"></script>
         <script src="/js/media/media-util.js"></script>
         <script src="/js/media/text-to-speech-audio.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/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/keyboard-mouse-input-field.js"></script>
-        <script src="/js/settings/modal-controller.js"></script>
-        <script src="/js/settings/modal-jquery.js"></script>
-        <script src="/js/settings/permissions-toggle-controller.js"></script>
-        <script src="/js/settings/popup-preview-controller.js"></script>
-        <script src="/js/settings/profile-conditions-ui.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/pages/settings/anki-controller.js"></script>
+        <script src="/js/pages/settings/anki-templates-controller.js"></script>
+        <script src="/js/pages/settings/audio-controller.js"></script>
+        <script src="/js/pages/settings/backup-controller.js"></script>
+        <script src="/js/pages/settings/dictionary-controller.js"></script>
+        <script src="/js/pages/settings/dictionary-import-controller.js"></script>
+        <script src="/js/pages/settings/generic-setting-controller.js"></script>
+        <script src="/js/pages/settings/keyboard-mouse-input-field.js"></script>
+        <script src="/js/pages/settings/modal-controller.js"></script>
+        <script src="/js/pages/settings/modal-jquery.js"></script>
+        <script src="/js/pages/settings/permissions-toggle-controller.js"></script>
+        <script src="/js/pages/settings/popup-preview-controller.js"></script>
+        <script src="/js/pages/settings/profile-conditions-ui.js"></script>
+        <script src="/js/pages/settings/profile-controller.js"></script>
+        <script src="/js/pages/settings/scan-inputs-controller.js"></script>
+        <script src="/js/pages/settings/scan-inputs-simple-controller.js"></script>
+        <script src="/js/pages/settings/settings-controller.js"></script>
+        <script src="/js/pages/settings/storage-controller.js"></script>
         <script src="/js/templates/template-patcher.js"></script>
         <script src="/js/templates/template-renderer-proxy.js"></script>
 
-        <script src="/js/settings/main.js"></script>
+        <script src="/js/pages/settings/main.js"></script>
     </body>
 </html>
diff --git a/ext/settings.html b/ext/settings.html
index 1b7fa02d..2627f326 100644
--- a/ext/settings.html
+++ b/ext/settings.html
@@ -3220,38 +3220,38 @@
 <script src="/js/media/audio-system.js"></script>
 <script src="/js/media/media-util.js"></script>
 <script src="/js/media/text-to-speech-audio.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/dictionary-controller.js"></script>
-<script src="/js/settings/dictionary-import-controller.js"></script>
-<script src="/js/settings/extension-keyboard-shortcuts-controller.js"></script>
-<script src="/js/settings/generic-setting-controller.js"></script>
-<script src="/js/settings/keyboard-mouse-input-field.js"></script>
-<script src="/js/settings/keyboard-shortcuts-controller.js"></script>
-<script src="/js/settings/mecab-controller.js"></script>
-<script src="/js/settings/modal.js"></script>
-<script src="/js/settings/modal-controller.js"></script>
-<script src="/js/settings/nested-popups-controller.js"></script>
-<script src="/js/settings/permissions-toggle-controller.js"></script>
-<script src="/js/settings/popup-preview-controller.js"></script>
-<script src="/js/settings/popup-window-controller.js"></script>
-<script src="/js/settings/profile-conditions-ui.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/secondary-search-dictionary-controller.js"></script>
-<script src="/js/settings/sentence-termination-characters-controller.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
-<script src="/js/settings/settings-display-controller.js"></script>
-<script src="/js/settings/status-footer.js"></script>
-<script src="/js/settings/storage-controller.js"></script>
-<script src="/js/settings/translation-text-replacements-controller.js"></script>
+<script src="/js/pages/settings/anki-controller.js"></script>
+<script src="/js/pages/settings/anki-templates-controller.js"></script>
+<script src="/js/pages/settings/audio-controller.js"></script>
+<script src="/js/pages/settings/backup-controller.js"></script>
+<script src="/js/pages/settings/dictionary-controller.js"></script>
+<script src="/js/pages/settings/dictionary-import-controller.js"></script>
+<script src="/js/pages/settings/extension-keyboard-shortcuts-controller.js"></script>
+<script src="/js/pages/settings/generic-setting-controller.js"></script>
+<script src="/js/pages/settings/keyboard-mouse-input-field.js"></script>
+<script src="/js/pages/settings/keyboard-shortcuts-controller.js"></script>
+<script src="/js/pages/settings/mecab-controller.js"></script>
+<script src="/js/pages/settings/modal.js"></script>
+<script src="/js/pages/settings/modal-controller.js"></script>
+<script src="/js/pages/settings/nested-popups-controller.js"></script>
+<script src="/js/pages/settings/permissions-toggle-controller.js"></script>
+<script src="/js/pages/settings/popup-preview-controller.js"></script>
+<script src="/js/pages/settings/popup-window-controller.js"></script>
+<script src="/js/pages/settings/profile-conditions-ui.js"></script>
+<script src="/js/pages/settings/profile-controller.js"></script>
+<script src="/js/pages/settings/scan-inputs-controller.js"></script>
+<script src="/js/pages/settings/scan-inputs-simple-controller.js"></script>
+<script src="/js/pages/settings/secondary-search-dictionary-controller.js"></script>
+<script src="/js/pages/settings/sentence-termination-characters-controller.js"></script>
+<script src="/js/pages/settings/settings-controller.js"></script>
+<script src="/js/pages/settings/settings-display-controller.js"></script>
+<script src="/js/pages/settings/status-footer.js"></script>
+<script src="/js/pages/settings/storage-controller.js"></script>
+<script src="/js/pages/settings/translation-text-replacements-controller.js"></script>
 <script src="/js/templates/template-patcher.js"></script>
 <script src="/js/templates/template-renderer-proxy.js"></script>
 
-<script src="/js/settings/settings-main.js"></script>
+<script src="/js/pages/settings/settings-main.js"></script>
 
 </body>
 </html>
diff --git a/ext/welcome.html b/ext/welcome.html
index 88eb5683..30028fd1 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -337,15 +337,15 @@
 <script src="/js/language/dictionary-database.js"></script>
 <script src="/js/language/dictionary-importer.js"></script>
 <script src="/js/media/media-util.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/settings-display-controller.js"></script>
-<script src="/js/settings/status-footer.js"></script>
+<script src="/js/pages/settings/dictionary-controller.js"></script>
+<script src="/js/pages/settings/dictionary-import-controller.js"></script>
+<script src="/js/pages/settings/generic-setting-controller.js"></script>
+<script src="/js/pages/settings/modal.js"></script>
+<script src="/js/pages/settings/modal-controller.js"></script>
+<script src="/js/pages/settings/scan-inputs-simple-controller.js"></script>
+<script src="/js/pages/settings/settings-controller.js"></script>
+<script src="/js/pages/settings/settings-display-controller.js"></script>
+<script src="/js/pages/settings/status-footer.js"></script>
 
 <script src="/js/pages/welcome-main.js"></script>