1 files changed, 29 insertions, 30 deletions

diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts
index ddb521a52..1b2a67c77 100644
--- a/client/src/assets/player/peertube-player-manager.ts
+++ b/client/src/assets/player/peertube-player-manager.ts
@@ -1,35 +1,34 @@
 import '@peertube/videojs-contextmenu'
-import './upnext/end-card'
-import './upnext/upnext-plugin'
-import './stats/stats-card'
-import './stats/stats-plugin'
-import './bezels/bezels-plugin'
-import './peertube-plugin'
-import './peertube-resolutions-plugin'
-import './control-bar/next-previous-video-button'
-import './control-bar/p2p-info-button'
-import './control-bar/peertube-link-button'
-import './control-bar/peertube-load-progress-bar'
-import './control-bar/theater-button'
-import './settings/resolution-menu-button'
-import './settings/resolution-menu-item'
-import './settings/settings-dialog'
-import './settings/settings-menu-button'
-import './settings/settings-menu-item'
-import './settings/settings-panel'
-import './settings/settings-panel-child'
-import './playlist/playlist-plugin'
-import './mobile/peertube-mobile-plugin'
-import './mobile/peertube-mobile-buttons'
-import './hotkeys/peertube-hotkeys-plugin'
+import './shared/upnext/end-card'
+import './shared/upnext/upnext-plugin'
+import './shared/stats/stats-card'
+import './shared/stats/stats-plugin'
+import './shared/bezels/bezels-plugin'
+import './shared/peertube/peertube-plugin'
+import './shared/resolutions/peertube-resolutions-plugin'
+import './shared/control-bar/next-previous-video-button'
+import './shared/control-bar/p2p-info-button'
+import './shared/control-bar/peertube-link-button'
+import './shared/control-bar/peertube-load-progress-bar'
+import './shared/control-bar/theater-button'
+import './shared/settings/resolution-menu-button'
+import './shared/settings/resolution-menu-item'
+import './shared/settings/settings-dialog'
+import './shared/settings/settings-menu-button'
+import './shared/settings/settings-menu-item'
+import './shared/settings/settings-panel'
+import './shared/settings/settings-panel-child'
+import './shared/playlist/playlist-plugin'
+import './shared/mobile/peertube-mobile-plugin'
+import './shared/mobile/peertube-mobile-buttons'
+import './shared/hotkeys/peertube-hotkeys-plugin'
 import videojs from 'video.js'
 import { PluginsManager } from '@root-helpers/plugins-manager'
-import { ManagerOptionsBuilder } from './manager-options/manager-options-builder'
-import { CommonOptions, PeertubePlayerManagerOptions, PlayerMode } from './manager-options/manager-options.model'
+import { isMobile } from '@root-helpers/web-browser'
 import { saveAverageBandwidth } from './peertube-player-local-storage'
-import { PlayerNetworkInfo } from './peertube-videojs-typings'
+import { ManagerOptionsBuilder } from './shared/manager-options'
 import { TranslationsManager } from './translations-manager'
-import { isMobile } from './utils'
+import { CommonOptions, PeertubePlayerManagerOptions, PlayerMode, PlayerNetworkInfo } from './types'
 
 // Change 'Playback Rate' to 'Speed' (smaller for our settings menu)
 (videojs.getComponent('PlaybackRateMenuButton') as any).prototype.controlText_ = 'Speed'
@@ -60,11 +59,11 @@ export class PeertubePlayerManager {
     this.onPlayerChange = onPlayerChange
     this.playerElementClassName = options.common.playerElement.className
 
-    if (mode === 'webtorrent') await import('./webtorrent/webtorrent-plugin')
+    if (mode === 'webtorrent') await import('./shared/webtorrent/webtorrent-plugin')
     if (mode === 'p2p-media-loader') {
       const [ p2pMediaLoaderModule ] = await Promise.all([
         import('@peertube/p2p-media-loader-hlsjs'),
-        import('./p2p-media-loader/p2p-media-loader-plugin')
+        import('./shared/p2p-media-loader/p2p-media-loader-plugin')
       ])
 
       this.p2pMediaLoaderModule = p2pMediaLoaderModule
@@ -174,7 +173,7 @@ export class PeertubePlayerManager {
 
     this.rebuildAndUpdateVideoElement(currentPlayer, options.common)
 
-    await import('./webtorrent/webtorrent-plugin')
+    await import('./shared/webtorrent/webtorrent-plugin')
 
     const newPlayer = await this.buildPlayer('webtorrent', options)
     this.onPlayerChange(newPlayer)