Rename GameModes namespace to Screens.

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -9,10 +9,10 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Osu;
-using osu.Game.GameModes.Play.Catch;
-using osu.Game.GameModes.Play.Mania;
-using osu.Game.GameModes.Play.Osu;
-using osu.Game.GameModes.Play.Taiko;
+using osu.Game.Screens.Play.Catch;
+using osu.Game.Screens.Play.Mania;
+using osu.Game.Screens.Play.Osu;
+using osu.Game.Screens.Play.Taiko;
 using OpenTK;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs

@@ -2,7 +2,7 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.GameModes.Testing;
-using osu.Game.GameModes.Menu;
+using osu.Game.Screens.Menu;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -5,10 +5,10 @@ using osu.Framework.GameModes.Testing;
 using System.Collections.Generic;
 using osu.Desktop.Platform;
 using osu.Game.Database;
-using osu.Game.GameModes.Play;
 using SQLiteNetExtensions.Extensions;
 using osu.Framework;
 using osu.Game;
+using osu.Game.Screens.Play;
 
 namespace osu.Desktop.Tests
 {

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -9,10 +9,10 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Osu;
-using osu.Game.GameModes.Play;
 using OpenTK;
 using osu.Framework;
 using osu.Framework.Allocation;
+using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -6,12 +6,12 @@ using osu.Framework.GameModes.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
-using osu.Game.GameModes.Play;
-using osu.Game.GameModes.Play.Catch;
-using osu.Game.GameModes.Play.Mania;
-using osu.Game.GameModes.Play.Osu;
-using osu.Game.GameModes.Play.Taiko;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.Catch;
+using osu.Game.Screens.Play.Mania;
+using osu.Game.Screens.Play.Osu;
+using osu.Game.Screens.Play.Taiko;
 using OpenTK;
 using OpenTK.Graphics;
 

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -10,7 +10,6 @@ using osu.Framework.Desktop.Platform;
 using System.Reflection;
 using System.IO;
 using System.Collections.Generic;
-using osu.Game.GameModes.Play;
 using SQLiteNetExtensions.Extensions;
 using osu.Desktop.Platform;
 using osu.Framework.Allocation;

osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs

@@ -7,7 +7,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Objects.Osu;
 using osu.Game.Beatmaps.Samples;
-using osu.Game.GameModes.Play;
+using osu.Game.Screens.Play;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Beatmaps.Formats

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -8,7 +8,7 @@ using osu.Framework.Desktop.Platform;
 using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.IPC;
-using osu.Game.GameModes.Play;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Beatmaps.IO
 {

osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using NUnit.Framework;
 using osu.Game.Beatmaps.IO;
-using osu.Game.GameModes.Play;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Beatmaps.IO

osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs

@@ -8,7 +8,7 @@ using osu.Game.Beatmaps.Events;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Beatmaps.Timing;
-using osu.Game.GameModes.Play;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Beatmaps.Formats
 {

osu.Game/Beatmaps/Objects/HitObject.cs

@@ -3,7 +3,7 @@
 
 using osu.Game.Beatmaps.Objects.Osu;
 using osu.Game.Beatmaps.Samples;
-using osu.Game.GameModes.Play;
+using osu.Game.Screens.Play;
 using OpenTK.Graphics;
 
 namespace osu.Game.Beatmaps.Objects

osu.Game/Configuration/OsuConfigManager.cs

@@ -3,8 +3,8 @@
 
 using osu.Framework.Configuration;
 using osu.Framework.Platform;
-using osu.Game.GameModes.Play;
 using osu.Game.Online.API;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Configuration
 {

osu.Game/Database/BeatmapInfo.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using osu.Game.Beatmaps.Samples;
-using osu.Game.GameModes.Play;
+using osu.Game.Screens.Play;
 using SQLite.Net.Attributes;
 using SQLiteNetExtensions.Attributes;
 

osu.Game/Database/BeatmapMetadata.cs

@@ -1,7 +1,6 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.GameModes.Play;
 using SQLite.Net.Attributes;
 
 namespace osu.Game.Database

osu.Game/GameModes/Menu/MenuVisualisation.cs

@@ -1,13 +0,0 @@
-using osu.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace osu.Game.GameModes.Menu
-{
-    internal class MenuVisualisation : Drawable
-    {
-    }
-}

osu.Game/Online/Chat/Display/ChannelDisplay.cs

@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
-using osu.Game.Online.Chat.Display.osu.Online.Social;
 using OpenTK;
 using osu.Framework;
 using osu.Framework.Allocation;

osu.Game/Online/Chat/Display/ChatLine.cs

@@ -1,74 +1,67 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Allocation;
 
 namespace osu.Game.Online.Chat.Display
 {
-    namespace osu.Online.Social
+    public class ChatLine : Container
     {
-        public class ChatLine : Container
+        public readonly Message Message;
+
+        const float padding = 200;
+        const float text_size = 20;
+
+        public ChatLine(Message message)
         {
-            public readonly Message Message;
+            this.Message = message;
 
-            const float padding = 200;
-            const float text_size = 20;
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
 
-            public ChatLine(Message message)
+            Children = new Drawable[]
             {
-                this.Message = message;
-
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-
-                Children = new Drawable[]
+                new Container
                 {
-                    new Container
+                    Size = new Vector2(padding, text_size),
+                    Children = new Drawable[]
                     {
-                        Size = new Vector2(padding, text_size),
-                        Children = new Drawable[]
+                        new SpriteText
                         {
-                            new SpriteText
-                            {
-                                Text = Message.Timestamp.LocalDateTime.ToLongTimeString(),
-                                TextSize = text_size,
-                                Colour = new Color4(128, 128, 128, 255)
-                            },
-                            new SpriteText
-                            {
-                                Text = Message.User.Name,
-                                TextSize = text_size,
-                                Origin = Anchor.TopRight,
-                                Anchor = Anchor.TopRight,
-                            }
-                        }
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Padding = new MarginPadding { Left = padding + 10 },
-                        Children = new Drawable[]
+                            Text = Message.Timestamp.LocalDateTime.ToLongTimeString(),
+                            TextSize = text_size,
+                            Colour = new Color4(128, 128, 128, 255)
+                        },
+                        new SpriteText
                         {
-                            new SpriteText
-                            {
-                                Text = Message.Content,
-                                TextSize = text_size,
-                                RelativeSizeAxes = Axes.X,
-                            }
+                            Text = Message.User.Name,
+                            TextSize = text_size,
+                            Origin = Anchor.TopRight,
+                            Anchor = Anchor.TopRight,
                         }
                     }
-                };
-            }
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding { Left = padding + 10 },
+                    Children = new Drawable[]
+                    {
+                        new SpriteText
+                        {
+                            Text = Message.Content,
+                            TextSize = text_size,
+                            RelativeSizeAxes = Axes.X,
+                        }
+                    }
+                }
+            };
         }
     }
 }

osu.Game/OsuGame.cs

@@ -6,22 +6,22 @@ using System.Threading;
 using osu.Framework.Configuration;
 using osu.Framework.GameModes;
 using osu.Game.Configuration;
-using osu.Game.GameModes.Menu;
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
-using osu.Game.GameModes.Play;
 using osu.Game.Overlays;
 using osu.Framework;
 using osu.Framework.Input;
 using osu.Game.Input;
 using OpenTK.Input;
 using osu.Framework.Logging;
-using osu.Game.GameModes;
 using osu.Game.Graphics.UserInterface.Volume;
 using osu.Game.Database;
 using osu.Framework.Allocation;
+using osu.Game.Screens;
+using osu.Game.Screens.Menu;
+using osu.Game.Screens.Play;
 
 namespace osu.Game
 {

osu.Game/Overlays/Toolbar.cs

@@ -9,10 +9,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transformations;
 using osu.Game.Configuration;
-using osu.Game.GameModes.Play;
 using osu.Game.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Allocation;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Overlays
 {

osu.Game/Overlays/ToolbarModeButton.cs

@@ -2,11 +2,11 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Extensions;
-using osu.Game.GameModes.Play;
 using osu.Game.Graphics;
 using OpenTK.Graphics;
 using osu.Framework;
 using osu.Framework.Allocation;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Overlays
 {

osu.Game/Overlays/ToolbarModeSelector.cs

@@ -6,13 +6,13 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transformations;
-using osu.Game.GameModes.Play;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework;
 using osu.Framework.Caching;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Allocation;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Overlays
 {

osu.Game/Screens/BackgroundMode.cs

@@ -2,20 +2,16 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Framework.GameModes;
-using osu.Framework.Graphics.Transformations;
-using OpenTK;
-using osu.Framework.Graphics;
-using osu.Framework.Input;
-using osu.Framework;
 using System.Threading;
+using osu.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.GameModes;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Transformations;
+using osu.Framework.Input;
+using OpenTK;
 
-namespace osu.Game.GameModes
+namespace osu.Game.Screens
 {
     public abstract class BackgroundMode : GameMode, IEquatable<BackgroundMode>
     {

osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs

@@ -3,7 +3,7 @@
 
 using osu.Game.Graphics.Background;
 
-namespace osu.Game.GameModes.Backgrounds
+namespace osu.Game.Screens.Backgrounds
 {
     public class BackgroundModeCustom : BackgroundMode
     {

osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs

@@ -5,7 +5,7 @@ using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Graphics.Background;
 
-namespace osu.Game.GameModes.Backgrounds
+namespace osu.Game.Screens.Backgrounds
 {
     public class BackgroundModeDefault : BackgroundMode
     {

osu.Game/Screens/Backgrounds/BackgroundModeEmpty.cs

@@ -1,7 +1,7 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-namespace osu.Game.GameModes.Backgrounds
+namespace osu.Game.Screens.Backgrounds
 {
     public class BackgroundModeEmpty : BackgroundMode
     {

osu.Game/Screens/Charts/ChartInfo.cs

@@ -1,13 +1,7 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace osu.Game.GameModes.Charts
+namespace osu.Game.Screens.Charts
 {
     class ChartInfo : GameModeWhiteBox
     {

osu.Game/Screens/Charts/ChartListing.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace osu.Game.GameModes.Charts
+namespace osu.Game.Screens.Charts
 {
     class ChartListing : GameModeWhiteBox
     {

osu.Game/Screens/Direct/OnlineListing.cs

@@ -1,7 +1,7 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-namespace osu.Game.GameModes.Direct
+namespace osu.Game.Screens.Direct
 {
     class OnlineListing : GameModeWhiteBox
     {

osu.Game/Screens/Edit/EditSongSelect.cs

@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Game.GameModes.Backgrounds;
+using osu.Game.Screens.Backgrounds;
 
-namespace osu.Game.GameModes.Edit
+namespace osu.Game.Screens.Edit
 {
     class EditSongSelect : GameModeWhiteBox
     {

osu.Game/Screens/Edit/Editor.cs

@@ -1,16 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Framework.GameModes;
-using osu.Game.GameModes.Backgrounds;
+using osu.Game.Screens.Backgrounds;
 using OpenTK.Graphics;
 
-namespace osu.Game.GameModes.Edit
+namespace osu.Game.Screens.Edit
 {
     class Editor : GameModeWhiteBox
     {

osu.Game/Screens/GameModeWhiteBox.cs

@@ -9,13 +9,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.GameModes.Backgrounds;
+using osu.Game.Screens.Backgrounds;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework;
-using osu.Framework.Allocation;
 
-namespace osu.Game.GameModes
+namespace osu.Game.Screens
 {
     public class GameModeWhiteBox : OsuGameMode
     {

osu.Game/Screens/Menu/Button.cs

@@ -1,18 +1,16 @@
-using OpenTK;
-using OpenTK.Graphics;
-using OpenTK.Input;
+using System;
 using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 using osu.Game.Graphics;
-using System;
-using osu.Framework.Allocation;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
 
-namespace osu.Game.GameModes.Menu
+namespace osu.Game.Screens.Menu
 {
     /// <summary>
     /// Button designed specifically for the osu!next main menu.

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -13,10 +14,8 @@ using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
-using osu.Framework;
-using osu.Framework.Allocation;
 
-namespace osu.Game.GameModes.Menu
+namespace osu.Game.Screens.Menu
 {
     public partial class ButtonSystem : Container, IStateful<MenuState>
     {

osu.Game/Screens/Menu/FlowContainerWithOrigin.cs

@@ -1,8 +1,8 @@
-using OpenTK;
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using OpenTK;
 
-namespace osu.Game.GameModes.Menu
+namespace osu.Game.Screens.Menu
 {
     /// <summary>
     /// A flow container with an origin based on one of its contained drawables.

osu.Game/Screens/Menu/Intro.cs

@@ -1,19 +1,17 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Threading;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.GameModes;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transformations;
-using osu.Game.GameModes.Backgrounds;
+using osu.Game.Screens.Backgrounds;
 using OpenTK.Graphics;
-using osu.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
 
-namespace osu.Game.GameModes.Menu
+namespace osu.Game.Screens.Menu
 {
     class Intro : OsuGameMode
     {

osu.Game/Screens/Menu/MainMenu.cs

@@ -1,26 +1,21 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.GameModes;
 using osu.Framework.GameModes.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transformations;
-using osu.Game.GameModes.Backgrounds;
-using osu.Game.GameModes.Charts;
-using osu.Game.GameModes.Direct;
-using osu.Game.GameModes.Edit;
-using osu.Game.GameModes.Multiplayer;
-using osu.Game.GameModes.Play;
 using osu.Game.Graphics.Containers;
+using osu.Game.Screens.Backgrounds;
+using osu.Game.Screens.Charts;
+using osu.Game.Screens.Direct;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Multiplayer;
+using osu.Game.Screens.Play;
 using OpenTK;
-using osu.Framework;
-using osu.Game.Overlays;
-using System.Threading.Tasks;
-using osu.Game.Configuration;
-using osu.Framework.Allocation;
 
-namespace osu.Game.GameModes.Menu
+namespace osu.Game.Screens.Menu
 {
     public class MainMenu : OsuGameMode
     {

osu.Game/Screens/Menu/MenuVisualisation.cs

@@ -0,0 +1,8 @@
+using osu.Framework.Graphics;
+
+namespace osu.Game.Screens.Menu
+{
+    internal class MenuVisualisation : Drawable
+    {
+    }
+}

osu.Game/Screens/Menu/OsuLogo.cs

@@ -2,17 +2,16 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
-using osu.Framework;
 using OpenTK;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Textures;
 
-namespace osu.Game.GameModes.Menu
+namespace osu.Game.Screens.Menu
 {
     /// <summary>
     /// osu! logo and its attachments (pulsing, visualiser etc.)

osu.Game/Screens/Multiplayer/Lobby.cs

@@ -3,11 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace osu.Game.GameModes.Multiplayer
+namespace osu.Game.Screens.Multiplayer
 {
     class Lobby : GameModeWhiteBox
     {

osu.Game/Screens/Multiplayer/Match.cs

@@ -3,15 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Framework.GameModes;
-using osu.Game.GameModes.Backgrounds;
-using osu.Game.GameModes.Play;
+using osu.Game.Screens.Backgrounds;
+using osu.Game.Screens.Play;
 using OpenTK.Graphics;
 
-namespace osu.Game.GameModes.Multiplayer
+namespace osu.Game.Screens.Multiplayer
 {
     class Match : GameModeWhiteBox
     {

osu.Game/Screens/Multiplayer/MatchCreate.cs

@@ -3,11 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace osu.Game.GameModes.Multiplayer
+namespace osu.Game.Screens.Multiplayer
 {
     class MatchCreate : GameModeWhiteBox
     {

osu.Game/Screens/Multiplayer/MatchSongSelect.cs

@@ -1,16 +1,9 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Framework.GameModes;
-using osu.Game.GameModes.Backgrounds;
-using OpenTK.Graphics;
+using osu.Game.Screens.Backgrounds;
 
-namespace osu.Game.GameModes.Multiplayer
+namespace osu.Game.Screens.Multiplayer
 {
     class MatchSongSelect : GameModeWhiteBox
     {

osu.Game/Screens/OsuGameMode.cs

@@ -2,21 +2,13 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.GameModes;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Background;
 using osu.Game.Graphics.Containers;
 
-namespace osu.Game.GameModes
+namespace osu.Game.Screens
 {
     public abstract class OsuGameMode : GameMode
     {

osu.Game/Screens/Play/Catch/CatchComboCounter.cs

@@ -1,15 +1,10 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Screens.Play.Osu;
 using OpenTK.Graphics;
-using osu.Game.GameModes.Play.Osu;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace osu.Game.GameModes.Play.Catch
+namespace osu.Game.Screens.Play.Catch
 {
     /// <summary>
     /// Similar to Standard, but without the 'x' and has tinted pop-ups. Used in osu!catch.

osu.Game/Screens/Play/Catch/CatchHitRenderer.cs

@@ -1,12 +1,10 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Catch;
-using osu.Game.Beatmaps.Objects.Catch.Drawable;
 
-namespace osu.Game.GameModes.Play.Catch
+namespace osu.Game.Screens.Play.Catch
 {
     public class CatchHitRenderer : HitRenderer<CatchBaseHit>
     {

osu.Game/Screens/Play/Catch/CatchPlayfield.cs

@@ -2,14 +2,10 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework;
-using osu.Framework.Allocation;
 
-namespace osu.Game.GameModes.Play.Catch
+namespace osu.Game.Screens.Play.Catch
 {
     public class CatchPlayfield : Playfield
     {

osu.Game/Screens/Play/Catch/CatchRuleset.cs

@@ -1,15 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Game.Beatmaps.Objects;
-using osu.Game.GameModes.Play.Osu;
+using osu.Game.Screens.Play.Osu;
 
-namespace osu.Game.GameModes.Play.Catch
+namespace osu.Game.Screens.Play.Catch
 {
     class CatchRuleset : Ruleset
     {

osu.Game/Screens/Play/ComboCounter.cs

@@ -1,22 +1,13 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.MathUtils;
-using osu.Framework.Timing;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Framework.Allocation;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     public abstract class ComboCounter : Container
     {

osu.Game/Screens/Play/ComboResultCounter.cs

@@ -1,18 +1,13 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.MathUtils;
-using osu.Framework.Timing;
 using osu.Game.Graphics.UserInterface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     /// <summary>
     /// Used to display combo with a roll-up animation in results screen.

osu.Game/Screens/Play/HitRenderer.cs

@@ -1,16 +1,15 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.Objects;
-using osu.Framework;
-using System;
-using System.Linq;
-using osu.Framework.Allocation;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     public abstract class HitRenderer : Container
     {

osu.Game/Screens/Play/Mania/ManiaComboCounter.cs

@@ -1,18 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Graphics;
-using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transformations;
-using osu.Game.GameModes.Play.Taiko;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using osu.Game.Screens.Play.Taiko;
+using OpenTK.Graphics;
 
-namespace osu.Game.GameModes.Play.Mania
+namespace osu.Game.Screens.Play.Mania
 {
     /// <summary>
     /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania.

osu.Game/Screens/Play/Mania/ManiaHitRenderer.cs

@@ -1,13 +1,10 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Mania;
-using osu.Game.Beatmaps.Objects.Mania.Drawable;
 
-namespace osu.Game.GameModes.Play.Mania
+namespace osu.Game.Screens.Play.Mania
 {
     public class ManiaHitRenderer : HitRenderer<ManiaBaseHit>
     {

osu.Game/Screens/Play/Mania/ManiaPlayfield.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 
-namespace osu.Game.GameModes.Play.Mania
+namespace osu.Game.Screens.Play.Mania
 {
     public class ManiaPlayfield : Playfield
     {

osu.Game/Screens/Play/Mania/ManiaRuleset.cs

@@ -1,15 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Game.Beatmaps.Objects;
-using osu.Game.GameModes.Play.Osu;
+using osu.Game.Screens.Play.Osu;
 
-namespace osu.Game.GameModes.Play.Mania
+namespace osu.Game.Screens.Play.Mania
 {
     class ManiaRuleset : Ruleset
     {

osu.Game/Screens/Play/ModSelect.cs

@@ -1,16 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OpenTK.Graphics;
 using osu.Framework.GameModes;
-using osu.Game.GameModes.Backgrounds;
+using osu.Game.Screens.Backgrounds;
+using OpenTK.Graphics;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     class ModSelect : GameModeWhiteBox
     {

osu.Game/Screens/Play/Osu/OsuComboCounter.cs

@@ -2,15 +2,8 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using osu.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Framework.Allocation;
 
-namespace osu.Game.GameModes.Play.Osu
+namespace osu.Game.Screens.Play.Osu
 {
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over. Used in osu! standard.

osu.Game/Screens/Play/Osu/OsuHitRenderer.cs

@@ -1,12 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Osu;
 using osu.Game.Beatmaps.Objects.Osu.Drawable;
 
-namespace osu.Game.GameModes.Play.Osu
+namespace osu.Game.Screens.Play.Osu
 {
     public class OsuHitRenderer : HitRenderer<OsuBaseHit>
     {

osu.Game/Screens/Play/Osu/OsuPlayfield.cs

@@ -3,12 +3,11 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using OpenTK;
-using osu.Framework;
 using osu.Framework.Graphics.Sprites;
+using OpenTK;
 using OpenTK.Graphics;
 
-namespace osu.Game.GameModes.Play.Osu
+namespace osu.Game.Screens.Play.Osu
 {
     public class OsuPlayfield : Playfield
     {

osu.Game/Screens/Play/Osu/OsuRuleset.cs

@@ -1,14 +1,10 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Game.Beatmaps.Objects;
 
-namespace osu.Game.GameModes.Play.Osu
+namespace osu.Game.Screens.Play.Osu
 {
     class OsuRuleset : Ruleset
     {

osu.Game/Screens/Play/Osu/ScoreOverlayOsu.cs

@@ -1,18 +1,12 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Input;
-using osu.Game.Beatmaps.Objects;
 
-namespace osu.Game.GameModes.Play.Osu
+namespace osu.Game.Screens.Play.Osu
 {
     class ScoreOverlayOsu : ScoreOverlay
     {

osu.Game/Screens/Play/PlayMode.cs

@@ -4,7 +4,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     public enum PlayMode
     {

osu.Game/Screens/Play/PlaySongSelect.cs

@@ -2,29 +2,26 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Diagnostics;
-using osu.Framework.Configuration;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.GameModes.Backgrounds;
-using osu.Framework;
-using osu.Game.Database;
-using osu.Framework.Graphics.Primitives;
 using System.Linq;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Graphics.UserInterface;
 using System.Threading.Tasks;
-using osu.Framework.Audio.Track;
-using osu.Game.Beatmaps.Drawable;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Game.Beatmaps;
-using osu.Framework.GameModes;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
+using osu.Framework.Configuration;
+using osu.Framework.GameModes;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawable;
+using osu.Game.Database;
+using osu.Game.Screens.Backgrounds;
+using OpenTK;
+using OpenTK.Graphics;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     public class PlaySongSelect : OsuGameMode
     {

osu.Game/Screens/Play/Player.cs

@@ -1,28 +1,21 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
-using osu.Game.Beatmaps.Objects;
-using osu.Game.GameModes.Backgrounds;
-using osu.Game.GameModes.Play.Catch;
-using osu.Game.GameModes.Play.Mania;
-using osu.Game.GameModes.Play.Osu;
-using osu.Game.GameModes.Play.Taiko;
-using osu.Framework;
-using osu.Game.Database;
-using osu.Framework.Timing;
-using osu.Framework.Audio.Track;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Graphics.Cursor;
+using osu.Framework.Audio.Track;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Platform;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps.Objects;
+using osu.Game.Database;
+using osu.Game.Screens.Backgrounds;
 using OpenTK.Input;
 using MouseState = osu.Framework.Input.MouseState;
-using osu.Framework.Graphics.Primitives;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     public class Player : OsuGameMode
     {

osu.Game/Screens/Play/Playfield.cs

@@ -1,10 +1,9 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Graphics.Containers;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     public class Playfield : Container
     {

osu.Game/Screens/Play/Ruleset.cs

@@ -1,18 +1,14 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Game.Beatmaps.Objects;
-using osu.Game.GameModes.Play.Catch;
-using osu.Game.GameModes.Play.Mania;
-using osu.Game.GameModes.Play.Osu;
-using osu.Game.GameModes.Play.Taiko;
+using osu.Game.Screens.Play.Catch;
+using osu.Game.Screens.Play.Mania;
+using osu.Game.Screens.Play.Osu;
+using osu.Game.Screens.Play.Taiko;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     public abstract class Ruleset
     {

osu.Game/Screens/Play/ScoreOverlay.cs

@@ -2,16 +2,12 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.GameModes.Play
+namespace osu.Game.Screens.Play
 {
     public abstract class ScoreOverlay : Container
     {

osu.Game/Screens/Play/Taiko/TaikoComboCounter.cs

@@ -1,15 +1,10 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
 using osu.Framework.Graphics.Transformations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using OpenTK;
 
-namespace osu.Game.GameModes.Play.Taiko
+namespace osu.Game.Screens.Play.Taiko
 {
     /// <summary>
     /// Allows tint and scaling animations. Used in osu!taiko.

osu.Game/Screens/Play/Taiko/TaikoHitRenderer.cs

@@ -1,12 +1,10 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Objects.Taiko;
-using osu.Game.Beatmaps.Objects.Taiko.Drawable;
 
-namespace osu.Game.GameModes.Play.Taiko
+namespace osu.Game.Screens.Play.Taiko
 {
     public class TaikoHitRenderer : HitRenderer<TaikoBaseHit>
     {

osu.Game/Screens/Play/Taiko/TaikoPlayfield.cs

@@ -1,16 +1,14 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Textures;
 
-namespace osu.Game.GameModes.Play.Taiko
+namespace osu.Game.Screens.Play.Taiko
 {
     public class TaikoPlayfield : Playfield
     {

osu.Game/Screens/Play/Taiko/TaikoRuleset.cs

@@ -1,15 +1,11 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Game.Beatmaps.Objects;
-using osu.Game.GameModes.Play.Osu;
+using osu.Game.Screens.Play.Osu;
 
-namespace osu.Game.GameModes.Play.Taiko
+namespace osu.Game.Screens.Play.Taiko
 {
     class TaikoRuleset : Ruleset
     {

osu.Game/Screens/Ranking/Results.cs

@@ -2,10 +2,10 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.GameModes;
-using osu.Game.GameModes.Backgrounds;
+using osu.Game.Screens.Backgrounds;
 using OpenTK.Graphics;
 
-namespace osu.Game.GameModes.Ranking
+namespace osu.Game.Screens.Ranking
 {
     class Results : GameModeWhiteBox
     {

osu.Game/osu.Game.csproj

@@ -102,56 +102,56 @@
     <Compile Include="Beatmaps\Timing\SampleChange.cs" />
     <Compile Include="Beatmaps\Timing\TimingChange.cs" />
     <Compile Include="Configuration\OsuConfigManager.cs" />
-    <Compile Include="GameModes\BackgroundMode.cs" />
-    <Compile Include="GameModes\Backgrounds\BackgroundModeCustom.cs" />
-    <Compile Include="GameModes\Backgrounds\BackgroundModeDefault.cs" />
-    <Compile Include="GameModes\Backgrounds\BackgroundModeEmpty.cs" />
-    <Compile Include="GameModes\Charts\ChartInfo.cs" />
-    <Compile Include="GameModes\Edit\Editor.cs" />
-    <Compile Include="GameModes\GameModeWhiteBox.cs" />
-    <Compile Include="GameModes\Menu\Button.cs" />
-    <Compile Include="GameModes\Menu\FlowContainerWithOrigin.cs" />
-    <Compile Include="GameModes\Menu\Intro.cs" />
-    <Compile Include="GameModes\Menu\ButtonSystem.cs" />
-    <Compile Include="GameModes\Menu\MainMenu.cs" />
-    <Compile Include="GameModes\Menu\MenuVisualisation.cs" />
-    <Compile Include="GameModes\Menu\OsuLogo.cs" />
-    <Compile Include="GameModes\Multiplayer\Lobby.cs" />
-    <Compile Include="GameModes\Multiplayer\Match.cs" />
-    <Compile Include="GameModes\Multiplayer\MatchCreate.cs" />
-    <Compile Include="GameModes\Multiplayer\MatchSongSelect.cs" />
-    <Compile Include="GameModes\OsuGameMode.cs" />
-    <Compile Include="GameModes\Play\Catch\CatchRuleset.cs" />
-    <Compile Include="GameModes\Play\Mania\ManiaRuleset.cs" />
-    <Compile Include="GameModes\Play\ModSelect.cs" />
-    <Compile Include="GameModes\Play\Osu\OsuRuleset.cs" />
-    <Compile Include="GameModes\Play\Osu\ScoreOverlayOsu.cs" />
+    <Compile Include="Screens\BackgroundMode.cs" />
+    <Compile Include="Screens\Backgrounds\BackgroundModeCustom.cs" />
+    <Compile Include="Screens\Backgrounds\BackgroundModeDefault.cs" />
+    <Compile Include="Screens\Backgrounds\BackgroundModeEmpty.cs" />
+    <Compile Include="Screens\Charts\ChartInfo.cs" />
+    <Compile Include="Screens\Edit\Editor.cs" />
+    <Compile Include="Screens\GameModeWhiteBox.cs" />
+    <Compile Include="Screens\Menu\Button.cs" />
+    <Compile Include="Screens\Menu\FlowContainerWithOrigin.cs" />
+    <Compile Include="Screens\Menu\Intro.cs" />
+    <Compile Include="Screens\Menu\ButtonSystem.cs" />
+    <Compile Include="Screens\Menu\MainMenu.cs" />
+    <Compile Include="Screens\Menu\MenuVisualisation.cs" />
+    <Compile Include="Screens\Menu\OsuLogo.cs" />
+    <Compile Include="Screens\Multiplayer\Lobby.cs" />
+    <Compile Include="Screens\Multiplayer\Match.cs" />
+    <Compile Include="Screens\Multiplayer\MatchCreate.cs" />
+    <Compile Include="Screens\Multiplayer\MatchSongSelect.cs" />
+    <Compile Include="Screens\OsuGameMode.cs" />
+    <Compile Include="Screens\Play\Catch\CatchRuleset.cs" />
+    <Compile Include="Screens\Play\Mania\ManiaRuleset.cs" />
+    <Compile Include="Screens\Play\ModSelect.cs" />
+    <Compile Include="Screens\Play\Osu\OsuRuleset.cs" />
+    <Compile Include="Screens\Play\Osu\ScoreOverlayOsu.cs" />
     <Compile Include="Beatmaps\Drawable\BeatmapGroup.cs" />
     <Compile Include="Beatmaps\Drawable\BeatmapPanel.cs" />
-    <Compile Include="GameModes\Play\Player.cs" />
-    <Compile Include="GameModes\Charts\ChartListing.cs" />
-    <Compile Include="GameModes\Play\PlayMode.cs" />
-    <Compile Include="GameModes\Play\Ruleset.cs" />
-    <Compile Include="GameModes\Play\Taiko\TaikoRuleset.cs" />
-    <Compile Include="GameModes\Ranking\Results.cs" />
-    <Compile Include="GameModes\Direct\OnlineListing.cs" />
-    <Compile Include="GameModes\Play\PlaySongSelect.cs" />
-    <Compile Include="GameModes\Play\Catch\CatchHitRenderer.cs" />
-    <Compile Include="GameModes\Play\Catch\CatchPlayfield.cs" />
-    <Compile Include="GameModes\Play\HitRenderer.cs" />
-    <Compile Include="GameModes\Play\Mania\ManiaHitRenderer.cs" />
-    <Compile Include="GameModes\Play\Mania\ManiaPlayfield.cs" />
-    <Compile Include="GameModes\Play\Osu\OsuHitRenderer.cs" />
-    <Compile Include="GameModes\Play\Osu\OsuPlayfield.cs" />
-    <Compile Include="GameModes\Play\Playfield.cs" />
-    <Compile Include="GameModes\Play\ScoreOverlay.cs" />
-    <Compile Include="GameModes\Play\Taiko\TaikoHitRenderer.cs" />
-    <Compile Include="GameModes\Play\Taiko\TaikoPlayfield.cs" />
-    <Compile Include="GameModes\Edit\EditSongSelect.cs" />
-    <Compile Include="GameModes\Play\ComboCounter.cs" />
-    <Compile Include="GameModes\Play\ComboResultCounter.cs" />
+    <Compile Include="Screens\Play\Player.cs" />
+    <Compile Include="Screens\Charts\ChartListing.cs" />
+    <Compile Include="Screens\Play\PlayMode.cs" />
+    <Compile Include="Screens\Play\Ruleset.cs" />
+    <Compile Include="Screens\Play\Taiko\TaikoRuleset.cs" />
+    <Compile Include="Screens\Ranking\Results.cs" />
+    <Compile Include="Screens\Direct\OnlineListing.cs" />
+    <Compile Include="Screens\Play\PlaySongSelect.cs" />
+    <Compile Include="Screens\Play\Catch\CatchHitRenderer.cs" />
+    <Compile Include="Screens\Play\Catch\CatchPlayfield.cs" />
+    <Compile Include="Screens\Play\HitRenderer.cs" />
+    <Compile Include="Screens\Play\Mania\ManiaHitRenderer.cs" />
+    <Compile Include="Screens\Play\Mania\ManiaPlayfield.cs" />
+    <Compile Include="Screens\Play\Osu\OsuHitRenderer.cs" />
+    <Compile Include="Screens\Play\Osu\OsuPlayfield.cs" />
+    <Compile Include="Screens\Play\Playfield.cs" />
+    <Compile Include="Screens\Play\ScoreOverlay.cs" />
+    <Compile Include="Screens\Play\Taiko\TaikoHitRenderer.cs" />
+    <Compile Include="Screens\Play\Taiko\TaikoPlayfield.cs" />
+    <Compile Include="Screens\Edit\EditSongSelect.cs" />
+    <Compile Include="Screens\Play\ComboCounter.cs" />
+    <Compile Include="Screens\Play\ComboResultCounter.cs" />
     <Compile Include="Graphics\UserInterface\RollingCounter.cs" />
-    <Compile Include="GameModes\Play\Taiko\TaikoComboCounter.cs" />
+    <Compile Include="Screens\Play\Taiko\TaikoComboCounter.cs" />
     <Compile Include="Graphics\UserInterface\Volume\VolumeControlReceptor.cs" />
     <Compile Include="Input\GlobalHotkeys.cs" />
     <Compile Include="Graphics\Background\Background.cs" />
@@ -159,15 +159,15 @@
     <Compile Include="Graphics\Cursor\OsuCursorContainer.cs" />
     <Compile Include="Graphics\Processing\RatioAdjust.cs" />
     <Compile Include="Graphics\TextAwesome.cs" />
-    <Compile Include="GameModes\Play\Mania\ManiaComboCounter.cs" />
+    <Compile Include="Screens\Play\Mania\ManiaComboCounter.cs" />
     <Compile Include="Graphics\UserInterface\KeyCounter.cs" />
     <Compile Include="Graphics\UserInterface\KeyCounterKeyboard.cs" />
     <Compile Include="Graphics\UserInterface\KeyCounterCollection.cs" />
     <Compile Include="Graphics\UserInterface\KeyCounterMouse.cs" />
     <Compile Include="Graphics\UserInterface\PercentageCounter.cs" />
     <Compile Include="Graphics\UserInterface\ScoreCounter.cs" />
-    <Compile Include="GameModes\Play\Catch\CatchComboCounter.cs" />
-    <Compile Include="GameModes\Play\Osu\OsuComboCounter.cs" />
+    <Compile Include="Screens\Play\Catch\CatchComboCounter.cs" />
+    <Compile Include="Screens\Play\Osu\OsuComboCounter.cs" />
     <Compile Include="Graphics\UserInterface\StarCounter.cs" />
     <Compile Include="IPC\BeatmapImporter.cs" />
     <Compile Include="Online\API\APIAccess.cs" />