diff --git a/src/components/fonts/fonts.css b/src/css/fonts.css
similarity index 100%
rename from src/components/fonts/fonts.css
rename to src/css/fonts.css
diff --git a/src/components/fonts/fonts.sized.css b/src/css/fonts.sized.css
similarity index 100%
rename from src/components/fonts/fonts.sized.css
rename to src/css/fonts.sized.css
diff --git a/src/components/fonts/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff b/src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff
similarity index 100%
rename from src/components/fonts/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff
rename to src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff
diff --git a/src/components/fonts/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 b/src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
similarity index 100%
rename from src/components/fonts/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
rename to src/css/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
diff --git a/src/components/fonts/material-icons/style.css b/src/css/material-icons/style.css
similarity index 100%
rename from src/components/fonts/material-icons/style.css
rename to src/css/material-icons/style.css
diff --git a/src/scripts/site.js b/src/scripts/site.js
index dae98519c9..6eb45b86d9 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -396,7 +396,7 @@ var AppInfo = {};
                 return self.ResizeObserver;
             });
         } else {
-            define("ResizeObserver", ["components/resize-observer-polyfill/ResizeObserver"], returnFirstDependency);
+            define("ResizeObserver", ["thirdparty/resize-observer-polyfill/ResizeObserver"], returnFirstDependency);
         }
     }
 
@@ -672,7 +672,7 @@ var AppInfo = {};
         }
 
         if (!window.Promise || browser.web0s) {
-            require(["components/native-promise-only/lib/npo.src"], init);
+            require(["thirdparty/native-promise-only/lib/npo.src"], init);
         } else {
             init();
         }
@@ -710,7 +710,7 @@ var AppInfo = {};
             inputManager: componentsPath + "/inputmanager",
             qualityoptions: componentsPath + "/qualityoptions",
             hammer: bowerPath + "/hammerjs/hammer.min",
-            pageJs: componentsPath + "/pagejs/page",
+            pageJs: "thirdparty/pagejs/page",
             focusManager: componentsPath + "/focusmanager",
             datetime: componentsPath + "/datetime",
             globalize: componentsPath + "/globalize",
@@ -723,8 +723,8 @@ var AppInfo = {};
             packageManager: componentsPath + "/packagemanager"
         };
         paths.hlsjs = bowerPath + "/hlsjs/dist/hls.min";
-        paths.flvjs = componentsPath + "/flvjs/flv.min";
-        paths.shaka = componentsPath + "/shaka/shaka-player.compiled";
+        paths.flvjs = "thirdparty/flvjs/flv.min";
+        paths.shaka = "thirdparty/shaka/shaka-player.compiled";
         define("chromecastHelper", [componentsPath + "/chromecast/chromecasthelpers"], returnFirstDependency);
         define("mediaSession", [componentsPath + "/playback/mediasession"], returnFirstDependency);
         define("actionsheet", [componentsPath + "/actionsheet/actionsheet"], returnFirstDependency);
@@ -863,9 +863,9 @@ var AppInfo = {};
         define("appSettings", [componentsPath + "/appsettings"], returnFirstDependency);
         define("userSettings", [componentsPath + "/usersettings/usersettings"], returnFirstDependency);
         define("userSettingsBuilder", [componentsPath + "/usersettings/usersettingsbuilder", "layoutManager", "browser"], getSettingsBuilder);
-        define("material-icons", ["css!" + componentsPath + "/fonts/material-icons/style"], returnFirstDependency);
-        define("systemFontsCss", ["css!" + componentsPath + "/fonts/fonts"], returnFirstDependency);
-        define("systemFontsSizedCss", ["css!" + componentsPath + "/fonts/fonts.sized"], returnFirstDependency);
+        define("material-icons", ["css!css/material-icons/style"], returnFirstDependency);
+        define("systemFontsCss", ["css!css/fonts"], returnFirstDependency);
+        define("systemFontsSizedCss", ["css!css/fonts.sized"], returnFirstDependency);
         define("scrollStyles", ["css!" + componentsPath + "/scrollstyles"], returnFirstDependency);
         define("imageUploader", [componentsPath + "/imageuploader/imageuploader"], returnFirstDependency);
         define("navdrawer", ["components/navdrawer/navdrawer"], returnFirstDependency);
diff --git a/src/components/flvjs/flv.min.js b/src/thirdparty/flvjs/flv.min.js
similarity index 100%
rename from src/components/flvjs/flv.min.js
rename to src/thirdparty/flvjs/flv.min.js
diff --git a/src/components/native-promise-only/lib/npo.src.js b/src/thirdparty/native-promise-only/lib/npo.src.js
similarity index 100%
rename from src/components/native-promise-only/lib/npo.src.js
rename to src/thirdparty/native-promise-only/lib/npo.src.js
diff --git a/src/components/native-promise-only/test_adapter.js b/src/thirdparty/native-promise-only/test_adapter.js
similarity index 100%
rename from src/components/native-promise-only/test_adapter.js
rename to src/thirdparty/native-promise-only/test_adapter.js
diff --git a/src/components/pagejs/page.js b/src/thirdparty/pagejs/page.js
similarity index 100%
rename from src/components/pagejs/page.js
rename to src/thirdparty/pagejs/page.js
diff --git a/src/components/resize-observer-polyfill/ResizeObserver.js b/src/thirdparty/resize-observer-polyfill/ResizeObserver.js
similarity index 100%
rename from src/components/resize-observer-polyfill/ResizeObserver.js
rename to src/thirdparty/resize-observer-polyfill/ResizeObserver.js