refactor: rename root level folders and references

Signed-off-by: eXhumer <exhumer@exhumer.cc>
eXhumer · Oct 29, 2024 · 5fd3383 · 5fd3383
1 parent 4aa6581
commit 5fd3383
Show file tree

Hide file tree

Showing 139 changed files with 163 additions and 166 deletions.
diff --git a/forge.config.ts b/forge.config.ts
@@ -151,19 +151,19 @@ const config: ForgeConfig = {
         config: rendererConfig,
         entryPoints: [
           {
-            html: './src/MainWindow/Index.html',
-            js: './src/MainWindow/Renderer.ts',
+            html: './src/main_window/index.html',
+            js: './src/main_window/renderer.ts',
             name: 'main_window',
             preload: {
-              js: './src/MainWindow/Preload.ts',
+              js: './src/main_window/preload.ts',
             },
           },
           {
-            html: './src/Player/Index.html',
-            js: './src/Player/Renderer.ts',
+            html: './src/player/index.html',
+            js: './src/player/renderer.ts',
             name: 'player',
             preload: {
-              js: './src/Player/Preload.ts',
+              js: './src/player/preload.ts',
             },
           },
         ],

diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3",
-    "typescript-eslint": "^8.11.0"
+    "typescript-eslint": "^8.12.2"
   },
   "keywords": [],
   "author": {
@@ -56,7 +56,7 @@
   "dependencies": {
     "@exhumer/f1tv-api": "^2.2.1",
     "@reduxjs/toolkit": "^2.3.0",
-    "bitmovin-player": "^8.186.0",
+    "bitmovin-player": "^8.187.0",
     "bitmovin-player-ui": "^3.74.0",
     "bootstrap": "^5.3.3",
     "react": "^18.3.1",

diff --git a/src/Player/React/Skin/SkinModern/LICENSE b/src/Player/React/Skin/SkinModern/LICENSE
diff --git a/src/Index.ts → src/index.ts b/src/Index.ts → src/index.ts
@@ -4,7 +4,7 @@ import { join } from 'path';
 import { app, components, globalShortcut, ipcMain, session, BrowserWindow, Menu } from 'electron';
 import { F1TV, F1TVClient } from '@exhumer/f1tv-api';
 
-import { AppConfig, IPCChannel, F1TVLoginSession } from './Type';
+import { AppConfig, IPCChannel, F1TVLoginSession } from './type';
 
 declare const MAIN_WINDOW_WEBPACK_ENTRY: string;
 declare const MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY: string;
@@ -45,6 +45,7 @@ const createPlayerWindow = (container: F1TV.ContentVideoContainer, platform: str
     width: 1280,
     backgroundColor: '#303030',
     frame: false,
+    titleBarStyle: 'customButtonsOnHover',
     webPreferences: {
       webSecurity: false,
       nodeIntegration: false,

diff --git a/src/MainWindow/React/App.tsx → src/main_window/React/App.tsx b/src/MainWindow/React/App.tsx → src/main_window/React/App.tsx
diff --git a/...inWindow/React/Component/LoggedInView.tsx → ...n_window/React/Component/LoggedInView.tsx b/...inWindow/React/Component/LoggedInView.tsx → ...n_window/React/Component/LoggedInView.tsx
diff --git a/...nWindow/React/Component/LoggedOutView.tsx → ..._window/React/Component/LoggedOutView.tsx b/...nWindow/React/Component/LoggedOutView.tsx → ..._window/React/Component/LoggedOutView.tsx
diff --git a/src/MainWindow/React/CustomBootstrap.scss → src/main_window/React/CustomBootstrap.scss b/src/MainWindow/React/CustomBootstrap.scss → src/main_window/React/CustomBootstrap.scss
diff --git a/src/MainWindow/React/Hook.ts → src/main_window/React/Hook.ts b/src/MainWindow/React/Hook.ts → src/main_window/React/Hook.ts
diff --git a/src/MainWindow/React/Index.tsx → src/main_window/React/Index.tsx b/src/MainWindow/React/Index.tsx → src/main_window/React/Index.tsx
diff --git a/src/MainWindow/React/Slice/F1TV.ts → src/main_window/React/Slice/F1TV.ts b/src/MainWindow/React/Slice/F1TV.ts → src/main_window/React/Slice/F1TV.ts
diff --git a/src/MainWindow/React/Store.ts → src/main_window/React/Store.ts b/src/MainWindow/React/Store.ts → src/main_window/React/Store.ts
diff --git a/src/MainWindow/React/Type.ts → src/main_window/React/Type.ts b/src/MainWindow/React/Type.ts → src/main_window/React/Type.ts
diff --git a/src/MainWindow/Global.d.ts → src/main_window/global.d.ts b/src/MainWindow/Global.d.ts → src/main_window/global.d.ts
diff --git a/src/MainWindow/Index.html → src/main_window/index.html b/src/MainWindow/Index.html → src/main_window/index.html
diff --git a/src/MainWindow/Preload.ts → src/main_window/preload.ts b/src/MainWindow/Preload.ts → src/main_window/preload.ts
@@ -1,7 +1,7 @@
 import type { DecodedAscendonToken, F1TV } from '@exhumer/f1tv-api';
 import { contextBridge, ipcRenderer } from 'electron';
 
-import { IPCChannel } from '../Type';
+import { IPCChannel } from '../type';
 
 contextBridge.exposeInMainWorld('f1tv', {
   onAscendon: (cb: (e: Electron.IpcRendererEvent, ascendon: DecodedAscendonToken | null) => void) =>

diff --git a/src/MainWindow/Renderer.ts → src/main_window/renderer.ts b/src/MainWindow/Renderer.ts → src/main_window/renderer.ts
diff --git a/src/Player/React/App.module.scss → src/player/React/App.module.scss b/src/Player/React/App.module.scss → src/player/React/App.module.scss
diff --git a/src/Player/React/App.tsx → src/player/React/App.tsx b/src/Player/React/App.tsx → src/player/React/App.tsx
@@ -11,7 +11,7 @@ import { updateAscendon, updateConfig, updatePlatform, updateVideoContainer } fr
 import { usePlayerDispatch, usePlayerSelector } from './Hook';
 
 import { author, productName } from '../../../package.json';
-import { F1TVPlatform } from '../../MainWindow/React/Type';
+import { F1TVPlatform } from '../../main_window/React/Type';
 
 const App = () => {
   const ascendon = usePlayerSelector(state => state.player.ascendon);

diff --git a/...layer/React/Component/BitmovinPlayer.scss → ...layer/React/Component/BitmovinPlayer.scss b/...layer/React/Component/BitmovinPlayer.scss → ...layer/React/Component/BitmovinPlayer.scss
@@ -1,6 +1,6 @@
 @import '../Skin/SkinModern/skin';
 
-#player {
+#bitmovin-player {
   height: 100vh;
   margin: 0;
   padding: 0;
@@ -15,12 +15,12 @@
 }
 
 .bmpui-ui-rewindbutton {
-  background-image: url('../Asset/SkinModern/images/rewind.svg');
+  background-image: url('../Skin/SkinModern/assets/images/rewind.svg');
   background-size: contain;
 }
 
 .bmpui-ui-forwardbutton {
-  background-image: url('../Asset/SkinModern/images/forward.svg');
+  background-image: url('../Skin/SkinModern/assets/images/forward.svg');
   background-size: contain;
 }
 

diff --git a/...Player/React/Component/BitmovinPlayer.tsx → ...player/React/Component/BitmovinPlayer.tsx b/...Player/React/Component/BitmovinPlayer.tsx → ...player/React/Component/BitmovinPlayer.tsx
@@ -72,7 +72,7 @@ const BitmovinPlayer: BitmovinPlayerFn = ({ playerKey, config }, ref) => {
   }));
 
   return (
-    <div ref={playerDivRef} id='player' />
+    <div ref={playerDivRef} id='bitmovin-player' />
   );
 };
 

diff --git a/...layer/React/Component/Overlay.module.scss → ...layer/React/Component/Overlay.module.scss b/...layer/React/Component/Overlay.module.scss → ...layer/React/Component/Overlay.module.scss
diff --git a/src/Player/React/Component/Overlay.tsx → src/player/React/Component/Overlay.tsx b/src/Player/React/Component/Overlay.tsx → src/player/React/Component/Overlay.tsx
diff --git a/src/Player/React/Component/PlayerUI.tsx → src/player/React/Component/PlayerUI.tsx b/src/Player/React/Component/PlayerUI.tsx → src/player/React/Component/PlayerUI.tsx
diff --git a/src/Player/React/Hook.ts → src/player/React/Hook.ts b/src/Player/React/Hook.ts → src/player/React/Hook.ts
diff --git a/src/Player/React/Index.scss → src/player/React/Index.scss b/src/Player/React/Index.scss → src/player/React/Index.scss
diff --git a/src/Player/React/Index.tsx → src/player/React/Index.tsx b/src/Player/React/Index.tsx → src/player/React/Index.tsx
diff --git a/src/Player/React/Asset/SkinModern/LICENSE → src/player/React/Skin/SkinModern/LICENSE b/src/Player/React/Asset/SkinModern/LICENSE → src/player/React/Skin/SkinModern/LICENSE
diff --git a/src/player/React/Skin/SkinModern/NOTES b/src/player/React/Skin/SkinModern/NOTES
@@ -0,0 +1,3 @@
+Modified version of skin-modern and it's assets distributed with bitmovin-player-ui.
+
+Modified to change some colors of SVG assets alongside the UI colors.
diff --git a/...Player/React/Skin/SkinModern/_mixins.scss → ...player/React/Skin/SkinModern/_mixins.scss b/...Player/React/Skin/SkinModern/_mixins.scss → ...player/React/Skin/SkinModern/_mixins.scss
diff --git a/...ayer/React/Skin/SkinModern/_skin-ads.scss → ...ayer/React/Skin/SkinModern/_skin-ads.scss b/...ayer/React/Skin/SkinModern/_skin-ads.scss → ...ayer/React/Skin/SkinModern/_skin-ads.scss
diff --git a/.../Skin/SkinModern/_skin-cast-receiver.scss → .../Skin/SkinModern/_skin-cast-receiver.scss b/.../Skin/SkinModern/_skin-cast-receiver.scss → .../Skin/SkinModern/_skin-cast-receiver.scss
@@ -61,7 +61,7 @@
     // We also display a pause image while playback is paused, instead of a play action button
     .#{$prefix}-ui-hugeplaybacktogglebutton {
       .#{$prefix}-image {
-        background-image: url('../Asset/SkinModern/images/pause.svg');
+        background-image: url('../Skin/SkinModern/assets/images/pause.svg');
         opacity: .7;
       }
 

diff --git a/...ct/Skin/SkinModern/_skin-smallscreen.scss → ...ct/Skin/SkinModern/_skin-smallscreen.scss b/...ct/Skin/SkinModern/_skin-smallscreen.scss → ...ct/Skin/SkinModern/_skin-smallscreen.scss
@@ -64,7 +64,7 @@
   // Decrease huge play button size and replace icon with normal play icon
   .#{$prefix}-ui-hugeplaybacktogglebutton {
     .#{$prefix}-image {
-      background-image: url('../Asset/SkinModern/images/play.svg');
+      background-image: url('../Skin/SkinModern/assets/images/play.svg');
       background-size: 4em;
     }
   }
