Move v2 files to final location

This contains only renames and namespace updates.

osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs

@@ -11,7 +11,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
-using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Tests.NonVisual.Filtering

osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs

@@ -32,7 +32,7 @@ using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Screens.Ranking;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Storyboards.Drawables;
 using osu.Game.Tests.Resources;
 using osuTK;

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs

@@ -15,7 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual.Metadata;
 using osu.Game.Tests.Visual.OnlinePlay;

osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs

@@ -15,7 +15,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Overlays;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing

osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs

@@ -14,7 +14,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Visual.Editing

osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs

@@ -125,7 +125,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         protected void AddBeatmapFromSongSelect(Func<BeatmapInfo> beatmap, RulesetInfo? ruleset = null, IReadOnlyList<Mod>? mods = null)
         {
-            Screens.SelectV2.SongSelect? songSelect = null;
+            Screens.Select.SongSelect? songSelect = null;
 
             AddStep("click add button", () =>
             {
@@ -133,7 +133,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.SelectV2.SongSelect) != null);
+            AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.Select.SongSelect) != null);
             AddUntilStep("wait for loaded", () => songSelect.IsCurrentScreen() && !songSelect.AsNonNull().IsFiltering);
 
             if (ruleset != null)

osu.Game.Tests/Visual/Multiplayer/TestSceneHostOnlyQueueMode.cs

@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void selectNewItem(Func<BeatmapInfo> beatmap)
         {
-            Screens.SelectV2.SongSelect? songSelect = null;
+            Screens.Select.SongSelect? songSelect = null;
 
             AddUntilStep("wait for playlist panels to load", () =>
             {
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.SelectV2.SongSelect) != null);
+            AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.Select.SongSelect) != null);
             AddUntilStep("wait for loaded", () => songSelect.IsCurrentScreen() && !songSelect.AsNonNull().IsFiltering);
 
             BeatmapInfo otherBeatmap = null!;

osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs

@@ -26,8 +26,8 @@ using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.GameplayTest;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Menu;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 using osuTK.Input;
 

osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Navigation

osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs

@@ -15,7 +15,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK.Input;
 

osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs

@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Extensions;
 using osu.Game.Configuration;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK.Input;
 

osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs

@@ -17,7 +17,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK.Input;
 

osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs

@@ -16,7 +16,7 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.Navigation
 {

osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs

@@ -18,8 +18,8 @@ using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
-using osu.Game.Screens.SelectV2;
-using FilterControl = osu.Game.Screens.SelectV2.FilterControl;
+using osu.Game.Screens.Select;
+using FilterControl = osu.Game.Screens.Select.FilterControl;
 
 namespace osu.Game.Tests.Visual.Navigation
 {

osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs

@@ -51,12 +51,13 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.Leaderboards;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Screens.Ranking;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Tests.Resources;
 using osu.Game.Utils;
 using osuTK;
 using osuTK.Input;
+using CollectionDropdown = osu.Game.Screens.Select.CollectionDropdown;
 
 namespace osu.Game.Tests.Visual.Navigation
 {
@@ -197,14 +198,14 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("set filter again", () => filterControlTextBox().Current.Value = "test");
             AddStep("open collections dropdown", () =>
             {
-                InputManager.MoveMouseTo(songSelect.ChildrenOfType<Screens.SelectV2.CollectionDropdown>().Single());
+                InputManager.MoveMouseTo(songSelect.ChildrenOfType<CollectionDropdown>().Single());
                 InputManager.Click(MouseButton.Left);
             });
 
             AddStep("press back once", () => InputManager.Click(MouseButton.Button1));
             AddAssert("still at song select", () => Game.ScreenStack.CurrentScreen == songSelect);
             AddAssert("collections dropdown closed", () => songSelect
-                                                           .ChildrenOfType<Screens.SelectV2.CollectionDropdown>().Single()
+                                                           .ChildrenOfType<CollectionDropdown>().Single()
                                                            .ChildrenOfType<Dropdown<CollectionFilterMenuItem>.DropdownMenu>().Single().State == MenuState.Closed);
 
             AddStep("press back a second time", () => InputManager.Click(MouseButton.Button1));
@@ -317,7 +318,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestAttemptPlayBeatmapWrongHashFails()
         {
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
 
             AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).GetResultSafely());
             PushAndConfirm(() => songSelect = new SoloSongSelect());
@@ -352,7 +353,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestAttemptPlayBeatmapMissingFails()
         {
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
 
             AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).GetResultSafely());
             PushAndConfirm(() => songSelect = new SoloSongSelect());
@@ -386,7 +387,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             Player player = null;
 
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
             PushAndConfirm(() => songSelect = new SoloSongSelect());
             AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented);
 
