diff --git a/package.json b/package.json
index 1e7ebfd0cd..a65b93cad7 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
         "test": [
           "src/components/autoFocuser.js",
           "src/components/cardbuilder/cardBuilder.js",
-          "src/components/filedownloader.js",
+          "src/scripts/fileDownloader.js",
           "src/components/images/imageLoader.js",
           "src/components/lazyloader/lazyloader-intersectionobserver.js",
           "src/components/playback/mediasession.js",
@@ -102,11 +102,11 @@
           "src/scripts/filesystem.js",
           "src/scripts/imagehelper.js",
           "src/scripts/inputManager.js",
-          "src/components/deletehelper.js",
+          "src/scripts/deleteHelper.js",
           "src/components/actionsheet/actionsheet.js",
           "src/components/playmenu.js",
           "src/components/indicators/indicators.js",
-          "src/scripts/keyboardnavigation.js",
+          "src/scripts/keyboardNavigation.js",
           "src/scripts/settings/appSettings.js",
           "src/scripts/settings/userSettings.js",
           "src/scripts/settings/webSettings.js"
diff --git a/src/components/sessionplayer.js b/src/components/sessionPlayer.js
similarity index 100%
rename from src/components/sessionplayer.js
rename to src/components/sessionPlayer.js
diff --git a/src/scripts/autobackdrops.js b/src/scripts/autoBackdrops.js
similarity index 100%
rename from src/scripts/autobackdrops.js
rename to src/scripts/autoBackdrops.js
diff --git a/src/scripts/browserdeviceprofile.js b/src/scripts/browserDeviceProfile.js
similarity index 100%
rename from src/scripts/browserdeviceprofile.js
rename to src/scripts/browserDeviceProfile.js
diff --git a/src/components/deletehelper.js b/src/scripts/deleteHelper.js
similarity index 100%
rename from src/components/deletehelper.js
rename to src/scripts/deleteHelper.js
diff --git a/src/components/filedownloader.js b/src/scripts/fileDownloader.js
similarity index 100%
rename from src/components/filedownloader.js
rename to src/scripts/fileDownloader.js
diff --git a/src/scripts/keyboardnavigation.js b/src/scripts/keyboardNavigation.js
similarity index 100%
rename from src/scripts/keyboardnavigation.js
rename to src/scripts/keyboardNavigation.js
diff --git a/src/scripts/librarybrowser.js b/src/scripts/libraryBrowser.js
similarity index 100%
rename from src/scripts/librarybrowser.js
rename to src/scripts/libraryBrowser.js
diff --git a/src/scripts/librarymenu.js b/src/scripts/libraryMenu.js
similarity index 100%
rename from src/scripts/librarymenu.js
rename to src/scripts/libraryMenu.js
diff --git a/src/components/multidownload.js b/src/scripts/multiDownload.js
similarity index 100%
rename from src/components/multidownload.js
rename to src/scripts/multiDownload.js
diff --git a/src/components/scrollhelper.js b/src/scripts/scrollHelper.js
similarity index 100%
rename from src/components/scrollhelper.js
rename to src/scripts/scrollHelper.js
diff --git a/src/components/serverNotifications.js b/src/scripts/serverNotifications.js
similarity index 100%
rename from src/components/serverNotifications.js
rename to src/scripts/serverNotifications.js
diff --git a/src/components/shell.js b/src/scripts/shell.js
similarity index 100%
rename from src/components/shell.js
rename to src/scripts/shell.js
diff --git a/src/scripts/site.js b/src/scripts/site.js
index c00169d224..4fd9e91f80 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -376,7 +376,7 @@ var AppInfo = {};
         define('filesystem', [scriptsPath + '/filesystem'], returnFirstDependency);
 
         define('lazyLoader', [componentsPath + '/lazyloader/lazyloader-intersectionobserver'], returnFirstDependency);
-        define('shell', [componentsPath + '/shell'], returnFirstDependency);
+        define('shell', [scriptsPath + '/shell'], returnFirstDependency);
 
         if ('registerElement' in document) {
             define('registerElement', []);
@@ -397,8 +397,8 @@ var AppInfo = {};
         define('prompt', [componentsPath + '/prompt/prompt'], returnFirstDependency);
 
         define('loading', [componentsPath + '/loading/loading'], returnFirstDependency);
-        define('multi-download', [componentsPath + '/multidownload'], returnFirstDependency);
-        define('fileDownloader', [componentsPath + '/filedownloader'], returnFirstDependency);
+        define('multi-download', [scriptsPath + '/multiDownload'], returnFirstDependency);
+        define('fileDownloader', [scriptsPath + '/fileDownloader'], returnFirstDependency);
 
         define('castSenderApiLoader', [componentsPath + '/castSenderApi'], returnFirstDependency);
     }
@@ -490,7 +490,7 @@ var AppInfo = {};
         ];
 
         if (appHost.supports('remotecontrol')) {
-            list.push('components/sessionplayer');
+            list.push('components/sessionPlayer');
 
             if (browser.chrome || browser.opera) {
                 list.push('components/chromecast/chromecastplayer');
@@ -532,13 +532,13 @@ var AppInfo = {};
 
             window.Emby.Page = appRouter;
 
-            require(['emby-button', 'scripts/themeloader', 'libraryMenu', 'scripts/routes'], function () {
+            require(['emby-button', 'scripts/themeLoader', 'libraryMenu', 'scripts/routes'], function () {
                 Emby.Page.start({
                     click: false,
                     hashbang: true
                 });
 
-                require(['components/thememediaplayer', 'scripts/autobackdrops']);
+                require(['components/thememediaplayer', 'scripts/autoBackdrops']);
 
                 if (!browser.tv && !browser.xboxOne && !browser.ps4) {
                     require(['components/nowplayingbar/nowplayingbar']);
@@ -630,14 +630,14 @@ var AppInfo = {};
         var scriptsPath = getScriptsPath();
 
         var paths = {
-            browserdeviceprofile: 'scripts/browserdeviceprofile',
+            browserdeviceprofile: 'scripts/browserDeviceProfile',
             browser: 'scripts/browser',
-            libraryBrowser: 'scripts/librarybrowser',
+            libraryBrowser: 'scripts/libraryBrowser',
             inputManager: 'scripts/inputManager',
             datetime: 'scripts/datetime',
             globalize: 'scripts/globalize',
             dfnshelper: 'scripts/dfnshelper',
-            libraryMenu: 'scripts/librarymenu',
+            libraryMenu: 'scripts/libraryMenu',
             playlisteditor: componentsPath + '/playlisteditor/playlisteditor',
             medialibrarycreator: componentsPath + '/medialibrarycreator/medialibrarycreator',
             medialibraryeditor: componentsPath + '/medialibraryeditor/medialibraryeditor',
@@ -826,7 +826,7 @@ var AppInfo = {};
         define('cardBuilder', [componentsPath + '/cardbuilder/cardBuilder'], returnFirstDependency);
         define('peoplecardbuilder', [componentsPath + '/cardbuilder/peoplecardbuilder'], returnFirstDependency);
         define('chaptercardbuilder', [componentsPath + '/cardbuilder/chaptercardbuilder'], returnFirstDependency);
-        define('deleteHelper', [componentsPath + '/deletehelper'], returnFirstDependency);
+        define('deleteHelper', [componentsPath + '/deleteHelper'], returnFirstDependency);
         define('tvguide', [componentsPath + '/guide/guide'], returnFirstDependency);
         define('guide-settings-dialog', [componentsPath + '/guide/guide-settings'], returnFirstDependency);
         define('loadingDialog', [componentsPath + '/loadingdialog/loadingdialog'], returnFirstDependency);
@@ -843,18 +843,17 @@ var AppInfo = {};
         define('viewSettings', [componentsPath + '/viewsettings/viewsettings'], returnFirstDependency);
         define('filterMenu', [componentsPath + '/filtermenu/filtermenu'], returnFirstDependency);
         define('sortMenu', [componentsPath + '/sortmenu/sortmenu'], returnFirstDependency);
-        define('idb', [componentsPath + '/idb'], returnFirstDependency);
         define('sanitizefilename', [componentsPath + '/sanitizefilename'], returnFirstDependency);
         define('toast', [componentsPath + '/toast/toast'], returnFirstDependency);
-        define('scrollHelper', [componentsPath + '/scrollhelper'], returnFirstDependency);
-        define('touchHelper', [componentsPath + '/touchhelper'], returnFirstDependency);
+        define('scrollHelper', [componentsPath + '/scrollHelper'], returnFirstDependency);
+        define('touchHelper', [scriptsPath + '/touchHelper'], returnFirstDependency);
         define('imageUploader', [componentsPath + '/imageuploader/imageuploader'], returnFirstDependency);
         define('htmlMediaHelper', [componentsPath + '/htmlMediaHelper'], returnFirstDependency);
         define('viewContainer', [componentsPath + '/viewContainer'], returnFirstDependency);
         define('dialogHelper', [componentsPath + '/dialogHelper/dialogHelper'], returnFirstDependency);
-        define('serverNotifications', [componentsPath + '/serverNotifications'], returnFirstDependency);
+        define('serverNotifications', [scriptsPath + '/serverNotifications'], returnFirstDependency);
         define('skinManager', [componentsPath + '/skinManager'], returnFirstDependency);
-        define('keyboardnavigation', [scriptsPath + '/keyboardnavigation'], returnFirstDependency);
+        define('keyboardnavigation', [scriptsPath + '/keyboardNavigation'], returnFirstDependency);
         define('mouseManager', [scriptsPath + '/mouseManager'], returnFirstDependency);
         define('scrollManager', [componentsPath + '/scrollManager'], returnFirstDependency);
         define('autoFocuser', [componentsPath + '/autoFocuser'], returnFirstDependency);
diff --git a/src/scripts/themeloader.js b/src/scripts/themeLoader.js
similarity index 100%
rename from src/scripts/themeloader.js
rename to src/scripts/themeLoader.js
diff --git a/src/components/touchhelper.js b/src/scripts/touchHelper.js
similarity index 100%
rename from src/components/touchhelper.js
rename to src/scripts/touchHelper.js