@@ -75,7 +75,7 @@
       &.#{$prefix}-on {
         .#{$prefix}-image {
           animation: none;
-          background-image: url('../Asset/SkinModern/images/pause.svg');
+          background-image: url('../Skin/SkinModern/assets/images/pause.svg');
           visibility: visible;
         }
       }

diff --git a/...layer/React/Skin/SkinModern/_skin-tv.scss → ...layer/React/Skin/SkinModern/_skin-tv.scss b/...layer/React/Skin/SkinModern/_skin-tv.scss → ...layer/React/Skin/SkinModern/_skin-tv.scss
diff --git a/src/Player/React/Skin/SkinModern/_skin.scss → src/player/React/Skin/SkinModern/_skin.scss b/src/Player/React/Skin/SkinModern/_skin.scss → src/player/React/Skin/SkinModern/_skin.scss
diff --git a/...yer/React/Skin/SkinModern/_variables.scss → ...yer/React/Skin/SkinModern/_variables.scss b/...yer/React/Skin/SkinModern/_variables.scss → ...yer/React/Skin/SkinModern/_variables.scss
diff --git a/...React/Asset/SkinModern/images/airplay.svg → ...Skin/SkinModern/assets/images/airplay.svg b/...React/Asset/SkinModern/images/airplay.svg → ...Skin/SkinModern/assets/images/airplay.svg
diff --git a/...eact/Asset/SkinModern/images/airplayX.svg → ...kin/SkinModern/assets/images/airplayX.svg b/...eact/Asset/SkinModern/images/airplayX.svg → ...kin/SkinModern/assets/images/airplayX.svg
diff --git a/.../Asset/SkinModern/images/audio-tracks.svg → ...SkinModern/assets/images/audio-tracks.svg b/.../Asset/SkinModern/images/audio-tracks.svg → ...SkinModern/assets/images/audio-tracks.svg
diff --git a/...Asset/SkinModern/images/audio-tracksX.svg → ...kinModern/assets/images/audio-tracksX.svg b/...Asset/SkinModern/images/audio-tracksX.svg → ...kinModern/assets/images/audio-tracksX.svg
diff --git a/...ct/Asset/SkinModern/images/chromecast.svg → ...n/SkinModern/assets/images/chromecast.svg b/...ct/Asset/SkinModern/images/chromecast.svg → ...n/SkinModern/assets/images/chromecast.svg
diff --git a/...t/Asset/SkinModern/images/chromecastX.svg → .../SkinModern/assets/images/chromecastX.svg b/...t/Asset/SkinModern/images/chromecastX.svg → .../SkinModern/assets/images/chromecastX.svg
diff --git a/...r/React/Asset/SkinModern/images/close.svg → ...t/Skin/SkinModern/assets/images/close.svg b/...r/React/Asset/SkinModern/images/close.svg → ...t/Skin/SkinModern/assets/images/close.svg
diff --git a/.../React/Asset/SkinModern/images/closeX.svg → .../Skin/SkinModern/assets/images/closeX.svg b/.../React/Asset/SkinModern/images/closeX.svg → .../Skin/SkinModern/assets/images/closeX.svg
diff --git a/...eact/Asset/SkinModern/images/dot-play.svg → ...kin/SkinModern/assets/images/dot-play.svg b/...eact/Asset/SkinModern/images/dot-play.svg → ...kin/SkinModern/assets/images/dot-play.svg
diff --git a/...ct/Asset/SkinModern/images/dot-volume.svg → ...n/SkinModern/assets/images/dot-volume.svg b/...ct/Asset/SkinModern/images/dot-volume.svg → ...n/SkinModern/assets/images/dot-volume.svg
diff --git a/...React/Asset/SkinModern/images/forward.svg → ...Skin/SkinModern/assets/images/forward.svg b/...React/Asset/SkinModern/images/forward.svg → ...Skin/SkinModern/assets/images/forward.svg
diff --git a/...ct/Asset/SkinModern/images/fullscreen.svg → ...n/SkinModern/assets/images/fullscreen.svg b/...ct/Asset/SkinModern/images/fullscreen.svg → ...n/SkinModern/assets/images/fullscreen.svg
diff --git a/...t/Asset/SkinModern/images/fullscreenX.svg → .../SkinModern/assets/images/fullscreenX.svg b/...t/Asset/SkinModern/images/fullscreenX.svg → .../SkinModern/assets/images/fullscreenX.svg
diff --git a/...React/Asset/SkinModern/images/glasses.svg → ...Skin/SkinModern/assets/images/glasses.svg b/...React/Asset/SkinModern/images/glasses.svg → ...Skin/SkinModern/assets/images/glasses.svg
diff --git a/...eact/Asset/SkinModern/images/glassesX.svg → ...kin/SkinModern/assets/images/glassesX.svg b/...eact/Asset/SkinModern/images/glassesX.svg → ...kin/SkinModern/assets/images/glassesX.svg
diff --git a/.../React/Asset/SkinModern/images/loader.svg → .../Skin/SkinModern/assets/images/loader.svg b/.../React/Asset/SkinModern/images/loader.svg → .../Skin/SkinModern/assets/images/loader.svg
diff --git a/...er/React/Asset/SkinModern/images/logo.svg → ...ct/Skin/SkinModern/assets/images/logo.svg b/...er/React/Asset/SkinModern/images/logo.svg → ...ct/Skin/SkinModern/assets/images/logo.svg
diff --git a/...act/Asset/SkinModern/images/music-low.svg → ...in/SkinModern/assets/images/music-low.svg b/...act/Asset/SkinModern/images/music-low.svg → ...in/SkinModern/assets/images/music-low.svg
diff --git a/...ct/Asset/SkinModern/images/music-lowX.svg → ...n/SkinModern/assets/images/music-lowX.svg b/...ct/Asset/SkinModern/images/music-lowX.svg → ...n/SkinModern/assets/images/music-lowX.svg
diff --git a/...act/Asset/SkinModern/images/music-off.svg → ...in/SkinModern/assets/images/music-off.svg b/...act/Asset/SkinModern/images/music-off.svg → ...in/SkinModern/assets/images/music-off.svg
diff --git a/...ct/Asset/SkinModern/images/music-offX.svg → ...n/SkinModern/assets/images/music-offX.svg b/...ct/Asset/SkinModern/images/music-offX.svg → ...n/SkinModern/assets/images/music-offX.svg
diff --git a/...eact/Asset/SkinModern/images/music-on.svg → ...kin/SkinModern/assets/images/music-on.svg b/...eact/Asset/SkinModern/images/music-on.svg → ...kin/SkinModern/assets/images/music-on.svg
diff --git a/...act/Asset/SkinModern/images/music-onX.svg → ...in/SkinModern/assets/images/music-onX.svg b/...act/Asset/SkinModern/images/music-onX.svg → ...in/SkinModern/assets/images/music-onX.svg
diff --git a/...er/React/Asset/SkinModern/images/next.svg → ...ct/Skin/SkinModern/assets/images/next.svg b/...er/React/Asset/SkinModern/images/next.svg → ...ct/Skin/SkinModern/assets/images/next.svg
diff --git a/...r/React/Asset/SkinModern/images/nextX.svg → ...t/Skin/SkinModern/assets/images/nextX.svg b/...r/React/Asset/SkinModern/images/nextX.svg → ...t/Skin/SkinModern/assets/images/nextX.svg
diff --git a/...r/React/Asset/SkinModern/images/pause.svg → ...t/Skin/SkinModern/assets/images/pause.svg b/...r/React/Asset/SkinModern/images/pause.svg → ...t/Skin/SkinModern/assets/images/pause.svg
diff --git a/.../React/Asset/SkinModern/images/pauseX.svg → .../Skin/SkinModern/assets/images/pauseX.svg b/.../React/Asset/SkinModern/images/pauseX.svg → .../Skin/SkinModern/assets/images/pauseX.svg
diff --git a/...act/Asset/SkinModern/images/picinpic1.svg → ...in/SkinModern/assets/images/picinpic1.svg b/...act/Asset/SkinModern/images/picinpic1.svg → ...in/SkinModern/assets/images/picinpic1.svg
diff --git a/...ct/Asset/SkinModern/images/picinpic1X.svg → ...n/SkinModern/assets/images/picinpic1X.svg b/...ct/Asset/SkinModern/images/picinpic1X.svg → ...n/SkinModern/assets/images/picinpic1X.svg
diff --git a/...act/Asset/SkinModern/images/picinpic2.svg → ...in/SkinModern/assets/images/picinpic2.svg b/...act/Asset/SkinModern/images/picinpic2.svg → ...in/SkinModern/assets/images/picinpic2.svg
diff --git a/...ct/Asset/SkinModern/images/picinpic2X.svg → ...n/SkinModern/assets/images/picinpic2X.svg b/...ct/Asset/SkinModern/images/picinpic2X.svg → ...n/SkinModern/assets/images/picinpic2X.svg
diff --git a/...er/React/Asset/SkinModern/images/play.svg → ...ct/Skin/SkinModern/assets/images/play.svg b/...er/React/Asset/SkinModern/images/play.svg → ...ct/Skin/SkinModern/assets/images/play.svg
diff --git a/...r/React/Asset/SkinModern/images/playX.svg → ...t/Skin/SkinModern/assets/images/playX.svg b/...r/React/Asset/SkinModern/images/playX.svg → ...t/Skin/SkinModern/assets/images/playX.svg
diff --git a/...eact/Asset/SkinModern/images/play_big.svg → ...kin/SkinModern/assets/images/play_big.svg b/...eact/Asset/SkinModern/images/play_big.svg → ...kin/SkinModern/assets/images/play_big.svg
diff --git a/...act/Asset/SkinModern/images/play_bigX.svg → ...in/SkinModern/assets/images/play_bigX.svg b/...act/Asset/SkinModern/images/play_bigX.svg → ...in/SkinModern/assets/images/play_bigX.svg
diff --git a/...eact/Asset/SkinModern/images/playlist.svg → ...kin/SkinModern/assets/images/playlist.svg b/...eact/Asset/SkinModern/images/playlist.svg → ...kin/SkinModern/assets/images/playlist.svg
diff --git a/...act/Asset/SkinModern/images/playlistX.svg → ...in/SkinModern/assets/images/playlistX.svg b/...act/Asset/SkinModern/images/playlistX.svg → ...in/SkinModern/assets/images/playlistX.svg
diff --git a/...er/React/Asset/SkinModern/images/prev.svg → ...ct/Skin/SkinModern/assets/images/prev.svg b/...er/React/Asset/SkinModern/images/prev.svg → ...ct/Skin/SkinModern/assets/images/prev.svg
diff --git a/...r/React/Asset/SkinModern/images/prevX.svg → ...t/Skin/SkinModern/assets/images/prevX.svg b/...r/React/Asset/SkinModern/images/prevX.svg → ...t/Skin/SkinModern/assets/images/prevX.svg
diff --git a/...set/SkinModern/images/replay-nocircle.svg → ...nModern/assets/images/replay-nocircle.svg b/...set/SkinModern/images/replay-nocircle.svg → ...nModern/assets/images/replay-nocircle.svg
diff --git a/.../React/Asset/SkinModern/images/replay.svg → .../Skin/SkinModern/assets/images/replay.svg b/.../React/Asset/SkinModern/images/replay.svg → .../Skin/SkinModern/assets/images/replay.svg
diff --git a/...React/Asset/SkinModern/images/replayX.svg → ...Skin/SkinModern/assets/images/replayX.svg b/...React/Asset/SkinModern/images/replayX.svg → ...Skin/SkinModern/assets/images/replayX.svg
diff --git a/.../React/Asset/SkinModern/images/rewind.svg → .../Skin/SkinModern/assets/images/rewind.svg b/.../React/Asset/SkinModern/images/rewind.svg → .../Skin/SkinModern/assets/images/rewind.svg
diff --git a/...eact/Asset/SkinModern/images/settings.svg → ...kin/SkinModern/assets/images/settings.svg b/...eact/Asset/SkinModern/images/settings.svg → ...kin/SkinModern/assets/images/settings.svg
diff --git a/...act/Asset/SkinModern/images/settingsX.svg → ...in/SkinModern/assets/images/settingsX.svg b/...act/Asset/SkinModern/images/settingsX.svg → ...in/SkinModern/assets/images/settingsX.svg
diff --git a/...er/React/Asset/SkinModern/images/stop.svg → ...ct/Skin/SkinModern/assets/images/stop.svg b/...er/React/Asset/SkinModern/images/stop.svg → ...ct/Skin/SkinModern/assets/images/stop.svg
diff --git a/...r/React/Asset/SkinModern/images/stopX.svg → ...t/Skin/SkinModern/assets/images/stopX.svg b/...r/React/Asset/SkinModern/images/stopX.svg → ...t/Skin/SkinModern/assets/images/stopX.svg
diff --git a/...act/Asset/SkinModern/images/subtitles.svg → ...in/SkinModern/assets/images/subtitles.svg b/...act/Asset/SkinModern/images/subtitles.svg → ...in/SkinModern/assets/images/subtitles.svg
diff --git a/...ct/Asset/SkinModern/images/subtitlesX.svg → ...n/SkinModern/assets/images/subtitlesX.svg b/...ct/Asset/SkinModern/images/subtitlesX.svg → ...n/SkinModern/assets/images/subtitlesX.svg
diff --git a/...dern/components/_airplaytogglebutton.scss → ...dern/components/_airplaytogglebutton.scss b/...dern/components/_airplaytogglebutton.scss → ...dern/components/_airplaytogglebutton.scss
@@ -4,13 +4,13 @@
 .#{$prefix}-ui-airplaytogglebutton {
   @extend %ui-button;
 