@@ -429,7 +430,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             Player player = null;
 
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
             PushAndConfirm(() => songSelect = new SoloSongSelect());
             AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented);
 
@@ -483,7 +484,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             Player player = null;
 
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
             PushAndConfirm(() => songSelect = new SoloSongSelect());
             AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented);
 
@@ -526,7 +527,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             Player player = null;
 
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
             PushAndConfirm(() => songSelect = new SoloSongSelect());
             AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented);
 
@@ -1194,9 +1195,9 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddStep("close settings sidebar", () => InputManager.Key(Key.Escape));
 
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
             AddRepeatStep("go to solo", () => InputManager.Key(Key.P), 3);
-            AddUntilStep("wait for song select", () => (songSelect = Game.ScreenStack.CurrentScreen as Screens.SelectV2.SongSelect) != null);
+            AddUntilStep("wait for song select", () => (songSelect = Game.ScreenStack.CurrentScreen as Screens.Select.SongSelect) != null);
             AddUntilStep("wait for beatmap sets loaded", () => songSelect.CarouselItemsPresented);
 
             AddStep("switch to osu! ruleset", () =>
@@ -1281,7 +1282,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitSongSelectAndImmediatelyClickLogo()
         {
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
             PushAndConfirm(() => songSelect = new SoloSongSelect());
             AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented);
 
@@ -1312,7 +1313,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             BeatmapSetInfo beatmap = null;
 
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
             PushAndConfirm(() => songSelect = new SoloSongSelect());
             AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented);
 
@@ -1371,7 +1372,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             IWorkingBeatmap beatmap() => Game.Beatmap.Value;
 
-            Screens.SelectV2.SongSelect songSelect = null;
+            Screens.Select.SongSelect songSelect = null;
             PushAndConfirm(() => songSelect = new SoloSongSelect());
             AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented);
 

osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs

@@ -27,7 +27,7 @@ using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK;

osu.Game.Tests/Visual/Navigation/TestSceneSongSelectNavigation.cs

