diff --git a/package.json b/package.json
index 1b6f785272..785878d20b 100644
--- a/package.json
+++ b/package.json
@@ -89,31 +89,31 @@
     "overrides": [
       {
         "test": [
+          "src/components/actionSheet/actionSheet.js",
           "src/components/autoFocuser.js",
           "src/components/cardbuilder/cardBuilder.js",
-          "src/scripts/fileDownloader.js",
           "src/components/images/imageLoader.js",
+          "src/components/indicators/indicators.js",
           "src/components/lazyLoader/lazyLoaderIntersectionObserver.js",
           "src/components/playback/mediasession.js",
           "src/components/playback/remotecontrolautoplay.js",
+          "src/components/playmenu.js",
           "src/components/sanatizefilename.js",
           "src/components/scrollManager.js",
-          "src/components/bookPlayer/plugin.js",
-          "src/components/bookPlayer/tableOfContent.js",
-          "src/components/syncplay/playbackPermissionManager.js",
           "src/components/syncplay/groupSelectionMenu.js",
-          "src/components/syncplay/timeSyncManager.js",
+          "src/components/syncplay/playbackPermissionManager.js",
           "src/components/syncplay/syncPlayManager.js",
+          "src/components/syncplay/timeSyncManager.js",
+          "src/plugins/bookPlayer/plugin.js",
+          "src/plugins/bookPlayer/tableOfContent.js",
+          "src/plugins/photoPlayer/plugin.js",
+          "src/scripts/deleteHelper.js",
           "src/scripts/dfnshelper.js",
           "src/scripts/dom.js",
+          "src/scripts/fileDownloader.js",
           "src/scripts/filesystem.js",
           "src/scripts/imagehelper.js",
           "src/scripts/inputManager.js",
-          "src/scripts/deleteHelper.js",
-          "src/components/actionSheet/actionSheet.js",
-          "src/components/playmenu.js",
-          "src/components/indicators/indicators.js",
-          "src/components/photoPlayer/plugin.js",
           "src/scripts/keyboardNavigation.js",
           "src/scripts/settings/appSettings.js",
           "src/scripts/settings/userSettings.js",
diff --git a/src/components/backdropScreensaver/plugin.js b/src/plugins/backdropScreensaver/plugin.js
similarity index 100%
rename from src/components/backdropScreensaver/plugin.js
rename to src/plugins/backdropScreensaver/plugin.js
diff --git a/src/components/bookPlayer/plugin.js b/src/plugins/bookPlayer/plugin.js
similarity index 100%
rename from src/components/bookPlayer/plugin.js
rename to src/plugins/bookPlayer/plugin.js
diff --git a/src/components/bookPlayer/style.css b/src/plugins/bookPlayer/style.css
similarity index 100%
rename from src/components/bookPlayer/style.css
rename to src/plugins/bookPlayer/style.css
diff --git a/src/components/bookPlayer/tableOfContent.js b/src/plugins/bookPlayer/tableOfContent.js
similarity index 100%
rename from src/components/bookPlayer/tableOfContent.js
rename to src/plugins/bookPlayer/tableOfContent.js
diff --git a/src/components/chromecast/chromecasthelpers.js b/src/plugins/chromecastPlayer/chromecastHelpers.js
similarity index 100%
rename from src/components/chromecast/chromecasthelpers.js
rename to src/plugins/chromecastPlayer/chromecastHelpers.js
diff --git a/src/components/chromecast/chromecastplayer.js b/src/plugins/chromecastPlayer/plugin.js
similarity index 100%
rename from src/components/chromecast/chromecastplayer.js
rename to src/plugins/chromecastPlayer/plugin.js
diff --git a/src/components/playback/experimentalwarnings.js b/src/plugins/experimentalWarnings/plugin.js
similarity index 100%
rename from src/components/playback/experimentalwarnings.js
rename to src/plugins/experimentalWarnings/plugin.js
diff --git a/src/components/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
similarity index 100%
rename from src/components/htmlAudioPlayer/plugin.js
rename to src/plugins/htmlAudioPlayer/plugin.js
diff --git a/src/components/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
similarity index 100%
rename from src/components/htmlVideoPlayer/plugin.js
rename to src/plugins/htmlVideoPlayer/plugin.js
diff --git a/src/components/htmlVideoPlayer/style.css b/src/plugins/htmlVideoPlayer/style.css
similarity index 100%
rename from src/components/htmlVideoPlayer/style.css
rename to src/plugins/htmlVideoPlayer/style.css
diff --git a/src/components/logoScreensaver/plugin.js b/src/plugins/logoScreensaver/plugin.js
similarity index 100%
rename from src/components/logoScreensaver/plugin.js
rename to src/plugins/logoScreensaver/plugin.js
diff --git a/src/components/logoScreensaver/style.css b/src/plugins/logoScreensaver/style.css
similarity index 100%
rename from src/components/logoScreensaver/style.css
rename to src/plugins/logoScreensaver/style.css
diff --git a/src/components/photoPlayer/plugin.js b/src/plugins/photoPlayer/plugin.js
similarity index 100%
rename from src/components/photoPlayer/plugin.js
rename to src/plugins/photoPlayer/plugin.js
diff --git a/src/components/playback/playaccessvalidation.js b/src/plugins/playAccessValidation/plugin.js
similarity index 100%
rename from src/components/playback/playaccessvalidation.js
rename to src/plugins/playAccessValidation/plugin.js
diff --git a/src/components/sessionPlayer.js b/src/plugins/sessionPlayer/plugin.js
similarity index 100%
rename from src/components/sessionPlayer.js
rename to src/plugins/sessionPlayer/plugin.js
diff --git a/src/components/youtubeplayer/plugin.js b/src/plugins/youtubePlayer/plugin.js
similarity index 100%
rename from src/components/youtubeplayer/plugin.js
rename to src/plugins/youtubePlayer/plugin.js
diff --git a/src/components/youtubeplayer/style.css b/src/plugins/youtubePlayer/style.css
similarity index 100%
rename from src/components/youtubeplayer/style.css
rename to src/plugins/youtubePlayer/style.css
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 269fdc9890..e60efc757d 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -479,22 +479,22 @@ var AppInfo = {};
     function loadPlugins(appHost, browser, shell) {
         console.debug('loading installed plugins');
         var list = [
-            'components/playback/playaccessvalidation',
-            'components/playback/experimentalwarnings',
-            'components/htmlAudioPlayer/plugin',
-            'components/htmlVideoPlayer/plugin',
-            'components/photoPlayer/plugin',
-            'components/bookPlayer/plugin',
-            'components/youtubeplayer/plugin',
-            'components/backdropScreensaver/plugin',
-            'components/logoScreensaver/plugin'
+            'plugins/playAccessValidation/plugin',
+            'plugins/experimentalWarnings/plugin',
+            'plugins/htmlAudioPlayer/plugin',
+            'plugins/htmlVideoPlayer/plugin',
+            'plugins/photoPlayer/plugin',
+            'plugins/bookPlayer/plugin',
+            'plugins/youtubePlayer/plugin',
+            'plugins/backdropScreensaver/plugin',
+            'plugins/logoScreensaver/plugin'
         ];
 
         if (appHost.supports('remotecontrol')) {
-            list.push('components/sessionPlayer');
+            list.push('plugins/sessionPlayer/plugin');
 
             if (browser.chrome || browser.opera) {
-                list.push('components/chromecast/chromecastplayer');
+                list.push('plugins/chromecastPlayer/plugin');
             }
         }
 
@@ -654,7 +654,8 @@ var AppInfo = {};
             nowPlayingHelper: componentsPath + '/playback/nowplayinghelper',
             pluginManager: componentsPath + '/pluginManager',
             packageManager: componentsPath + '/packagemanager',
-            screensaverManager: componentsPath + '/screensavermanager'
+            screensaverManager: componentsPath + '/screensavermanager',
+            chromecastHelper: 'plugins/chromecastPlayer/chromecastHelpers'
         };
 
         requirejs.onError = onRequireJsError;
@@ -774,7 +775,6 @@ var AppInfo = {};
         define('appSettings', [scriptsPath + '/settings/appSettings'], returnFirstDependency);
         define('userSettings', [scriptsPath + '/settings/userSettings'], returnFirstDependency);
 
-        define('chromecastHelper', [componentsPath + '/chromecast/chromecasthelpers'], returnFirstDependency);
         define('mediaSession', [componentsPath + '/playback/mediasession'], returnFirstDependency);
         define('actionsheet', [componentsPath + '/actionSheet/actionSheet'], returnFirstDependency);
         define('tunerPicker', [componentsPath + '/tunerPicker'], returnFirstDependency);