-  background-image: url('../Asset/SkinModern/images/airplay.svg');
+  background-image: url('../Skin/SkinModern/assets/images/airplay.svg');
 
   &:hover {
     @include svg-icon-shadow;
   }
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/airplayX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/airplayX.svg');
   }
 }
diff --git a/..._audiotracksettingspaneltogglebutton.scss → ..._audiotracksettingspaneltogglebutton.scss b/..._audiotracksettingspaneltogglebutton.scss → ..._audiotracksettingspaneltogglebutton.scss
@@ -4,9 +4,9 @@
 .#{$prefix}-ui-audiotracksettingstogglebutton {
   @extend %ui-settingstogglebutton;
 
-  background-image: url('../Asset/SkinModern/images/audio-tracks.svg');
+  background-image: url('../Skin/SkinModern/assets/images/audio-tracks.svg');
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/audio-tracksX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/audio-tracksX.svg');
   }
 }
diff --git a/...nModern/components/_bufferingoverlay.scss → ...nModern/components/_bufferingoverlay.scss b/...nModern/components/_bufferingoverlay.scss → ...nModern/components/_bufferingoverlay.scss
@@ -66,7 +66,7 @@
 
     & {
       animation: #{$prefix}-fancy $buffering-animation-duration ease-in infinite;
-      background: url('../Asset/SkinModern/images/loader.svg') no-repeat center;
+      background: url('../Skin/SkinModern/assets/images/loader.svg') no-repeat center;
       display: inline-block;
       height: 2em;
       margin: .2em;

diff --git a/...t/Skin/SkinModern/components/_button.scss → ...t/Skin/SkinModern/components/_button.scss b/...t/Skin/SkinModern/components/_button.scss → ...t/Skin/SkinModern/components/_button.scss
diff --git a/...Modern/components/_caststatusoverlay.scss → ...Modern/components/_caststatusoverlay.scss b/...Modern/components/_caststatusoverlay.scss → ...Modern/components/_caststatusoverlay.scss
@@ -7,7 +7,7 @@
   @include hidden-animated;
 
   & {
-    background: $color-background url('../Asset/SkinModern/images/chromecast.svg') center no-repeat;
+    background: $color-background url('../Skin/SkinModern/assets/images/chromecast.svg') center no-repeat;
     background-size: 7em 7em;
   }
 

diff --git a/...nModern/components/_casttogglebutton.scss → ...nModern/components/_casttogglebutton.scss b/...nModern/components/_casttogglebutton.scss → ...nModern/components/_casttogglebutton.scss
@@ -4,13 +4,13 @@
 .#{$prefix}-ui-casttogglebutton {
   @extend %ui-button;
 
-  background-image: url('../Asset/SkinModern/images/chromecast.svg');
+  background-image: url('../Skin/SkinModern/assets/images/chromecast.svg');
 
   &:hover {
     @include svg-icon-shadow;
   }
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/chromecastX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/chromecastX.svg');
   }
 }
