diff --git a/ext/bg/js/settings-dictionaries.js b/ext/bg/js/settings/dictionaries.js
similarity index 100%
rename from ext/bg/js/settings-dictionaries.js
rename to ext/bg/js/settings/dictionaries.js
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings/main.js
similarity index 100%
rename from ext/bg/js/settings.js
rename to ext/bg/js/settings/main.js
diff --git a/ext/bg/js/settings-popup-preview.js b/ext/bg/js/settings/popup-preview-frame.js
similarity index 100%
rename from ext/bg/js/settings-popup-preview.js
rename to ext/bg/js/settings/popup-preview-frame.js
diff --git a/ext/bg/js/settings-profiles.js b/ext/bg/js/settings/profiles.js
similarity index 100%
rename from ext/bg/js/settings-profiles.js
rename to ext/bg/js/settings/profiles.js
diff --git a/ext/bg/settings-popup-preview.html b/ext/bg/settings-popup-preview.html
index 9ca59e44..339467d4 100644
--- a/ext/bg/settings-popup-preview.html
+++ b/ext/bg/settings-popup-preview.html
@@ -128,6 +128,6 @@
         <script src="/fg/js/util.js"></script>
         <script src="/fg/js/popup-proxy-host.js"></script>
         <script src="/fg/js/frontend.js"></script>
-        <script src="/bg/js/settings-popup-preview.js"></script>
+        <script src="/bg/js/settings/popup-preview-frame.js"></script>
     </body>
 </html>
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 9edb48e5..8ce647b1 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -882,8 +882,9 @@
         <script src="/bg/js/util.js"></script>
         <script src="/mixed/js/audio.js"></script>
 
-        <script src="/bg/js/settings-dictionaries.js"></script>
-        <script src="/bg/js/settings-profiles.js"></script>
-        <script src="/bg/js/settings.js"></script>
+        <script src="/bg/js/settings/dictionaries.js"></script>
+        <script src="/bg/js/settings/profiles.js"></script>
+
+        <script src="/bg/js/settings/main.js"></script>
     </body>
 </html>