@@ -24,17 +24,13 @@ using osu.Game.Screens.Footer;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Tests.Resources;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Navigation
 {
-    /// <summary>
-    /// Tests copied out of `TestSceneScreenNavigation` which are specific to song select.
-    /// These are for SongSelectV2. Eventually, the tests in the above class should be deleted along with old song select.
-    /// </summary>
     public partial class TestSceneSongSelectNavigation : OsuGameTestScene
     {
         [Test]
@@ -277,7 +273,7 @@ namespace osu.Game.Tests.Visual.Navigation
         /// <summary>
         /// Note: This test was written to demonstrate the failure described at https://github.com/ppy/osu/issues/35023,
         /// but because the failure scenario there entailed a race condition, it was possible for the test to pass regardless
-        /// unless <see cref="osu.Game.Screens.SelectV2.SongSelect.SELECTION_DEBOUNCE"/> was increased.
+        /// unless <see cref="osu.Game.Screens.Select.SongSelect.SELECTION_DEBOUNCE"/> was increased.
         /// </summary>
         [Test]
         public void TestPresentFromResults()

osu.Game.Tests/Visual/SongSelect/BeatmapCarouselFilterGroupingTest.cs

@@ -14,10 +14,9 @@ using osu.Game.Graphics.Carousel;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class BeatmapCarouselFilterGroupingTest

osu.Game.Tests/Visual/SongSelect/BeatmapCarouselFilterSortingTest.cs

@@ -12,10 +12,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.Carousel;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class BeatmapCarouselFilterSortingTest

osu.Game.Tests/Visual/SongSelect/BeatmapCarouselTestScene.cs

@@ -25,15 +25,13 @@ using osu.Game.Overlays;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
-using BeatmapCarousel = osu.Game.Screens.SelectV2.BeatmapCarousel;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public abstract partial class BeatmapCarouselTestScene : OsuManualInputManagerTestScene
     {

osu.Game.Tests/Visual/SongSelect/SongSelectComponentsTestScene.cs

@@ -9,7 +9,7 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Overlays;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public abstract partial class SongSelectComponentsTestScene : OsuManualInputManagerTestScene
     {

osu.Game.Tests/Visual/SongSelect/SongSelectTestScene.cs

@@ -23,11 +23,11 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Menu;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public abstract partial class SongSelectTestScene : ScreenTestScene
     {
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
         private RealmDetachedBeatmapStore beatmapStore = null!;
 
-        protected Screens.SelectV2.SongSelect SongSelect { get; private set; } = null!;
+        protected Screens.Select.SongSelect SongSelect { get; private set; } = null!;
         protected BeatmapCarousel Carousel => SongSelect.ChildrenOfType<BeatmapCarousel>().Single();
 
         [Cached]

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs

@@ -10,11 +10,11 @@ using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     /// <summary>
     /// Covers common steps which can be used for manual testing.

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselArtistGrouping.cs

@@ -7,12 +7,12 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Graphics.Carousel;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselArtistGrouping : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselCollectionGrouping.cs

@@ -8,7 +8,7 @@ using osu.Framework.Testing;
 using osu.Game.Collections;
 using osu.Game.Screens.Select.Filter;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselCollectionGrouping : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselDifficultyGrouping.cs

@@ -5,11 +5,11 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Carousel;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselDifficultyGrouping : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselFiltering.cs

@@ -9,11 +9,11 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselFiltering : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselNoGrouping.cs

@@ -4,12 +4,12 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselNoGrouping : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselRandom.cs

@@ -5,10 +5,10 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselRandom : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselScrolling.cs

@@ -5,9 +5,9 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Testing;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselScrolling : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselSetsSplitApart.cs

@@ -6,10 +6,10 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselSetsSplitApart : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselUpdateHandling.cs

@@ -12,11 +12,11 @@ using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     public partial class TestSceneBeatmapCarouselUpdateHandling : BeatmapCarouselTestScene

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapFilterControl.cs

@@ -4,9 +4,9 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneBeatmapFilterControl : SongSelectComponentsTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardScore.cs

@@ -21,13 +21,13 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneBeatmapLeaderboardScore : SongSelectComponentsTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardSorting.cs

@@ -24,11 +24,11 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneBeatmapLeaderboardSorting : SongSelectComponentsTestScene
     {
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
         private LeaderboardManager leaderboardManager = null!;
 
-        private readonly IBindable<Screens.SelectV2.SongSelect.BeatmapSetLookupResult?> onlineLookupResult = new Bindable<Screens.SelectV2.SongSelect.BeatmapSetLookupResult?>();
+        private readonly IBindable<Screens.Select.SongSelect.BeatmapSetLookupResult?> onlineLookupResult = new Bindable<Screens.Select.SongSelect.BeatmapSetLookupResult?>();
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardWedge.cs

@@ -26,12 +26,12 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.Leaderboards;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneBeatmapLeaderboardWedge : SongSelectComponentsTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataWedge.cs

@@ -13,16 +13,16 @@ using osu.Game.Extensions;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Models;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneBeatmapMetadataWedge : SongSelectComponentsTestScene
     {
         private BeatmapMetadataWedge wedge = null!;
 
-        [Cached(typeof(IBindable<Screens.SelectV2.SongSelect.BeatmapSetLookupResult?>))]
-        private Bindable<Screens.SelectV2.SongSelect.BeatmapSetLookupResult?> onlineLookupResult = new Bindable<Screens.SelectV2.SongSelect.BeatmapSetLookupResult?>();
+        [Cached(typeof(IBindable<Screens.Select.SongSelect.BeatmapSetLookupResult?>))]
+        private Bindable<Screens.Select.SongSelect.BeatmapSetLookupResult?> onlineLookupResult = new Bindable<Screens.Select.SongSelect.BeatmapSetLookupResult?>();
 
         protected override void LoadComplete()
         {
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
                 working.BeatmapInfo.OnlineID = 0;
 
                 Beatmap.Value = working;
-                onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(null);
+                onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(null);
             });
         }
 
@@ -154,7 +154,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
                 var (working, _) = createTestBeatmap();
 
                 Beatmap.Value = working;
-                onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(null);
+                onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(null);
             });
             AddAssert("rating wedge still hidden", () => !wedge.RatingsVisible);
             AddAssert("fail time wedge still hidden", () => !wedge.FailRetryVisible);
@@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
                 var (working, online) = createTestBeatmap();
 
                 Beatmap.Value = working;
-                onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.InProgress();
+                onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.InProgress();
                 Scheduler.AddDelayed(() => onlineLookupResult.Value = online, 500);
             });
             AddWaitStep("wait", 5);
@@ -203,7 +203,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
                 online.Result!.RelatedTags[2].Name = "some/tag";
 
                 Beatmap.Value = working;
-                onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.InProgress();
+                onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.InProgress();
                 Scheduler.AddDelayed(() => onlineLookupResult.Value = online, 500);
             });
             AddWaitStep("wait", 5);