diff --git a/.../SkinModern/components/_clickoverlay.scss → .../SkinModern/components/_clickoverlay.scss b/.../SkinModern/components/_clickoverlay.scss → .../SkinModern/components/_clickoverlay.scss
diff --git a/...n/SkinModern/components/_closebutton.scss → ...n/SkinModern/components/_closebutton.scss b/...n/SkinModern/components/_closebutton.scss → ...n/SkinModern/components/_closebutton.scss
@@ -23,7 +23,7 @@
   }
 
   & {
-    background-image: url('../Asset/SkinModern/images/close.svg');
+    background-image: url('../Skin/SkinModern/assets/images/close.svg');
   }
 
   &:hover {

diff --git a/...kin/SkinModern/components/_component.scss → ...kin/SkinModern/components/_component.scss b/...kin/SkinModern/components/_component.scss → ...kin/SkinModern/components/_component.scss
diff --git a/...kin/SkinModern/components/_container.scss → ...kin/SkinModern/components/_container.scss b/...kin/SkinModern/components/_container.scss → ...kin/SkinModern/components/_container.scss
diff --git a/...in/SkinModern/components/_controlbar.scss → ...in/SkinModern/components/_controlbar.scss b/...in/SkinModern/components/_controlbar.scss → ...in/SkinModern/components/_controlbar.scss
diff --git a/...dern/components/_errormessageoverlay.scss → ...dern/components/_errormessageoverlay.scss b/...dern/components/_errormessageoverlay.scss → ...dern/components/_errormessageoverlay.scss
diff --git a/...n/components/_fullscreentogglebutton.scss → ...n/components/_fullscreentogglebutton.scss b/...n/components/_fullscreentogglebutton.scss → ...n/components/_fullscreentogglebutton.scss
@@ -4,13 +4,13 @@
 .#{$prefix}-ui-fullscreentogglebutton {
   @extend %ui-button;
 
-  background-image: url('../Asset/SkinModern/images/fullscreen.svg');
+  background-image: url('../Skin/SkinModern/assets/images/fullscreen.svg');
 
   &:hover {
     @include svg-icon-shadow;
   }
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/fullscreenX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/fullscreenX.svg');
   }
 }
