diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js
index df15dac19d..225b0650c7 100644
--- a/src/components/playerstats/playerstats.js
+++ b/src/components/playerstats/playerstats.js
@@ -4,7 +4,7 @@ import globalize from '../../scripts/globalize';
 import layoutManager from '../layoutManager';
 import { playbackManager } from '../playback/playbackmanager';
 import playMethodHelper from '../playback/playmethodhelper';
-import SyncPlay from '../../components/syncPlay/core';
+import SyncPlay from '../../plugins/syncPlay/core';
 import './playerstats.scss';
 import ServerConnections from '../ServerConnections';
 
diff --git a/src/components/playlisteditor/playlisteditor.js b/src/components/playlisteditor/playlisteditor.js
index 440685fd9c..70ae0644d1 100644
--- a/src/components/playlisteditor/playlisteditor.js
+++ b/src/components/playlisteditor/playlisteditor.js
@@ -4,7 +4,7 @@ import dialogHelper from '../dialogHelper/dialogHelper';
 import loading from '../loading/loading';
 import layoutManager from '../layoutManager';
 import { playbackManager } from '../playback/playbackmanager';
-import SyncPlay from '../../components/syncPlay/core';
+import SyncPlay from '../../plugins/syncPlay/core';
 import * as userSettings from '../../scripts/settings/userSettings';
 import { appRouter } from '../appRouter';
 import globalize from '../../scripts/globalize';
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index d5da82b740..a51bff1d50 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -1,6 +1,6 @@
 import escapeHtml from 'escape-html';
 import { playbackManager } from '../../../components/playback/playbackmanager';
-import SyncPlay from '../../../components/syncPlay/core';
+import SyncPlay from '../../../plugins/syncPlay/core';
 import browser from '../../../scripts/browser';
 import dom from '../../../scripts/dom';
 import inputManager from '../../../scripts/inputManager';
diff --git a/src/components/syncPlay/core/Controller.js b/src/plugins/syncPlay/core/Controller.js
similarity index 100%
rename from src/components/syncPlay/core/Controller.js
rename to src/plugins/syncPlay/core/Controller.js
diff --git a/src/components/syncPlay/core/Helper.js b/src/plugins/syncPlay/core/Helper.js
similarity index 100%
rename from src/components/syncPlay/core/Helper.js
rename to src/plugins/syncPlay/core/Helper.js
diff --git a/src/components/syncPlay/core/Manager.js b/src/plugins/syncPlay/core/Manager.js
similarity index 99%
rename from src/components/syncPlay/core/Manager.js
rename to src/plugins/syncPlay/core/Manager.js
index 16640c1df2..c41fe14fb7 100644
--- a/src/components/syncPlay/core/Manager.js
+++ b/src/plugins/syncPlay/core/Manager.js
@@ -9,7 +9,7 @@ import TimeSyncCore from './timeSync/TimeSyncCore';
 import PlaybackCore from './PlaybackCore';
 import QueueCore from './QueueCore';
 import Controller from './Controller';
-import toast from '../../toast/toast';
+import toast from '../../../components/toast/toast';
 import globalize from '../../../scripts/globalize';
 
 /**
diff --git a/src/components/syncPlay/core/PlaybackCore.js b/src/plugins/syncPlay/core/PlaybackCore.js
similarity index 100%
rename from src/components/syncPlay/core/PlaybackCore.js
rename to src/plugins/syncPlay/core/PlaybackCore.js
diff --git a/src/components/syncPlay/core/QueueCore.js b/src/plugins/syncPlay/core/QueueCore.js
similarity index 99%
rename from src/components/syncPlay/core/QueueCore.js
rename to src/plugins/syncPlay/core/QueueCore.js
index 81feac0aca..cdf1d56a1e 100644
--- a/src/components/syncPlay/core/QueueCore.js
+++ b/src/plugins/syncPlay/core/QueueCore.js
@@ -4,7 +4,7 @@
  */
 
 import globalize from '../../../scripts/globalize';
