diff --git a/osu.Game.Tests/Visual/TestCaseRoomSettings.cs b/osu.Game.Tests/Visual/TestCaseRoomSettings.cs
index 40742ce709..55e3df679d 100644
--- a/osu.Game.Tests/Visual/TestCaseRoomSettings.cs
+++ b/osu.Game.Tests/Visual/TestCaseRoomSettings.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing.Input;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Screens.Match.Settings;
+using osu.Game.Screens.Multi.Components;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual
diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs b/osu.Game/Screens/Multi/Components/GameTypePicker.cs
similarity index 97%
rename from osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs
rename to osu.Game/Screens/Multi/Components/GameTypePicker.cs
index cd8b081b4e..9058185e28 100644
--- a/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs
+++ b/osu.Game/Screens/Multi/Components/GameTypePicker.cs
@@ -9,10 +9,9 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Screens.Match.Settings
+namespace osu.Game.Screens.Multi.Components
 {
     public class GameTypePicker : TabControl<GameType>
     {
diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs b/osu.Game/Screens/Multi/Components/RoomAvailabilityPicker.cs
similarity index 98%
rename from osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs
rename to osu.Game/Screens/Multi/Components/RoomAvailabilityPicker.cs
index 251bd062ec..f0a2a2e8dc 100644
--- a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs
+++ b/osu.Game/Screens/Multi/Components/RoomAvailabilityPicker.cs
@@ -13,7 +13,7 @@ using osu.Game.Online.Multiplayer;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Screens.Match.Settings
+namespace osu.Game.Screens.Multi.Components
 {
     public class RoomAvailabilityPicker : TabControl<RoomAvailability>
     {
diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs b/osu.Game/Screens/Multi/Components/RoomSettingsOverlay.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs
rename to osu.Game/Screens/Multi/Components/RoomSettingsOverlay.cs
index d45ba48f0e..df70e577d5 100644
--- a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Components/RoomSettingsOverlay.cs
@@ -14,7 +14,7 @@ using osu.Game.Overlays.SearchableList;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Screens.Match.Settings
+namespace osu.Game.Screens.Multi.Components
 {
     public class RoomSettingsOverlay : FocusedOverlayContainer
     {
diff --git a/osu.Game/Screens/Multi/Screens/Match/Match.cs b/osu.Game/Screens/Multi/Screens/Match/Match.cs
index f7d98df60e..5bfc1f59bd 100644
--- a/osu.Game/Screens/Multi/Screens/Match/Match.cs
+++ b/osu.Game/Screens/Multi/Screens/Match/Match.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Screens.Match.Settings;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Select;
 using osu.Game.Users;