diff --git a/...components/_hugeplaybacktogglebutton.scss → ...components/_hugeplaybacktogglebutton.scss b/...components/_hugeplaybacktogglebutton.scss → ...components/_hugeplaybacktogglebutton.scss
@@ -47,7 +47,7 @@
   }
 
   .#{$prefix}-image {
-    background-image: url('../Asset/SkinModern/images/play_big.svg');
+    background-image: url('../Skin/SkinModern/assets/images/play_big.svg');
     background-position: center;
     background-repeat: no-repeat;
     background-size: 7em;

diff --git a/...nModern/components/_hugereplaybutton.scss → ...nModern/components/_hugereplaybutton.scss b/...nModern/components/_hugereplaybutton.scss → ...nModern/components/_hugereplaybutton.scss
@@ -9,7 +9,7 @@
   width: 5em;
 
   .#{$prefix}-image {
-    background-image: url('../Asset/SkinModern/images/replayX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/replayX.svg');
     background-position: center;
     background-repeat: no-repeat;
     background-size: 5em;

diff --git a/...ct/Skin/SkinModern/components/_label.scss → ...ct/Skin/SkinModern/components/_label.scss b/...ct/Skin/SkinModern/components/_label.scss → ...ct/Skin/SkinModern/components/_label.scss
diff --git a/.../Skin/SkinModern/components/_listbox.scss → .../Skin/SkinModern/components/_listbox.scss b/.../Skin/SkinModern/components/_listbox.scss → .../Skin/SkinModern/components/_listbox.scss
diff --git a/...onents/_pictureinpicturetogglebutton.scss → ...onents/_pictureinpicturetogglebutton.scss b/...onents/_pictureinpicturetogglebutton.scss → ...onents/_pictureinpicturetogglebutton.scss
@@ -4,13 +4,13 @@
 .#{$prefix}-ui-piptogglebutton {
   @extend %ui-button;
 