-import toast from '../../toast/toast';
+import toast from '../../../components/toast/toast';
 import * as Helper from './Helper';
 
 /**
diff --git a/src/components/syncPlay/core/Settings.js b/src/plugins/syncPlay/core/Settings.js
similarity index 100%
rename from src/components/syncPlay/core/Settings.js
rename to src/plugins/syncPlay/core/Settings.js
diff --git a/src/components/syncPlay/core/index.js b/src/plugins/syncPlay/core/index.js
similarity index 100%
rename from src/components/syncPlay/core/index.js
rename to src/plugins/syncPlay/core/index.js
diff --git a/src/components/syncPlay/core/players/GenericPlayer.js b/src/plugins/syncPlay/core/players/GenericPlayer.js
similarity index 100%
rename from src/components/syncPlay/core/players/GenericPlayer.js
rename to src/plugins/syncPlay/core/players/GenericPlayer.js
diff --git a/src/components/syncPlay/core/players/PlayerFactory.js b/src/plugins/syncPlay/core/players/PlayerFactory.js
similarity index 100%
rename from src/components/syncPlay/core/players/PlayerFactory.js
rename to src/plugins/syncPlay/core/players/PlayerFactory.js
diff --git a/src/components/syncPlay/core/timeSync/TimeSync.js b/src/plugins/syncPlay/core/timeSync/TimeSync.js
similarity index 100%
rename from src/components/syncPlay/core/timeSync/TimeSync.js
rename to src/plugins/syncPlay/core/timeSync/TimeSync.js
diff --git a/src/components/syncPlay/core/timeSync/TimeSyncCore.js b/src/plugins/syncPlay/core/timeSync/TimeSyncCore.js
similarity index 100%
rename from src/components/syncPlay/core/timeSync/TimeSyncCore.js
rename to src/plugins/syncPlay/core/timeSync/TimeSyncCore.js
diff --git a/src/components/syncPlay/core/timeSync/TimeSyncServer.js b/src/plugins/syncPlay/core/timeSync/TimeSyncServer.js
similarity index 100%
rename from src/components/syncPlay/core/timeSync/TimeSyncServer.js
rename to src/plugins/syncPlay/core/timeSync/TimeSyncServer.js
diff --git a/src/plugins/syncPlay/plugin.ts b/src/plugins/syncPlay/plugin.ts
index f4cd78a3c5..e1b7c29cd6 100644
--- a/src/plugins/syncPlay/plugin.ts
+++ b/src/plugins/syncPlay/plugin.ts
@@ -2,10 +2,10 @@ import { Events } from 'jellyfin-apiclient';
 
 import { playbackManager } from '../../components/playback/playbackmanager';
 import ServerConnections from '../../components/ServerConnections';
-import SyncPlay from '../../components/syncPlay/core';
-import SyncPlayNoActivePlayer from '../../components/syncPlay/ui/players/NoActivePlayer';
-import SyncPlayHtmlVideoPlayer from '../../components/syncPlay/ui/players/HtmlVideoPlayer';
-import SyncPlayHtmlAudioPlayer from '../../components/syncPlay/ui/players/HtmlAudioPlayer';
+import SyncPlay from './core';
+import SyncPlayNoActivePlayer from './ui/players/NoActivePlayer';
+import SyncPlayHtmlVideoPlayer from './ui/players/HtmlVideoPlayer';
+import SyncPlayHtmlAudioPlayer from './ui/players/HtmlAudioPlayer';
 
 class SyncPlayPlugin {
     name: string;
diff --git a/src/components/syncPlay/ui/groupSelectionMenu.js b/src/plugins/syncPlay/ui/groupSelectionMenu.js
similarity index 96%
rename from src/components/syncPlay/ui/groupSelectionMenu.js
rename to src/plugins/syncPlay/ui/groupSelectionMenu.js
index 807899773f..106ee8e42d 100644
--- a/src/components/syncPlay/ui/groupSelectionMenu.js
+++ b/src/plugins/syncPlay/ui/groupSelectionMenu.js
@@ -1,12 +1,12 @@
 import { Events } from 'jellyfin-apiclient';
 import SyncPlay from '../core';
 import SyncPlaySettingsEditor from './settings/SettingsEditor';
-import loading from '../../loading/loading';
-import toast from '../../toast/toast';
-import actionsheet from '../../actionSheet/actionSheet';
+import loading from '../../../components/loading/loading';
+import toast from '../../../components/toast/toast';
+import actionsheet from '../../../components/actionSheet/actionSheet';
 import globalize from '../../../scripts/globalize';
 import playbackPermissionManager from './playbackPermissionManager';
-import ServerConnections from '../../ServerConnections';
+import ServerConnections from '../../../components/ServerConnections';
 import './groupSelectionMenu.scss';
 
 /**
diff --git a/src/components/syncPlay/ui/groupSelectionMenu.scss b/src/plugins/syncPlay/ui/groupSelectionMenu.scss
similarity index 100%
rename from src/components/syncPlay/ui/groupSelectionMenu.scss
rename to src/plugins/syncPlay/ui/groupSelectionMenu.scss
diff --git a/src/components/syncPlay/ui/playbackPermissionManager.js b/src/plugins/syncPlay/ui/playbackPermissionManager.js
similarity index 96%
rename from src/components/syncPlay/ui/playbackPermissionManager.js
rename to src/plugins/syncPlay/ui/playbackPermissionManager.js
index 2a70d7370a..816b57bca9 100644
--- a/src/components/syncPlay/ui/playbackPermissionManager.js
+++ b/src/plugins/syncPlay/ui/playbackPermissionManager.js
@@ -1,4 +1,4 @@
-import { appHost } from '../../apphost';
+import { appHost } from '../../../components/apphost';
 
 /**
  * Creates an audio element that plays a silent sound.
diff --git a/src/components/syncPlay/ui/players/HtmlAudioPlayer.js b/src/plugins/syncPlay/ui/players/HtmlAudioPlayer.js
similarity index 100%
rename from src/components/syncPlay/ui/players/HtmlAudioPlayer.js
rename to src/plugins/syncPlay/ui/players/HtmlAudioPlayer.js
diff --git a/src/components/syncPlay/ui/players/HtmlVideoPlayer.js b/src/plugins/syncPlay/ui/players/HtmlVideoPlayer.js
similarity index 100%
rename from src/components/syncPlay/ui/players/HtmlVideoPlayer.js
rename to src/plugins/syncPlay/ui/players/HtmlVideoPlayer.js
diff --git a/src/components/syncPlay/ui/players/NoActivePlayer.js b/src/plugins/syncPlay/ui/players/NoActivePlayer.js
similarity index 99%
rename from src/components/syncPlay/ui/players/NoActivePlayer.js
rename to src/plugins/syncPlay/ui/players/NoActivePlayer.js
index 699d31517b..c5f528938d 100644
--- a/src/components/syncPlay/ui/players/NoActivePlayer.js
+++ b/src/plugins/syncPlay/ui/players/NoActivePlayer.js
@@ -3,7 +3,7 @@
  * @module components/syncPlay/ui/players/NoActivePlayer
  */
 
