diff --git a/JellyfinPlayer tvOS/VideoPlayer/AudioView.swift b/JellyfinPlayer tvOS/Views/VideoPlayer/AudioView.swift
similarity index 100%
rename from JellyfinPlayer tvOS/VideoPlayer/AudioView.swift
rename to JellyfinPlayer tvOS/Views/VideoPlayer/AudioView.swift
diff --git a/JellyfinPlayer tvOS/VideoPlayer/InfoTabBarViewController.swift b/JellyfinPlayer tvOS/Views/VideoPlayer/InfoTabBarViewController.swift
similarity index 100%
rename from JellyfinPlayer tvOS/VideoPlayer/InfoTabBarViewController.swift
rename to JellyfinPlayer tvOS/Views/VideoPlayer/InfoTabBarViewController.swift
diff --git a/JellyfinPlayer tvOS/VideoPlayer/MediaInfoView.swift b/JellyfinPlayer tvOS/Views/VideoPlayer/MediaInfoView.swift
similarity index 100%
rename from JellyfinPlayer tvOS/VideoPlayer/MediaInfoView.swift
rename to JellyfinPlayer tvOS/Views/VideoPlayer/MediaInfoView.swift
diff --git a/JellyfinPlayer tvOS/VideoPlayer/SubtitlesView.swift b/JellyfinPlayer tvOS/Views/VideoPlayer/SubtitlesView.swift
similarity index 100%
rename from JellyfinPlayer tvOS/VideoPlayer/SubtitlesView.swift
rename to JellyfinPlayer tvOS/Views/VideoPlayer/SubtitlesView.swift
diff --git a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayer.storyboard b/JellyfinPlayer tvOS/Views/VideoPlayer/VideoPlayer.storyboard
similarity index 100%
rename from JellyfinPlayer tvOS/VideoPlayer/VideoPlayer.storyboard
rename to JellyfinPlayer tvOS/Views/VideoPlayer/VideoPlayer.storyboard
diff --git a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayer.swift b/JellyfinPlayer tvOS/Views/VideoPlayer/VideoPlayer.swift
similarity index 100%
rename from JellyfinPlayer tvOS/VideoPlayer/VideoPlayer.swift
rename to JellyfinPlayer tvOS/Views/VideoPlayer/VideoPlayer.swift
diff --git a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift b/JellyfinPlayer tvOS/Views/VideoPlayer/VideoPlayerViewController.swift
similarity index 100%
rename from JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift
rename to JellyfinPlayer tvOS/Views/VideoPlayer/VideoPlayerViewController.swift
diff --git a/JellyfinPlayer.xcodeproj/project.pbxproj b/JellyfinPlayer.xcodeproj/project.pbxproj
index 5107069a..03015608 100644
--- a/JellyfinPlayer.xcodeproj/project.pbxproj
+++ b/JellyfinPlayer.xcodeproj/project.pbxproj
@@ -726,7 +726,6 @@
 				53ABFDDA267972BF00886593 /* JellyfinPlayer tvOS.entitlements */,
 				535870682669D21700D05A09 /* Preview Content */,
 				531690F8267AD135005D8AB9 /* README.md */,
-				5310694F2684E7EE00CFFDBA /* VideoPlayer */,
 				E12186E02718F23B0010884C /* Views */,
 			);
 			path = "JellyfinPlayer tvOS";
@@ -819,10 +818,6 @@
 				5377CC02263B596B003A4E83 /* Info.plist */,
 				53AD124C2670278D0094A276 /* JellyfinPlayer.entitlements */,
 				5377CBFA263B596B003A4E83 /* Preview Content */,
-				53313B8F265EEA6D00947AA3 /* VideoPlayer.storyboard */,
-				535BAEA4264A151C005FA86D /* VideoPlayer.swift */,
-				532E68CE267D9F6B007B9F13 /* VideoPlayerCastDeviceSelector.swift */,
-				0959A5FC2686D29800C7C9A9 /* VideoUpNextView.swift */,
 				E13DD3D027165886009D4DAF /* Views */,
 			);
 			path = JellyfinPlayer;
@@ -1111,6 +1106,7 @@
 				53116A16268B919A003024C9 /* SeriesItemView.swift */,
 				5398514426B64DA100101B49 /* SettingsView.swift */,
 				53ABFDDD267974E300886593 /* SplashView.swift */,
+				5310694F2684E7EE00CFFDBA /* VideoPlayer */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1154,6 +1150,7 @@
 				625CB5672678B6FB00530A6E /* SplashView.swift */,
 				E13DD3FB2717EAE8009D4DAF /* UserListView.swift */,
 				E13DD3F4271793BB009D4DAF /* UserSignInView.swift */,
+				E193D5452719418B00900D82 /* VideoPlayer */,
 				53F8377C265FF67C00F456B3 /* VideoPlayerSettingsView.swift */,
 			);
 			path = Views;
@@ -1211,6 +1208,17 @@
 			path = MainCoordinator;
 			sourceTree = "<group>";
 		};
+		E193D5452719418B00900D82 /* VideoPlayer */ = {
+			isa = PBXGroup;
+			children = (
+				53313B8F265EEA6D00947AA3 /* VideoPlayer.storyboard */,
+				535BAEA4264A151C005FA86D /* VideoPlayer.swift */,
+				532E68CE267D9F6B007B9F13 /* VideoPlayerCastDeviceSelector.swift */,
+				0959A5FC2686D29800C7C9A9 /* VideoUpNextView.swift */,
+			);
+			path = VideoPlayer;
+			sourceTree = "<group>";
+		};
 		E1AD105226D96D5F003E4A08 /* JellyfinAPIExtensions */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/JellyfinPlayer/VideoPlayer.storyboard b/JellyfinPlayer/Views/VideoPlayer/VideoPlayer.storyboard
similarity index 100%
rename from JellyfinPlayer/VideoPlayer.storyboard
rename to JellyfinPlayer/Views/VideoPlayer/VideoPlayer.storyboard
diff --git a/JellyfinPlayer/VideoPlayer.swift b/JellyfinPlayer/Views/VideoPlayer/VideoPlayer.swift
similarity index 100%
rename from JellyfinPlayer/VideoPlayer.swift
rename to JellyfinPlayer/Views/VideoPlayer/VideoPlayer.swift
diff --git a/JellyfinPlayer/VideoPlayerCastDeviceSelector.swift b/JellyfinPlayer/Views/VideoPlayer/VideoPlayerCastDeviceSelector.swift
similarity index 100%
rename from JellyfinPlayer/VideoPlayerCastDeviceSelector.swift
rename to JellyfinPlayer/Views/VideoPlayer/VideoPlayerCastDeviceSelector.swift
diff --git a/JellyfinPlayer/VideoUpNextView.swift b/JellyfinPlayer/Views/VideoPlayer/VideoUpNextView.swift
similarity index 100%
rename from JellyfinPlayer/VideoUpNextView.swift
rename to JellyfinPlayer/Views/VideoPlayer/VideoUpNextView.swift