-  background-image: url('../Asset/SkinModern/images/picinpic1.svg');
+  background-image: url('../Skin/SkinModern/assets/images/picinpic1.svg');
 
   &:hover {
     @include svg-icon-shadow;
   }
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/picinpic1X.svg');
+    background-image: url('../Skin/SkinModern/assets/images/picinpic1X.svg');
   }
 }
diff --git a/...Modern/components/_playbacktimelabel.scss → ...Modern/components/_playbacktimelabel.scss b/...Modern/components/_playbacktimelabel.scss → ...Modern/components/_playbacktimelabel.scss
diff --git a/...ern/components/_playbacktogglebutton.scss → ...ern/components/_playbacktogglebutton.scss b/...ern/components/_playbacktogglebutton.scss → ...ern/components/_playbacktogglebutton.scss
@@ -4,17 +4,17 @@
 .#{$prefix}-ui-playbacktogglebutton {
   @extend %ui-button;
 
-  background-image: url('../Asset/SkinModern/images/play.svg');
+  background-image: url('../Skin/SkinModern/assets/images/play.svg');
 
   &:hover {
     @include svg-icon-shadow;
   }
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/pause.svg');
+    background-image: url('../Skin/SkinModern/assets/images/pause.svg');
 
     &.#{$prefix}-stoptoggle {