@@ -217,7 +217,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
                 working.BeatmapSetInfo.Beatmaps.Single().Metadata.UserTags.Clear();
 
                 Beatmap.Value = working;
-                onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.InProgress();
+                onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.InProgress();
                 Scheduler.AddDelayed(() => onlineLookupResult.Value = online, 500);
             });
             AddWaitStep("wait", 5);
@@ -231,13 +231,13 @@ namespace osu.Game.Tests.Visual.SongSelectV2
                 working.BeatmapSetInfo.Beatmaps.Single().Metadata.UserTags.Clear();
 
                 Beatmap.Value = working;
-                onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.InProgress();
+                onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.InProgress();
                 Scheduler.AddDelayed(() => onlineLookupResult.Value = online, 500);
             });
             AddWaitStep("wait", 5);
         }
 
-        private (WorkingBeatmap, Screens.SelectV2.SongSelect.BeatmapSetLookupResult) createTestBeatmap()
+        private (WorkingBeatmap, Screens.Select.SongSelect.BeatmapSetLookupResult) createTestBeatmap()
         {
             var working = CreateWorkingBeatmap(Ruleset.Value);
             var onlineSet = new APIBeatmapSet
@@ -292,7 +292,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             working.BeatmapSetInfo.DateSubmitted = DateTimeOffset.Now;
             working.BeatmapSetInfo.DateRanked = DateTimeOffset.Now;
             working.Metadata.UserTags.AddRange(onlineSet.RelatedTags.Select(t => t.Name));
-            return (working, Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(onlineSet));
+            return (working, Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(onlineSet));
         }
     }
 }

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs

@@ -23,7 +23,7 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osu.Game.Utils;

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedge.cs

@@ -29,11 +29,10 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Skinning;
-using osu.Game.Tests.Visual.SongSelect;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneBeatmapTitleWedge : SongSelectComponentsTestScene
     {
@@ -42,8 +41,8 @@ namespace osu.Game.Tests.Visual.SongSelectV2
         private BeatmapTitleWedge titleWedge = null!;
         private BeatmapTitleWedge.DifficultyDisplay difficultyDisplay => titleWedge.ChildrenOfType<BeatmapTitleWedge.DifficultyDisplay>().Single();
 
-        [Cached(typeof(IBindable<Screens.SelectV2.SongSelect.BeatmapSetLookupResult?>))]
-        private Bindable<Screens.SelectV2.SongSelect.BeatmapSetLookupResult?> onlineLookupResult = new Bindable<Screens.SelectV2.SongSelect.BeatmapSetLookupResult?>();
+        [Cached(typeof(IBindable<Screens.Select.SongSelect.BeatmapSetLookupResult?>))]
+        private Bindable<Screens.Select.SongSelect.BeatmapSetLookupResult?> onlineLookupResult = new Bindable<Screens.Select.SongSelect.BeatmapSetLookupResult?>();
 
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
@@ -86,7 +85,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
             foreach (var rulesetInfo in rulesets.AvailableRulesets)
             {
-                var testBeatmap = TestSceneBeatmapInfoWedge.CreateTestBeatmap(rulesetInfo);
+                var testBeatmap = createTestBeatmapFromRuleset(rulesetInfo);
 
                 setRuleset(rulesetInfo);
                 selectBeatmap(testBeatmap);
@@ -108,7 +107,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
         public void TestBPMUpdates()
         {
             const double bpm = 120;
-            IBeatmap beatmap = TestSceneBeatmapInfoWedge.CreateTestBeatmap(new OsuRuleset().RulesetInfo);
+            IBeatmap beatmap = createTestBeatmapFromRuleset(new OsuRuleset().RulesetInfo);
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 60 * 1000 / bpm });
 
             OsuModDoubleTime doubleTime = null!;
@@ -160,7 +159,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
                 var (working, _) = createTestBeatmap();
 
                 Beatmap.Value = working;
-                onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(null);
+                onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(null);
             });
             AddUntilStep("play count is -", () => this.ChildrenOfType<BeatmapTitleWedge.Statistic>().ElementAt(0).Text.ToString(), () => Is.EqualTo("-"));
             AddUntilStep("favourites count is -", () => this.ChildrenOfType<BeatmapTitleWedge.FavouriteButton>().Single().Text.ToString(), () => Is.EqualTo("-"));