-import { playbackManager } from '../../../playback/playbackmanager';
+import { playbackManager } from '../../../../components/playback/playbackmanager';
 import SyncPlay from '../../core';
 import QueueManager from './QueueManager';
 
diff --git a/src/components/syncPlay/ui/players/QueueManager.js b/src/plugins/syncPlay/ui/players/QueueManager.js
similarity index 100%
rename from src/components/syncPlay/ui/players/QueueManager.js
rename to src/plugins/syncPlay/ui/players/QueueManager.js
diff --git a/src/components/syncPlay/ui/settings/SettingsEditor.js b/src/plugins/syncPlay/ui/settings/SettingsEditor.js
similarity index 93%
rename from src/components/syncPlay/ui/settings/SettingsEditor.js
rename to src/plugins/syncPlay/ui/settings/SettingsEditor.js
index 3f90725145..ede7e267a3 100644
--- a/src/components/syncPlay/ui/settings/SettingsEditor.js
+++ b/src/plugins/syncPlay/ui/settings/SettingsEditor.js
@@ -6,10 +6,10 @@
 import { Events } from 'jellyfin-apiclient';
 import SyncPlay from '../../core';
 import { setSetting } from '../../core/Settings';
-import dialogHelper from '../../../dialogHelper/dialogHelper';
-import layoutManager from '../../../layoutManager';
-import loading from '../../../loading/loading';
-import toast from '../../../toast/toast';
+import dialogHelper from '../../../../components/dialogHelper/dialogHelper';
+import layoutManager from '../../../../components/layoutManager';
+import loading from '../../../../components/loading/loading';
+import toast from '../../../../components/toast/toast';
 import globalize from '../../../../scripts/globalize';
 
 import 'material-design-icons-iconfont';
@@ -18,8 +18,8 @@ import '../../../../elements/emby-select/emby-select';
 import '../../../../elements/emby-button/emby-button';
 import '../../../../elements/emby-button/paper-icon-button-light';
 import '../../../../elements/emby-checkbox/emby-checkbox';
-import '../../../listview/listview.scss';
-import '../../../formdialog.scss';
+import '../../../../components/listview/listview.scss';
+import '../../../../components/formdialog.scss';
 
 function centerFocus(elem, horiz, on) {
     import('../../../../scripts/scrollHelper').then((scrollHelper) => {
diff --git a/src/components/syncPlay/ui/settings/editor.html b/src/plugins/syncPlay/ui/settings/editor.html
similarity index 100%
rename from src/components/syncPlay/ui/settings/editor.html
rename to src/plugins/syncPlay/ui/settings/editor.html
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 81f819f809..5cf5be305d 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -9,7 +9,7 @@ import viewManager from '../components/viewManager/viewManager';
 import { appRouter } from '../components/appRouter';
 import { appHost } from '../components/apphost';
 import { playbackManager } from '../components/playback/playbackmanager';
-import groupSelectionMenu from '../components/syncPlay/ui/groupSelectionMenu';
+import groupSelectionMenu from '../plugins/syncPlay/ui/groupSelectionMenu';
 import browser from './browser';
 import globalize from './globalize';
 import imageHelper from './imagehelper';
diff --git a/src/scripts/serverNotifications.js b/src/scripts/serverNotifications.js
index 73a10bcbde..e8b58ce0fe 100644
--- a/src/scripts/serverNotifications.js
+++ b/src/scripts/serverNotifications.js
@@ -1,5 +1,5 @@
 import { playbackManager } from '../components/playback/playbackmanager';
-import SyncPlay from '../components/syncPlay/core';
+import SyncPlay from '../plugins/syncPlay/core';
 import { Events } from 'jellyfin-apiclient';
 import inputManager from '../scripts/inputManager';
 import focusManager from '../components/focusManager';