-      background-image: url('../Asset/SkinModern/images/stop.svg');
+      background-image: url('../Skin/SkinModern/assets/images/stop.svg');
     }
   }
 }
diff --git a/...rn/components/_playbacktoggleoverlay.scss → ...rn/components/_playbacktoggleoverlay.scss b/...rn/components/_playbacktoggleoverlay.scss → ...rn/components/_playbacktoggleoverlay.scss
diff --git a/...rn/components/_recommendationoverlay.scss → ...rn/components/_recommendationoverlay.scss b/...rn/components/_recommendationoverlay.scss → ...rn/components/_recommendationoverlay.scss
diff --git a/.../SkinModern/components/_replaybutton.scss → .../SkinModern/components/_replaybutton.scss b/.../SkinModern/components/_replaybutton.scss → .../SkinModern/components/_replaybutton.scss
@@ -4,7 +4,7 @@
 .#{$prefix}-ui-replaybutton {
   @extend %ui-button;
 
-  background-image: url('../Asset/SkinModern/images/replay-nocircle.svg');
+  background-image: url('../Skin/SkinModern/assets/images/replay-nocircle.svg');
 
   &:hover {
     @include svg-icon-shadow;

diff --git a/.../Skin/SkinModern/components/_seekbar.scss → .../Skin/SkinModern/components/_seekbar.scss b/.../Skin/SkinModern/components/_seekbar.scss → .../Skin/SkinModern/components/_seekbar.scss
diff --git a/.../SkinModern/components/_seekbarlabel.scss → .../SkinModern/components/_seekbarlabel.scss b/.../SkinModern/components/_seekbarlabel.scss → .../SkinModern/components/_seekbarlabel.scss
diff --git a/...kin/SkinModern/components/_selectbox.scss → ...kin/SkinModern/components/_selectbox.scss b/...kin/SkinModern/components/_selectbox.scss → ...kin/SkinModern/components/_selectbox.scss
diff --git a/...SkinModern/components/_settingspanel.scss → ...SkinModern/components/_settingspanel.scss b/...SkinModern/components/_settingspanel.scss → ...SkinModern/components/_settingspanel.scss
diff --git a/...Modern/components/_settingspanelpage.scss → ...Modern/components/_settingspanelpage.scss b/...Modern/components/_settingspanelpage.scss → ...Modern/components/_settingspanelpage.scss
diff --git a/...ponents/_settingspanelpagebackbutton.scss → ...ponents/_settingspanelpagebackbutton.scss b/...ponents/_settingspanelpagebackbutton.scss → ...ponents/_settingspanelpagebackbutton.scss
diff --git a/...ponents/_settingspanelpageopenbutton.scss → ...ponents/_settingspanelpageopenbutton.scss b/...ponents/_settingspanelpageopenbutton.scss → ...ponents/_settingspanelpageopenbutton.scss
@@ -4,7 +4,7 @@
 %ui-settingspanelpageopenbutton {
   @extend %ui-button;
 
-  background-image: url('../Asset/SkinModern/images/settings.svg');
+  background-image: url('../Skin/SkinModern/assets/images/settings.svg');
   max-height: .8em;
   padding: .3em 0;
   vertical-align: bottom;
@@ -14,7 +14,7 @@
   }
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/settingsX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/settingsX.svg');
   }
 }
 