@@ -255,7 +254,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
         [TestCase(120, 120.4, "DT", "180-181 (mostly 180)")]
         public void TestVaryingBPM(double commonBpm, double otherBpm, string? mod, string expectedDisplay)
         {
-            IBeatmap beatmap = TestSceneBeatmapInfoWedge.CreateTestBeatmap(new OsuRuleset().RulesetInfo);
+            IBeatmap beatmap = createTestBeatmapFromRuleset(new OsuRuleset().RulesetInfo);
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 60 * 1000 / commonBpm });
             beatmap.ControlPointInfo.Add(100, new TimingControlPoint { BeatLength = 60 * 1000 / otherBpm });
             beatmap.ControlPointInfo.Add(200, new TimingControlPoint { BeatLength = 60 * 1000 / commonBpm });
@@ -299,7 +298,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             });
         }
 
-        private (WorkingBeatmap, Screens.SelectV2.SongSelect.BeatmapSetLookupResult) createTestBeatmap()
+        private (WorkingBeatmap, Screens.Select.SongSelect.BeatmapSetLookupResult) createTestBeatmap()
         {
             var working = CreateWorkingBeatmap(Ruleset.Value);
             var onlineSet = new APIBeatmapSet
@@ -320,7 +319,33 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
             working.BeatmapSetInfo.DateSubmitted = DateTimeOffset.Now;
             working.BeatmapSetInfo.DateRanked = DateTimeOffset.Now;
-            return (working, Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(onlineSet));
+            return (working, Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(onlineSet));
+        }
+
+        private static IBeatmap createTestBeatmapFromRuleset(RulesetInfo ruleset)
+        {
+            List<HitObject> objects = new List<HitObject>();
+            for (double i = 0; i < 50000; i += 1000)
+                objects.Add(new TestHitObject { StartTime = i });
+
+            return new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Author = { Username = $"{ruleset.ShortName}Author" },
+                        Artist = $"{ruleset.ShortName}Artist",
+                        Source = $"{ruleset.ShortName}Source",
+                        Title = $"{ruleset.ShortName}Title"
+                    },
+                    Ruleset = ruleset,
+                    StarRating = 6,
+                    DifficultyName = $"{ruleset.ShortName}Version",
+                    Difficulty = new BeatmapDifficulty()
+                },
+                HitObjects = objects
+            };
         }
 
         private class TestHitObject : ConvertHitObject;

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedgeStatistic.cs

@@ -8,10 +8,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual.UserInterface;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneBeatmapTitleWedgeStatistic : ThemeComparisonTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeSlider.cs

@@ -7,12 +7,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneDifficultyRangeSlider : ThemeComparisonTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyStatisticsDisplay.cs

@@ -11,10 +11,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Game.Overlays;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneDifficultyStatisticsDisplay : OsuTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestSceneFooterButtonMods.cs

@@ -13,10 +13,10 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Utils;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneFooterButtonMods : OsuTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestScenePanelBeatmap.cs

@@ -19,12 +19,12 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestScenePanelBeatmap : ThemeComparisonTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestScenePanelBeatmapStandalone.cs

@@ -19,12 +19,12 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestScenePanelBeatmapStandalone : ThemeComparisonTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestScenePanelGroup.cs

