diff --git a/osu.Game.Tournament.Tests/LadderTestScene.cs b/osu.Game.Tournament.Tests/LadderTestScene.cs
index cb55f543f6..5bb8112157 100644
--- a/osu.Game.Tournament.Tests/LadderTestScene.cs
+++ b/osu.Game.Tournament.Tests/LadderTestScene.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Tests.Visual;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests
 {
diff --git a/osu.Game.Tournament.Tests/TestSceneGroupingsEditorScreen.cs b/osu.Game.Tournament.Tests/TestSceneGroupingsEditorScreen.cs
index 0ef19c2948..e0a6f8e8b9 100644
--- a/osu.Game.Tournament.Tests/TestSceneGroupingsEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/TestSceneGroupingsEditorScreen.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Game.Tournament.Screens.Rounds;
+using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests
 {
diff --git a/osu.Game.Tournament.Tests/TestSceneMatchPairings.cs b/osu.Game.Tournament.Tests/TestSceneMatchPairings.cs
index 611e87717a..42b68d654c 100644
--- a/osu.Game.Tournament.Tests/TestSceneMatchPairings.cs
+++ b/osu.Game.Tournament.Tests/TestSceneMatchPairings.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder.Components;
 
 namespace osu.Game.Tournament.Tests
diff --git a/osu.Game.Tournament.Tests/TestSceneSceneManager.cs b/osu.Game.Tournament.Tests/TestSceneSceneManager.cs
index 385dc09d58..aa333e39b1 100644
--- a/osu.Game.Tournament.Tests/TestSceneSceneManager.cs
+++ b/osu.Game.Tournament.Tests/TestSceneSceneManager.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
 using osu.Game.Tests.Visual;
-using osu.Game.Tournament.Screens;
 
 namespace osu.Game.Tournament.Tests
 {
diff --git a/osu.Game.Tournament.Tests/TestSceneTeamIntro.cs b/osu.Game.Tournament.Tests/TestSceneTeamIntro.cs
index 560a8f9521..9f0d59fcbc 100644
--- a/osu.Game.Tournament.Tests/TestSceneTeamIntro.cs
+++ b/osu.Game.Tournament.Tests/TestSceneTeamIntro.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.TeamIntro;
 
 namespace osu.Game.Tournament.Tests
diff --git a/osu.Game.Tournament.Tests/TestSceneTeamWin.cs b/osu.Game.Tournament.Tests/TestSceneTeamWin.cs
index 9f642103de..8beeb50513 100644
--- a/osu.Game.Tournament.Tests/TestSceneTeamWin.cs
+++ b/osu.Game.Tournament.Tests/TestSceneTeamWin.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.TeamWin;
 
 namespace osu.Game.Tournament.Tests
diff --git a/osu.Game.Tournament.Tests/TestSceneTeamsEditorScreen.cs b/osu.Game.Tournament.Tests/TestSceneTeamsEditorScreen.cs
index d3268219b3..60323e1d84 100644
--- a/osu.Game.Tournament.Tests/TestSceneTeamsEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/TestSceneTeamsEditorScreen.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Game.Tournament.Screens.Teams;
+using osu.Game.Tournament.Screens.Editors;
 
 namespace osu.Game.Tournament.Tests
 {
diff --git a/osu.Game.Tournament.Tests/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/TestSceneTournamentMatchChatDisplay.cs
index 8a3950bac3..125bf5679c 100644
--- a/osu.Game.Tournament.Tests/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/TestSceneTournamentMatchChatDisplay.cs
@@ -8,7 +8,7 @@ using osu.Game.Online.Chat;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Users;
 
 namespace osu.Game.Tournament.Tests
diff --git a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
index 704d5a47de..361bd92770 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Components
 {
diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index cf826ee2c7..aee7f914e7 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -16,7 +16,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 2afbb0f5ff..48c5b9bd35 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays.Chat;
 using osu.Game.Tournament.IPC;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 438e32c20f..23ebe2f39c 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.IPC
 {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/BeatmapChoice.cs b/osu.Game.Tournament/Models/BeatmapChoice.cs
similarity index 92%
rename from osu.Game.Tournament/Screens/Ladder/Components/BeatmapChoice.cs
rename to osu.Game.Tournament/Models/BeatmapChoice.cs
index bb9ed39b82..c22077553b 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/BeatmapChoice.cs
+++ b/osu.Game.Tournament/Models/BeatmapChoice.cs
@@ -4,7 +4,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace osu.Game.Tournament.Screens.Ladder.Components
+namespace osu.Game.Tournament.Models
 {
     public class BeatmapChoice
     {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorInfo.cs b/osu.Game.Tournament/Models/LadderEditorInfo.cs
similarity index 85%
rename from osu.Game.Tournament/Screens/Ladder/Components/LadderEditorInfo.cs
rename to osu.Game.Tournament/Models/LadderEditorInfo.cs
index d6b5d172de..9bf01e76f5 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorInfo.cs
+++ b/osu.Game.Tournament/Models/LadderEditorInfo.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Bindables;
 
-namespace osu.Game.Tournament.Screens.Ladder.Components
+namespace osu.Game.Tournament.Models
 {
     public class LadderEditorInfo
     {
diff --git a/osu.Game.Tournament/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
similarity index 86%
rename from osu.Game.Tournament/LadderInfo.cs
rename to osu.Game.Tournament/Models/LadderInfo.cs
index fc825d1a9c..2fdf1b06b1 100644
--- a/osu.Game.Tournament/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -4,10 +4,8 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
-using osu.Game.Tournament.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
 
-namespace osu.Game.Tournament
+namespace osu.Game.Tournament.Models
 {
     public class LadderInfo
     {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/MatchPairing.cs b/osu.Game.Tournament/Models/MatchPairing.cs
similarity index 97%
rename from osu.Game.Tournament/Screens/Ladder/Components/MatchPairing.cs
rename to osu.Game.Tournament/Models/MatchPairing.cs
index 4ff2df1388..caafe8af47 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/MatchPairing.cs
+++ b/osu.Game.Tournament/Models/MatchPairing.cs
@@ -6,10 +6,10 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
-using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Screens.Ladder.Components;
 using SixLabors.Primitives;
 
-namespace osu.Game.Tournament.Screens.Ladder.Components
+namespace osu.Game.Tournament.Models
 {
     /// <summary>
     /// A collection of two teams competing in a head-to-head match.
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/RoundBeatmap.cs b/osu.Game.Tournament/Models/RoundBeatmap.cs
similarity index 84%
rename from osu.Game.Tournament/Screens/Ladder/Components/RoundBeatmap.cs
rename to osu.Game.Tournament/Models/RoundBeatmap.cs
index ef608c3f06..5d43d0ca66 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/RoundBeatmap.cs
+++ b/osu.Game.Tournament/Models/RoundBeatmap.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Beatmaps;
 
-namespace osu.Game.Tournament.Screens.Ladder.Components
+namespace osu.Game.Tournament.Models
 {
     public class RoundBeatmap
     {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/TournamentProgression.cs b/osu.Game.Tournament/Models/TournamentProgression.cs
similarity index 92%
rename from osu.Game.Tournament/Screens/Ladder/Components/TournamentProgression.cs
rename to osu.Game.Tournament/Models/TournamentProgression.cs
index 0019dc8d79..4ef4be599d 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/TournamentProgression.cs
+++ b/osu.Game.Tournament/Models/TournamentProgression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace osu.Game.Tournament.Screens.Ladder.Components
+namespace osu.Game.Tournament.Models
 {
     public class TournamentProgression
     {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/TournamentRound.cs b/osu.Game.Tournament/Models/TournamentRound.cs
similarity index 94%
rename from osu.Game.Tournament/Screens/Ladder/Components/TournamentRound.cs
rename to osu.Game.Tournament/Models/TournamentRound.cs
index 79b94e06a2..6fe4b20fa5 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/TournamentRound.cs
+++ b/osu.Game.Tournament/Models/TournamentRound.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 
-namespace osu.Game.Tournament.Screens.Ladder.Components
+namespace osu.Game.Tournament.Models
 {
     [Serializable]
     public class TournamentRound
diff --git a/osu.Game.Tournament/Components/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
similarity index 97%
rename from osu.Game.Tournament/Components/TournamentTeam.cs
rename to osu.Game.Tournament/Models/TournamentTeam.cs
index 043dcc7084..eea1ef8104 100644
--- a/osu.Game.Tournament/Components/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Users;
 
-namespace osu.Game.Tournament.Components
+namespace osu.Game.Tournament.Models
 {
     [Serializable]
     public class TournamentTeam
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
index adeead277c..549ff26018 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs
index 6e56dca2fb..8a66ca7bf6 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/GroupContainer.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osuTK;
 
 namespace osu.Game.Tournament.Screens.Drawings.Components
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs b/osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs
index a532f47176..09208818a9 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ITeamList.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Drawings.Components
 {
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index 486ce7fe74..b147d680f0 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
index ca3536965f..f96ec01cbb 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Drawings.Components
 {
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index 2ef7f513b6..52ba73c27c 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Drawings.Components;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
similarity index 97%
rename from osu.Game.Tournament/Screens/Ladder/LadderEditorScreen.cs
rename to osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index fc98753e0a..9b298df91d 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -11,12 +11,14 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.Ladder.Components;
 using osuTK;
 using osuTK.Graphics;
 using SixLabors.Primitives;
 
-namespace osu.Game.Tournament.Screens.Ladder
+namespace osu.Game.Tournament.Screens.Editors
 {
     [Cached]
     public class LadderEditorScreen : LadderScreen, IHasContextMenu
diff --git a/osu.Game.Tournament/Screens/Rounds/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
similarity index 98%
rename from osu.Game.Tournament/Screens/Rounds/RoundEditorScreen.cs
rename to osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 69808032cc..c8c2461b10 100644
--- a/osu.Game.Tournament/Screens/Rounds/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -11,10 +11,10 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osuTK;
 
-namespace osu.Game.Tournament.Screens.Rounds
+namespace osu.Game.Tournament.Screens.Editors
 {
     public class RoundEditorScreen : TournamentScreen, IProvideVideo
     {
diff --git a/osu.Game.Tournament/Screens/Teams/TeamsEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamsEditorScreen.cs
similarity index 99%
rename from osu.Game.Tournament/Screens/Teams/TeamsEditorScreen.cs
rename to osu.Game.Tournament/Screens/Editors/TeamsEditorScreen.cs
index 8f536361c3..1bf3f1c6b9 100644
--- a/osu.Game.Tournament/Screens/Teams/TeamsEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamsEditorScreen.cs
@@ -14,10 +14,11 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Users;
 using osuTK;
 
-namespace osu.Game.Tournament.Screens.Teams
+namespace osu.Game.Tournament.Screens.Editors
 {
     public class TeamsEditorScreen : TournamentScreen, IProvideVideo
     {
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 71cfacdc32..e75872cda4 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Showcase;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
index fc28ddccfd..78455c8bb7 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.IPC;
+using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index fad1919510..7b108731f3 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -10,8 +10,8 @@ using osu.Framework.Threading;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Gameplay.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
 using osu.Game.Tournament.Screens.MapPool;
 using osu.Game.Tournament.Screens.TeamWin;
 using osuTK;
diff --git a/osu.Game.Tournament/Screens/IProvideVideo.cs b/osu.Game.Tournament/Screens/IProvideVideo.cs
index c11c921412..61989d8448 100644
--- a/osu.Game.Tournament/Screens/IProvideVideo.cs
+++ b/osu.Game.Tournament/Screens/IProvideVideo.cs
@@ -3,6 +3,9 @@
 
 namespace osu.Game.Tournament.Screens
 {
+    /// <summary>
+    /// Marker interface for a screen which provides its own local video background.
+    /// </summary>
     public interface IProvideVideo
     {
     }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/ConditionalMatchPairing.cs b/osu.Game.Tournament/Screens/Ladder/Components/ConditionalMatchPairing.cs
index 7831cac84d..f3b5678c7c 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/ConditionalMatchPairing.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ConditionalMatchPairing.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Tournament.Models;
+
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {
     /// <summary>
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs
index 35741cbb55..e48155ab0e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchPairing.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 6d5ac74267..5514dfce3e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -14,6 +14,8 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Editors;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
index 844c89a968..67d6bc4fa6 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index a4b74f00a2..d947215cfa 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -11,6 +11,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Overlays.Settings;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 6a77c6c20e..50675a6147 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -11,6 +11,8 @@ using osu.Framework.Graphics.Lines;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Editors;
 using osu.Game.Tournament.Screens.Ladder.Components;
 using osuTK.Graphics;
 
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 2c14dad38b..ab03adbce9 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -13,9 +13,9 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Gameplay;
 using osu.Game.Tournament.Screens.Gameplay.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 956dd836bb..457fb80141 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -12,6 +12,7 @@ using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder.Components;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 3bb26499bf..4e0bb23a62 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -9,7 +9,7 @@ using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Showcase;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 8360b17c39..0a37cf6c4a 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -9,7 +9,7 @@ using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Showcase;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game.Tournament/Screens/TournamentScreen.cs b/osu.Game.Tournament/Screens/TournamentScreen.cs
index 7f6c5f8e18..9d58ca2240 100644
--- a/osu.Game.Tournament/Screens/TournamentScreen.cs
+++ b/osu.Game.Tournament/Screens/TournamentScreen.cs
@@ -4,15 +4,16 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens
 {
-    public class TournamentScreen : CompositeDrawable
+    public abstract class TournamentScreen : CompositeDrawable
     {
         [Resolved]
         protected LadderInfo LadderInfo { get; private set; }
 
-        public TournamentScreen()
+        protected TournamentScreen()
         {
             RelativeSizeAxes = Axes.Both;
         }
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index c8c462a458..42e4ab3c13 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
-using osu.Game.Tournament.Screens;
 
 namespace osu.Game.Tournament
 {
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 49e626d057..e35e0b0d30 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -19,9 +19,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
-using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
-using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Tournament.Models;
 using osuTK.Input;
 
 namespace osu.Game.Tournament
diff --git a/osu.Game.Tournament/Screens/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
similarity index 97%
rename from osu.Game.Tournament/Screens/TournamentSceneManager.cs
rename to osu.Game.Tournament/TournamentSceneManager.cs
index 720e216e96..29f8eba579 100644
--- a/osu.Game.Tournament/Screens/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -10,20 +10,21 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Platform;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens;
 using osu.Game.Tournament.Screens.Drawings;
+using osu.Game.Tournament.Screens.Editors;
 using osu.Game.Tournament.Screens.Gameplay;
 using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.MapPool;
-using osu.Game.Tournament.Screens.Rounds;
 using osu.Game.Tournament.Screens.Schedule;
 using osu.Game.Tournament.Screens.Showcase;
 using osu.Game.Tournament.Screens.TeamIntro;
-using osu.Game.Tournament.Screens.Teams;
 using osu.Game.Tournament.Screens.TeamWin;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tournament.Screens
+namespace osu.Game.Tournament
 {
     [Cached]
     public class TournamentSceneManager : CompositeDrawable
diff --git a/osu.Game.Tournament/osu.Game.Tournament.csproj b/osu.Game.Tournament/osu.Game.Tournament.csproj
index 8adff80820..8412166250 100644
--- a/osu.Game.Tournament/osu.Game.Tournament.csproj
+++ b/osu.Game.Tournament/osu.Game.Tournament.csproj
@@ -10,4 +10,7 @@
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Screens\Rounds" />
+  </ItemGroup>
 </Project>
\ No newline at end of file