diff --git a/...ern/components/_settingstogglebutton.scss → ...ern/components/_settingstogglebutton.scss b/...ern/components/_settingstogglebutton.scss → ...ern/components/_settingstogglebutton.scss
@@ -18,9 +18,9 @@
 .#{$prefix}-ui-settingstogglebutton {
   @extend %ui-settingstogglebutton;
 
-  background-image: url('../Asset/SkinModern/images/settings.svg');
+  background-image: url('../Skin/SkinModern/assets/images/settings.svg');
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/settingsX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/settingsX.svg');
   }
 }
diff --git a/...t/Skin/SkinModern/components/_spacer.scss → ...t/Skin/SkinModern/components/_spacer.scss b/...t/Skin/SkinModern/components/_spacer.scss → ...t/Skin/SkinModern/components/_spacer.scss
diff --git a/...n/components/_subtitleoverlay-cea608.scss → ...n/components/_subtitleoverlay-cea608.scss b/...n/components/_subtitleoverlay-cea608.scss → ...n/components/_subtitleoverlay-cea608.scss
diff --git a/...inModern/components/_subtitleoverlay.scss → ...inModern/components/_subtitleoverlay.scss b/...inModern/components/_subtitleoverlay.scss → ...inModern/components/_subtitleoverlay.scss
diff --git a/...s/_subtitlesettingspaneltogglebutton.scss → ...s/_subtitlesettingspaneltogglebutton.scss b/...s/_subtitlesettingspaneltogglebutton.scss → ...s/_subtitlesettingspaneltogglebutton.scss
@@ -4,9 +4,9 @@
 .#{$prefix}-ui-subtitlesettingstogglebutton {
   @extend %ui-settingstogglebutton;
 
-  background-image: url('../Asset/SkinModern/images/subtitles.svg');
+  background-image: url('../Skin/SkinModern/assets/images/subtitles.svg');
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/subtitlesX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/subtitlesX.svg');
   }
 }
diff --git a/...Skin/SkinModern/components/_titlebar.scss → ...Skin/SkinModern/components/_titlebar.scss b/...Skin/SkinModern/components/_titlebar.scss → ...Skin/SkinModern/components/_titlebar.scss
diff --git a/...n/SkinModern/components/_uicontainer.scss → ...n/SkinModern/components/_uicontainer.scss b/...n/SkinModern/components/_uicontainer.scss → ...n/SkinModern/components/_uicontainer.scss
diff --git a/...dern/components/_volumecontrolbutton.scss → ...dern/components/_volumecontrolbutton.scss b/...dern/components/_volumecontrolbutton.scss → ...dern/components/_volumecontrolbutton.scss
diff --git a/.../SkinModern/components/_volumeslider.scss → .../SkinModern/components/_volumeslider.scss b/.../SkinModern/components/_volumeslider.scss → .../SkinModern/components/_volumeslider.scss
diff --git a/...odern/components/_volumetogglebutton.scss → ...odern/components/_volumetogglebutton.scss b/...odern/components/_volumetogglebutton.scss → ...odern/components/_volumetogglebutton.scss
@@ -9,28 +9,28 @@
   }
 
   &.#{$prefix}-muted {
-    background-image: url('../Asset/SkinModern/images/music-off.svg');
+    background-image: url('../Skin/SkinModern/assets/images/music-off.svg');
   }
 
   &.#{$prefix}-unmuted {
     &[data-#{$prefix}-volume-level-tens='0'] {
-      background-image: url('../Asset/SkinModern/images/music-off.svg');
+      background-image: url('../Skin/SkinModern/assets/images/music-off.svg');
     }
 
     &[data-#{$prefix}-volume-level-tens='1'],
     &[data-#{$prefix}-volume-level-tens='2'],
     &[data-#{$prefix}-volume-level-tens='3'],
     &[data-#{$prefix}-volume-level-tens='4'],
     &[data-#{$prefix}-volume-level-tens='5'] {
-      background-image: url('../Asset/SkinModern/images/music-low.svg');
+      background-image: url('../Skin/SkinModern/assets/images/music-low.svg');
     }
 
     &[data-#{$prefix}-volume-level-tens='6'],
     &[data-#{$prefix}-volume-level-tens='7'],
     &[data-#{$prefix}-volume-level-tens='8'],
     &[data-#{$prefix}-volume-level-tens='9'],
     &[data-#{$prefix}-volume-level-tens='10'] {
-      background-image: url('../Asset/SkinModern/images/music-on.svg');
+      background-image: url('../Skin/SkinModern/assets/images/music-on.svg');
     }
   }
 }
diff --git a/...kinModern/components/_vrtogglebutton.scss → ...kinModern/components/_vrtogglebutton.scss b/...kinModern/components/_vrtogglebutton.scss → ...kinModern/components/_vrtogglebutton.scss
@@ -5,13 +5,13 @@
   @extend %ui-button;
 
   // svg() usage: http://pavliko.github.io/postcss-svg/
-  background-image: url('../Asset/SkinModern/images/glasses.svg');
+  background-image: url('../Skin/SkinModern/assets/images/glasses.svg');
 
   &:hover {
     @include svg-icon-shadow;
   }
 
   &.#{$prefix}-on {
-    background-image: url('../Asset/SkinModern/images/glassesX.svg');
+    background-image: url('../Skin/SkinModern/assets/images/glassesX.svg');
   }
 }