@@ -7,15 +7,15 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays;
 using osu.Game.Graphics.Carousel;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Overlays;
 using osu.Game.Scoring;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestScenePanelGroup : ThemeComparisonTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestScenePanelSet.cs

@@ -11,12 +11,12 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.Carousel;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Overlays;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestScenePanelSet : ThemeComparisonTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestScenePanelUpdateBeatmapButton.cs

@@ -5,9 +5,9 @@ using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestScenePanelUpdateBeatmapButton : OsuTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestSceneSongSelect.cs

@@ -23,15 +23,14 @@ using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.Leaderboards;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 using osuTK.Input;
-using BeatmapCarousel = osu.Game.Screens.SelectV2.BeatmapCarousel;
-using FooterButtonMods = osu.Game.Screens.SelectV2.FooterButtonMods;
-using FooterButtonOptions = osu.Game.Screens.SelectV2.FooterButtonOptions;
-using FooterButtonRandom = osu.Game.Screens.SelectV2.FooterButtonRandom;
+using BeatmapCarousel = osu.Game.Screens.Select.BeatmapCarousel;
+using FooterButtonMods = osu.Game.Screens.Select.FooterButtonMods;
+using FooterButtonOptions = osu.Game.Screens.Select.FooterButtonOptions;
+using FooterButtonRandom = osu.Game.Screens.Select.FooterButtonRandom;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneSongSelect : SongSelectTestScene
     {
@@ -324,7 +323,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
             AddStep("exit gameplay", () => Stack.CurrentScreen.Exit());
 
-            AddUntilStep("wait for song select", () => Stack.CurrentScreen is Screens.SelectV2.SongSelect);
+            AddUntilStep("wait for song select", () => Stack.CurrentScreen is Screens.Select.SongSelect);
             AddUntilStep("wait for filtered", () => SongSelect.ChildrenOfType<BeatmapCarousel>().Single().FilterCount, () => Is.EqualTo(2));
         }
 

osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectCurrentSelectionInvalidated.cs

@@ -8,11 +8,11 @@ using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     /// <summary>
     /// The fallback behaviour guaranteed by SongSelect is that a random selection will happen in worst case scenario.
@@ -226,7 +226,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
                 Beatmaps.Delete(Beatmaps.GetAllUsableBeatmapSets().Last());
 
                 // check selection during debounce
-                Scheduler.AddDelayed(() => selectedBeatmapDuringDebounce = Beatmap.Value.BeatmapInfo, Screens.SelectV2.SongSelect.SELECTION_DEBOUNCE / 2f);
+                Scheduler.AddDelayed(() => selectedBeatmapDuringDebounce = Beatmap.Value.BeatmapInfo, Screens.Select.SongSelect.SELECTION_DEBOUNCE / 2f);
             });
 
             WaitForFiltering();

osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFiltering.cs

@@ -16,13 +16,13 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osuTK.Input;
-using FilterControl = osu.Game.Screens.SelectV2.FilterControl;
-using NoResultsPlaceholder = osu.Game.Screens.SelectV2.NoResultsPlaceholder;
+using FilterControl = osu.Game.Screens.Select.FilterControl;
+using NoResultsPlaceholder = osu.Game.Screens.Select.NoResultsPlaceholder;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     public partial class TestSceneSongSelectFiltering : SongSelectTestScene
     {

osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectGrouping.cs

@@ -16,11 +16,11 @@ using osu.Game.Models;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Scoring;
+using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Tests.Resources;
 
-namespace osu.Game.Tests.Visual.SongSelectV2
+namespace osu.Game.Tests.Visual.SongSelect
 {
     /// <summary>
     /// Test suite for grouping modes which require the presence of API / realm.

osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs

@@ -17,7 +17,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Screens;
 using osu.Game.Screens.Footer;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {

osu.Game/Beatmaps/BeatmapMetadata.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Game.Models;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Users;
 using osu.Game.Utils;
 using Realms;

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -34,7 +34,7 @@ using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
 using CommonStrings = osu.Game.Localisation.CommonStrings;
-using SongSelect = osu.Game.Screens.SelectV2.SongSelect;
+using SongSelect = osu.Game.Screens.Select.SongSelect;
 using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
 
 namespace osu.Game.Online.Leaderboards

osu.Game/OsuGame.cs

@@ -72,7 +72,7 @@ using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.Leaderboards;
 using osu.Game.Screens.Ranking;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Seasonal;
 using osu.Game.Skinning;
 using osu.Game.Updater;

osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs

@@ -25,7 +25,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
 using osu.Game.Screens.Footer;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual;
 using osuTK;
 

osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs

@@ -29,7 +29,7 @@ using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Users;
 using osu.Game.Utils;
 

osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs

@@ -12,7 +12,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Screens;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor

osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs

@@ -30,7 +30,7 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Submission

osu.Game/Screens/Menu/MainMenu.cs

@@ -40,7 +40,7 @@ using osu.Game.Screens.OnlinePlay.DailyChallenge;
 using osu.Game.Screens.OnlinePlay.Matchmaking.Intro;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Playlists;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Seasonal;
 using osuTK;
 using osuTK.Graphics;

osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeLeaderboard.cs

@@ -17,7 +17,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.DailyChallenge

osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs

@@ -20,7 +20,7 @@ using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Footer;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs

@@ -24,9 +24,9 @@ using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Footer;
+using osu.Game.Screens.Select;
 using osu.Game.Users;
 using osu.Game.Utils;
-using osu.Game.Screens.SelectV2;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {

osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs

@@ -13,7 +13,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Footer;
 using osu.Game.Screens.Select;
-using SongSelect = osu.Game.Screens.SelectV2.SongSelect;
 
 namespace osu.Game.Screens.OnlinePlay
 {

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs

@@ -18,7 +18,7 @@ using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Footer;
-using osu.Game.Screens.SelectV2;
+using osu.Game.Screens.Select;
 using osu.Game.Utils;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -35,10 +35,9 @@ using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Screens.Select;
 using Realms;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     [Cached]
     public partial class BeatmapCarousel : Carousel<BeatmapInfo>

osu.Game/Screens/Select/BeatmapCarouselFilterGrouping.cs

@@ -12,11 +12,10 @@ using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics.Carousel;
 using osu.Game.Scoring;
-using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
 using osu.Game.Utils;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public class BeatmapCarouselFilterGrouping : ICarouselFilter
     {

osu.Game/Screens/Select/BeatmapCarouselFilterMatching.cs

@@ -9,10 +9,9 @@ using System.Threading.Tasks;
 using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Carousel;
-using osu.Game.Screens.Select;
 using osu.Game.Utils;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public class BeatmapCarouselFilterMatching : ICarouselFilter
     {

osu.Game/Screens/Select/BeatmapCarouselFilterSorting.cs

@@ -9,11 +9,10 @@ using System.Threading.Tasks;
 using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Carousel;
-using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
 using osu.Game.Utils;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public class BeatmapCarouselFilterSorting : ICarouselFilter
     {

osu.Game/Screens/Select/BeatmapDetailsArea.Header.cs

@@ -14,10 +14,9 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Localisation;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Screens.Play.Leaderboards;
-using osu.Game.Screens.Select;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapDetailsArea
     {

osu.Game/Screens/Select/BeatmapDetailsArea.WedgeSelector.cs

@@ -18,7 +18,7 @@ using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapDetailsArea
     {

osu.Game/Screens/Select/BeatmapDetailsArea.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     /// <summary>
     /// The left portion of the song select screen which houses the metadata or leaderboards wedge, along with controls

osu.Game/Screens/Select/BeatmapLeaderboardScore.Tooltip.cs

@@ -34,7 +34,7 @@ using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapLeaderboardScore
     {

osu.Game/Screens/Select/BeatmapLeaderboardScore.cs

@@ -32,7 +32,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
-using osu.Game.Screens.Select;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osu.Game.Utils;
@@ -40,7 +39,7 @@ using osuTK;
 using osuTK.Graphics;
 using CommonStrings = osu.Game.Localisation.CommonStrings;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public sealed partial class BeatmapLeaderboardScore : OsuClickableContainer, IHasContextMenu, IHasCustomTooltip<ScoreInfo>
     {

osu.Game/Screens/Select/BeatmapLeaderboardWedge.cs

@@ -37,7 +37,7 @@ using osu.Game.Screens.Play.Leaderboards;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapLeaderboardWedge : VisibilityContainer
     {

osu.Game/Screens/Select/BeatmapMetadataWedge.FailRetryDisplay.cs

@@ -17,7 +17,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapMetadataWedge
     {

osu.Game/Screens/Select/BeatmapMetadataWedge.MetadataDisplay.cs

@@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapMetadataWedge
     {

osu.Game/Screens/Select/BeatmapMetadataWedge.RatingSpreadDisplay.cs

@@ -13,7 +13,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapMetadataWedge
     {

osu.Game/Screens/Select/BeatmapMetadataWedge.SuccessRateDisplay.cs

@@ -15,7 +15,7 @@ using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapMetadataWedge
     {

osu.Game/Screens/Select/BeatmapMetadataWedge.TagsLine.cs

@@ -22,7 +22,7 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapMetadataWedge
     {

osu.Game/Screens/Select/BeatmapMetadataWedge.UserRatingDisplay.cs

@@ -13,7 +13,7 @@ using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapMetadataWedge
     {

osu.Game/Screens/Select/BeatmapMetadataWedge.cs

@@ -22,7 +22,7 @@ using osu.Game.Online.Chat;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapMetadataWedge : VisibilityContainer
     {

osu.Game/Screens/Select/BeatmapTitleWedge.DifficultyDisplay.cs

@@ -27,7 +27,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapTitleWedge
     {

osu.Game/Screens/Select/BeatmapTitleWedge.DifficultyStatisticsDisplay.cs

@@ -17,7 +17,7 @@ using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapTitleWedge
     {

osu.Game/Screens/Select/BeatmapTitleWedge.FavouriteButton.cs

@@ -26,7 +26,7 @@ using osu.Game.Resources.Localisation.Web;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapTitleWedge
     {

osu.Game/Screens/Select/BeatmapTitleWedge.Statistic.cs

@@ -15,7 +15,7 @@ using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapTitleWedge
     {

osu.Game/Screens/Select/BeatmapTitleWedge.StatisticDifficulty.cs

@@ -19,7 +19,7 @@ using osu.Game.Rulesets.Difficulty;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapTitleWedge
     {

osu.Game/Screens/Select/BeatmapTitleWedge.StatisticPlayCount.cs

@@ -18,7 +18,7 @@ using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapTitleWedge
     {

osu.Game/Screens/Select/BeatmapTitleWedge.cs

@@ -30,7 +30,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class BeatmapTitleWedge : VisibilityContainer
     {

osu.Game/Screens/Select/FilterControl.DifficultyRangeSlider.cs

@@ -21,7 +21,7 @@ using osu.Game.Resources.Localisation.Web;
 using osu.Game.Utils;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class FilterControl
     {

osu.Game/Screens/Select/FilterControl.ScopedBeatmapSetDisplay.cs

@@ -16,7 +16,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Overlays;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class FilterControl
     {

osu.Game/Screens/Select/FilterControl.cs

@@ -32,13 +32,12 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public sealed partial class FilterControl : OverlayContainer
     {

osu.Game/Screens/Select/FooterButtonMods.cs

@@ -30,7 +30,7 @@ using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class FooterButtonMods : ScreenFooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
     {

osu.Game/Screens/Select/FooterButtonOptions.Popover.cs

@@ -23,7 +23,7 @@ using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class FooterButtonOptions
     {

osu.Game/Screens/Select/FooterButtonOptions.cs

@@ -14,7 +14,7 @@ using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Screens.Footer;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class FooterButtonOptions : ScreenFooterButton, IHasPopover
     {

osu.Game/Screens/Select/FooterButtonRandom.cs

@@ -15,7 +15,7 @@ using osu.Game.Screens.Footer;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class FooterButtonRandom : ScreenFooterButton
     {

osu.Game/Screens/Select/ISongSelect.cs

@@ -8,7 +8,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     /// <summary>
     /// Actions exposed by song select which are used by subcomponents to perform top-level operations.

osu.Game/Screens/Select/LeftSideInteractionContainer.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     /// <summary>
     /// Handles mouse interactions required when moving away from the carousel.

osu.Game/Screens/Select/NoResultsPlaceholder.cs

@@ -14,10 +14,9 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Localisation;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
-using osu.Game.Screens.Select;
 using osuTK;
 
-namespace osu.Game.Screens.SelectV2
+namespace osu.Game.Screens.Select
 {
     public partial class NoResultsPlaceholder : VisibilityContainer
     {