Move play modes to Modes namespace.

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -7,12 +7,12 @@
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Objects;
-using osu.Game.Beatmaps.Objects.Osu;
-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 osu.Game.Modes.Catch;
+using osu.Game.Modes.Mania;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Osu;
+using osu.Game.Modes.Osu;
+using osu.Game.Modes.Taiko;
 using OpenTK;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -5,11 +5,11 @@
 using osu.Framework.GameModes.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
-using osu.Game.Beatmaps.Objects;
-using osu.Game.Beatmaps.Objects.Osu;
-using osu.Game.Beatmaps.Objects.Osu.Drawable;
 using OpenTK;
 using osu.Framework.Allocation;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Osu;
+using osu.Game.Modes.Objects.Osu.Drawable;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -8,6 +8,7 @@
 using SQLiteNetExtensions.Extensions;
 using osu.Framework;
 using osu.Game;
+using osu.Game.Modes;
 using osu.Game.Screens.Play;
 
 namespace osu.Desktop.Tests

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -7,11 +7,11 @@
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.Objects;
-using osu.Game.Beatmaps.Objects.Osu;
 using OpenTK;
 using osu.Framework;
 using osu.Framework.Allocation;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Osu;
 using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -7,11 +7,12 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Modes;
+using osu.Game.Modes.Catch;
+using osu.Game.Modes.Mania;
+using osu.Game.Modes.Osu;
+using osu.Game.Modes.Taiko;
 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.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs

@@ -5,8 +5,9 @@
 using OpenTK.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.Objects.Osu;
 using osu.Game.Beatmaps.Samples;
+using osu.Game.Modes;
+using osu.Game.Modes.Objects.Osu;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Resources;
 

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

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

osu.Game/Beatmaps/Beatmap.cs

@@ -3,9 +3,9 @@
 
 using System.Collections.Generic;
 using OpenTK.Graphics;
-using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Database;
+using osu.Game.Modes.Objects;
 
 namespace osu.Game.Beatmaps
 {

osu.Game/Beatmaps/Formats/BeatmapDecoder.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using osu.Game.Beatmaps.Objects;
+using osu.Game.Modes.Objects;
 using OpenTK.Graphics;
 
 namespace osu.Game.Beatmaps.Formats

osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs

@@ -5,9 +5,10 @@
 using OpenTK.Graphics;
 using osu.Game.Database;
 using osu.Game.Beatmaps.Events;
-using osu.Game.Beatmaps.Objects;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Modes;
+using osu.Game.Modes.Objects;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Beatmaps.Formats

osu.Game/Configuration/OsuConfigManager.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Configuration;
 using osu.Framework.Platform;
+using osu.Game.Modes;
 using osu.Game.Online.API;
 using osu.Game.Screens.Play;
 

osu.Game/Database/BeatmapInfo.cs

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

osu.Game/Modes/Catch/CatchComboCounter.cs

@@ -1,10 +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 osu.Game.Modes.Osu;
 using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Play.Catch
+namespace osu.Game.Modes.Catch
 {
     /// <summary>
     /// Similar to Standard, but without the 'x' and has tinted pop-ups. Used in osu!catch.

osu.Game/Modes/Catch/CatchHitRenderer.cs

@@ -1,10 +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.Beatmaps.Objects;
-using osu.Game.Beatmaps.Objects.Catch;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Catch;
 
-namespace osu.Game.Screens.Play.Catch
+namespace osu.Game.Modes.Catch
 {
     public class CatchHitRenderer : HitRenderer<CatchBaseHit>
     {

osu.Game/Modes/Catch/CatchPlayfield.cs

@@ -5,7 +5,7 @@
 using osu.Framework.Graphics.Sprites;
 using OpenTK;
 
-namespace osu.Game.Screens.Play.Catch
+namespace osu.Game.Modes.Catch
 {
     public class CatchPlayfield : Playfield
     {

osu.Game/Modes/Catch/CatchRuleset.cs

@@ -2,10 +2,10 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps.Objects;
-using osu.Game.Screens.Play.Osu;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Osu;
 
-namespace osu.Game.Screens.Play.Catch
+namespace osu.Game.Modes.Catch
 {
     class CatchRuleset : Ruleset
     {

osu.Game/Modes/ComboCounter.cs

@@ -7,7 +7,7 @@
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.MathUtils;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Modes
 {
     public abstract class ComboCounter : Container
     {

osu.Game/Modes/ComboResultCounter.cs

@@ -7,7 +7,7 @@
 using osu.Framework.MathUtils;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Modes
 {
     /// <summary>
     /// Used to display combo with a roll-up animation in results screen.

osu.Game/Modes/HitRenderer.cs

@@ -7,9 +7,9 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps.Objects;
+using osu.Game.Modes.Objects;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Modes
 {
     public abstract class HitRenderer : Container
     {

osu.Game/Modes/Mania/ManiaComboCounter.cs

@@ -3,10 +3,10 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transformations;
-using osu.Game.Screens.Play.Taiko;
+using osu.Game.Modes.Taiko;
 using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Play.Mania
+namespace osu.Game.Modes.Mania
 {
     /// <summary>
     /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania.

osu.Game/Modes/Mania/ManiaHitRenderer.cs

@@ -1,10 +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.Beatmaps.Objects;
-using osu.Game.Beatmaps.Objects.Mania;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Mania;
 
-namespace osu.Game.Screens.Play.Mania
+namespace osu.Game.Modes.Mania
 {
     public class ManiaHitRenderer : HitRenderer<ManiaBaseHit>
     {

osu.Game/Modes/Mania/ManiaPlayfield.cs

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

osu.Game/Modes/Mania/ManiaRuleset.cs

@@ -2,10 +2,10 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps.Objects;
-using osu.Game.Screens.Play.Osu;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Osu;
 
-namespace osu.Game.Screens.Play.Mania
+namespace osu.Game.Modes.Mania
 {
     class ManiaRuleset : Ruleset
     {

osu.Game/Modes/Objects/Catch/CatchBaseHit.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.Beatmaps.Objects.Catch
+namespace osu.Game.Modes.Objects.Catch
 {
     public abstract class CatchBaseHit : HitObject
     {

osu.Game/Modes/Objects/Catch/CatchConverter.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 System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Game.Beatmaps.Objects.Catch;
-using osu.Game.Beatmaps.Objects.Osu;
+using osu.Game.Modes.Objects.Osu;
 
-namespace osu.Game.Beatmaps.Objects.Catch
+namespace osu.Game.Modes.Objects.Catch
 {
     class CatchConverter : HitObjectConverter<CatchBaseHit>
     {

osu.Game/Modes/Objects/Catch/Drawable/DrawableFruit.cs

@@ -1,20 +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.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Transformations;
 using OpenTK;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Textures;
 
-namespace osu.Game.Beatmaps.Objects.Catch.Drawable
+namespace osu.Game.Modes.Objects.Catch.Drawable
 {
     class DrawableFruit : Sprite
     {

osu.Game/Modes/Objects/Catch/Droplet.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.Beatmaps.Objects.Catch
+namespace osu.Game.Modes.Objects.Catch
 {
     public class Droplet : CatchBaseHit
     {

osu.Game/Modes/Objects/Catch/Fruit.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.Beatmaps.Objects.Catch
+namespace osu.Game.Modes.Objects.Catch
 {
     public class Fruit : CatchBaseHit
     {

osu.Game/Modes/Objects/DrawableHitObject.cs

@@ -2,15 +2,10 @@
 //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;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps.Objects.Osu.Drawable;
 
-namespace osu.Game.Beatmaps.Objects
+namespace osu.Game.Modes.Objects
 {
     public abstract class DrawableHitObject : Container, IStateful<ArmedState>
     {

osu.Game/Modes/Objects/HitObject.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.Game.Beatmaps.Objects.Osu;
 using osu.Game.Beatmaps.Samples;
-using osu.Game.Screens.Play;
+using osu.Game.Modes.Objects.Osu;
 using OpenTK.Graphics;
 
-namespace osu.Game.Beatmaps.Objects
+namespace osu.Game.Modes.Objects
 {
     /// <summary>
     /// A hitobject describes a point in a beatmap 

osu.Game/Modes/Objects/HitObjectConverter.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace osu.Game.Beatmaps.Objects
+namespace osu.Game.Modes.Objects
 {
     public abstract class HitObjectConverter<T>
         where T : HitObject

osu.Game/Modes/Objects/Mania/Drawable/DrawableNote.cs

@@ -1,15 +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;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Transformations;
 using OpenTK;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Textures;
 
-namespace osu.Game.Beatmaps.Objects.Mania.Drawable
+namespace osu.Game.Modes.Objects.Mania.Drawable
 {
     public class DrawableNote : Sprite
     {

osu.Game/Modes/Objects/Mania/HoldNote.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.Beatmaps.Objects.Mania
+namespace osu.Game.Modes.Objects.Mania
 {
     public class HoldNote : Note
     {

osu.Game/Modes/Objects/Mania/ManiaBaseHit.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.Beatmaps.Objects.Mania
+namespace osu.Game.Modes.Objects.Mania
 {
     public abstract class ManiaBaseHit : HitObject
     {

osu.Game/Modes/Objects/Mania/ManiaConverter.cs

@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Game.Beatmaps.Objects.Osu;
+using osu.Game.Modes.Objects.Osu;
 
-namespace osu.Game.Beatmaps.Objects.Mania
+namespace osu.Game.Modes.Objects.Mania
 {
     class ManiaConverter : HitObjectConverter<ManiaBaseHit>
     {

osu.Game/Modes/Objects/Mania/Note.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.Beatmaps.Objects.Mania
+namespace osu.Game.Modes.Objects.Mania
 {
     public class Note : ManiaBaseHit
     {

osu.Game/Modes/Objects/Osu/Circle.cs

@@ -1,9 +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 OpenTK.Graphics;
-
-namespace osu.Game.Beatmaps.Objects.Osu
+namespace osu.Game.Modes.Objects.Osu
 {
     public class Circle : OsuBaseHit
     {

osu.Game/Modes/Objects/Osu/Drawable/DrawableCircle.cs

@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -11,9 +12,8 @@
 using osu.Framework.Input;
 using osu.Framework.MathUtils;
 using OpenTK;
-using osu.Framework.Allocation;
 
-namespace osu.Game.Beatmaps.Objects.Osu.Drawable
+namespace osu.Game.Modes.Objects.Osu.Drawable
 {
     public class DrawableCircle : DrawableHitObject
     {

osu.Game/Modes/Objects/Osu/OsuBaseHit.cs

@@ -2,10 +2,10 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using OpenTK;
 using osu.Game.Beatmaps.Samples;
+using OpenTK;
 
-namespace osu.Game.Beatmaps.Objects.Osu
+namespace osu.Game.Modes.Objects.Osu
 {
     public abstract class OsuBaseHit : HitObject
     {

osu.Game/Modes/Objects/Osu/OsuConverter.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 System;
 using System.Collections.Generic;
 
-namespace osu.Game.Beatmaps.Objects.Osu
+namespace osu.Game.Modes.Objects.Osu
 {
     class OsuConverter : HitObjectConverter<OsuBaseHit>
     {

osu.Game/Modes/Objects/Osu/Slider.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using OpenTK;
 
-namespace osu.Game.Beatmaps.Objects.Osu
+namespace osu.Game.Modes.Objects.Osu
 {
     public class Slider : OsuBaseHit
     {

osu.Game/Modes/Objects/Osu/Spinner.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.Beatmaps.Objects.Osu
+namespace osu.Game.Modes.Objects.Osu
 {
     public class Spinner : OsuBaseHit
     {

osu.Game/Modes/Objects/Taiko/Drawable/DrawableTaikoHit.cs

@@ -1,15 +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;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Transformations;
 using OpenTK;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Textures;
 
-namespace osu.Game.Beatmaps.Objects.Taiko.Drawable
+namespace osu.Game.Modes.Objects.Taiko.Drawable
 {
     class DrawableTaikoHit : Sprite
     {

osu.Game/Modes/Objects/Taiko/TaikoBaseHit.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.Beatmaps.Objects.Taiko
+namespace osu.Game.Modes.Objects.Taiko
 {
     public class TaikoBaseHit : HitObject
     {

osu.Game/Modes/Objects/Taiko/TaikoConverter.cs

@@ -1,11 +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 osu.Game.Beatmaps.Objects.Osu;
+using osu.Game.Modes.Objects.Osu;
 
-namespace osu.Game.Beatmaps.Objects.Taiko
+namespace osu.Game.Modes.Objects.Taiko
 {
     class TaikoConverter : HitObjectConverter<TaikoBaseHit>
     {

osu.Game/Modes/Osu/OsuComboCounter.cs

@@ -3,7 +3,7 @@
 
 using OpenTK;
 
-namespace osu.Game.Screens.Play.Osu
+namespace osu.Game.Modes.Osu
 {
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over. Used in osu! standard.

osu.Game/Modes/Osu/OsuHitRenderer.cs

@@ -1,11 +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.Game.Beatmaps.Objects;
-using osu.Game.Beatmaps.Objects.Osu;
-using osu.Game.Beatmaps.Objects.Osu.Drawable;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Osu;
+using osu.Game.Modes.Objects.Osu.Drawable;
 
-namespace osu.Game.Screens.Play.Osu
+namespace osu.Game.Modes.Osu
 {
     public class OsuHitRenderer : HitRenderer<OsuBaseHit>
     {

osu.Game/Modes/Osu/OsuPlayfield.cs

@@ -7,7 +7,7 @@
 using OpenTK;
 using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Play.Osu
+namespace osu.Game.Modes.Osu
 {
     public class OsuPlayfield : Playfield
     {

osu.Game/Modes/Osu/OsuRuleset.cs

@@ -2,9 +2,9 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps.Objects;
+using osu.Game.Modes.Objects;
 
-namespace osu.Game.Screens.Play.Osu
+namespace osu.Game.Modes.Osu
 {
     class OsuRuleset : Ruleset
     {

osu.Game/Modes/Osu/ScoreOverlayOsu.cs

@@ -6,7 +6,7 @@
 using OpenTK;
 using OpenTK.Input;
 
-namespace osu.Game.Screens.Play.Osu
+namespace osu.Game.Modes.Osu
 {
     class ScoreOverlayOsu : ScoreOverlay
     {

osu.Game/Modes/PlayMode.cs

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

osu.Game/Modes/Playfield.cs

@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics.Containers;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Modes
 {
     public class Playfield : Container
     {

osu.Game/Modes/Ruleset.cs

@@ -2,13 +2,13 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps.Objects;
-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 osu.Game.Modes.Catch;
+using osu.Game.Modes.Mania;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Osu;
+using osu.Game.Modes.Taiko;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Modes
 {
     public abstract class Ruleset
     {

osu.Game/Modes/ScoreOverlay.cs

@@ -4,10 +4,10 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps.Objects;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Modes.Objects;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Modes
 {
     public abstract class ScoreOverlay : Container
     {

osu.Game/Modes/Taiko/TaikoComboCounter.cs

@@ -4,7 +4,7 @@
 using osu.Framework.Graphics.Transformations;
 using OpenTK;
 
-namespace osu.Game.Screens.Play.Taiko
+namespace osu.Game.Modes.Taiko
 {
     /// <summary>
     /// Allows tint and scaling animations. Used in osu!taiko.

osu.Game/Modes/Taiko/TaikoHitRenderer.cs

@@ -1,10 +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.Beatmaps.Objects;
-using osu.Game.Beatmaps.Objects.Taiko;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Taiko;
 
-namespace osu.Game.Screens.Play.Taiko
+namespace osu.Game.Modes.Taiko
 {
     public class TaikoHitRenderer : HitRenderer<TaikoBaseHit>
     {

osu.Game/Modes/Taiko/TaikoPlayfield.cs

@@ -8,7 +8,7 @@
 using OpenTK;
 using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Play.Taiko
+namespace osu.Game.Modes.Taiko
 {
     public class TaikoPlayfield : Playfield
     {

osu.Game/Modes/Taiko/TaikoRuleset.cs

@@ -2,10 +2,10 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps.Objects;
-using osu.Game.Screens.Play.Osu;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Osu;
 
-namespace osu.Game.Screens.Play.Taiko
+namespace osu.Game.Modes.Taiko
 {
     class TaikoRuleset : Ruleset
     {

osu.Game/OsuGame.cs

@@ -19,6 +19,7 @@
 using osu.Game.Graphics.UserInterface.Volume;
 using osu.Game.Database;
 using osu.Framework.Allocation;
+using osu.Game.Modes;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;

osu.Game/Overlays/Toolbar.cs

@@ -12,6 +12,7 @@
 using osu.Game.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Allocation;
+using osu.Game.Modes;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Overlays

osu.Game/Overlays/ToolbarModeButton.cs

@@ -6,6 +6,7 @@
 using OpenTK.Graphics;
 using osu.Framework;
 using osu.Framework.Allocation;
+using osu.Game.Modes;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Overlays

osu.Game/Overlays/ToolbarModeSelector.cs

@@ -12,6 +12,7 @@
 using osu.Framework.Caching;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Allocation;
+using osu.Game.Modes;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Overlays

osu.Game/Screens/Menu/MainMenu.cs

@@ -7,6 +7,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transformations;
 using osu.Game.Graphics.Containers;
+using osu.Game.Modes;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Charts;
 using osu.Game.Screens.Direct;

osu.Game/Screens/Play/PlaySongSelect.cs

@@ -17,6 +17,7 @@
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawable;
 using osu.Game.Database;
+using osu.Game.Modes;
 using osu.Game.Screens.Backgrounds;
 using OpenTK;
 using OpenTK.Graphics;

osu.Game/Screens/Play/Player.cs

@@ -9,8 +9,9 @@
 using osu.Framework.Input;
 using osu.Framework.Platform;
 using osu.Framework.Timing;
-using osu.Game.Beatmaps.Objects;
 using osu.Game.Database;
+using osu.Game.Modes;
+using osu.Game.Modes.Objects;
 using osu.Game.Screens.Backgrounds;
 using OpenTK.Input;
 using MouseState = osu.Framework.Input.MouseState;

osu.Game/osu.Game.csproj

@@ -71,28 +71,28 @@
     <Compile Include="Beatmaps\Drawable\BeatmapSetHeader.cs" />
     <Compile Include="Beatmaps\Drawable\DifficultyIcon.cs" />
     <Compile Include="Beatmaps\Drawable\Panel.cs" />
-    <Compile Include="Beatmaps\Objects\Catch\CatchConverter.cs" />
-    <Compile Include="Beatmaps\Objects\Catch\Drawable\DrawableFruit.cs" />
-    <Compile Include="Beatmaps\Objects\DrawableHitObject.cs" />
-    <Compile Include="Beatmaps\Objects\HitObject.cs" />
-    <Compile Include="Beatmaps\Objects\Catch\CatchBaseHit.cs" />
-    <Compile Include="Beatmaps\Objects\Catch\Droplet.cs" />
-    <Compile Include="Beatmaps\Objects\Catch\Fruit.cs" />
-    <Compile Include="Beatmaps\Objects\HitObjectConverter.cs" />
-    <Compile Include="Beatmaps\Objects\Mania\Drawable\DrawableNote.cs" />
-    <Compile Include="Beatmaps\Objects\Mania\HoldNote.cs" />
-    <Compile Include="Beatmaps\Objects\Mania\ManiaBaseHit.cs" />
-    <Compile Include="Beatmaps\Objects\Mania\ManiaConverter.cs" />
-    <Compile Include="Beatmaps\Objects\Mania\Note.cs" />
-    <Compile Include="Beatmaps\Objects\Osu\Circle.cs" />
-    <Compile Include="Beatmaps\Objects\Osu\Drawable\DrawableCircle.cs" />
-    <Compile Include="Beatmaps\Objects\Osu\OsuBaseHit.cs" />
-    <Compile Include="Beatmaps\Objects\Osu\OsuConverter.cs" />
-    <Compile Include="Beatmaps\Objects\Osu\Slider.cs" />
-    <Compile Include="Beatmaps\Objects\Osu\Spinner.cs" />
-    <Compile Include="Beatmaps\Objects\Taiko\Drawable\DrawableTaikoHit.cs" />
-    <Compile Include="Beatmaps\Objects\Taiko\TaikoBaseHit.cs" />
-    <Compile Include="Beatmaps\Objects\Taiko\TaikoConverter.cs" />
+    <Compile Include="Modes\Objects\Catch\CatchConverter.cs" />
+    <Compile Include="Modes\Objects\Catch\Drawable\DrawableFruit.cs" />
+    <Compile Include="Modes\Objects\DrawableHitObject.cs" />
+    <Compile Include="Modes\Objects\HitObject.cs" />
+    <Compile Include="Modes\Objects\Catch\CatchBaseHit.cs" />
+    <Compile Include="Modes\Objects\Catch\Droplet.cs" />
+    <Compile Include="Modes\Objects\Catch\Fruit.cs" />
+    <Compile Include="Modes\Objects\HitObjectConverter.cs" />
+    <Compile Include="Modes\Objects\Mania\Drawable\DrawableNote.cs" />
+    <Compile Include="Modes\Objects\Mania\HoldNote.cs" />
+    <Compile Include="Modes\Objects\Mania\ManiaBaseHit.cs" />
+    <Compile Include="Modes\Objects\Mania\ManiaConverter.cs" />
+    <Compile Include="Modes\Objects\Mania\Note.cs" />
+    <Compile Include="Modes\Objects\Osu\Circle.cs" />
+    <Compile Include="Modes\Objects\Osu\Drawable\DrawableCircle.cs" />
+    <Compile Include="Modes\Objects\Osu\OsuBaseHit.cs" />
+    <Compile Include="Modes\Objects\Osu\OsuConverter.cs" />
+    <Compile Include="Modes\Objects\Osu\Slider.cs" />
+    <Compile Include="Modes\Objects\Osu\Spinner.cs" />
+    <Compile Include="Modes\Objects\Taiko\Drawable\DrawableTaikoHit.cs" />
+    <Compile Include="Modes\Objects\Taiko\TaikoBaseHit.cs" />
+    <Compile Include="Modes\Objects\Taiko\TaikoConverter.cs" />
     <Compile Include="Beatmaps\Samples\HitSampleInfo.cs" />
     <Compile Include="Beatmaps\Samples\SampleBank.cs" />
     <Compile Include="Beatmaps\Samples\SampleInfo.cs" />
@@ -121,37 +121,37 @@
     <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="Modes\Catch\CatchRuleset.cs" />
+    <Compile Include="Modes\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="Modes\Osu\OsuRuleset.cs" />
+    <Compile Include="Modes\Osu\ScoreOverlayOsu.cs" />
     <Compile Include="Beatmaps\Drawable\BeatmapGroup.cs" />
     <Compile Include="Beatmaps\Drawable\BeatmapPanel.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="Modes\PlayMode.cs" />
+    <Compile Include="Modes\Ruleset.cs" />
+    <Compile Include="Modes\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="Modes\Catch\CatchHitRenderer.cs" />
+    <Compile Include="Modes\Catch\CatchPlayfield.cs" />
+    <Compile Include="Modes\HitRenderer.cs" />
+    <Compile Include="Modes\Mania\ManiaHitRenderer.cs" />
+    <Compile Include="Modes\Mania\ManiaPlayfield.cs" />
+    <Compile Include="Modes\Osu\OsuHitRenderer.cs" />
+    <Compile Include="Modes\Osu\OsuPlayfield.cs" />
+    <Compile Include="Modes\Playfield.cs" />
+    <Compile Include="Modes\ScoreOverlay.cs" />
+    <Compile Include="Modes\Taiko\TaikoHitRenderer.cs" />
+    <Compile Include="Modes\Taiko\TaikoPlayfield.cs" />
     <Compile Include="Screens\Edit\EditSongSelect.cs" />
-    <Compile Include="Screens\Play\ComboCounter.cs" />
-    <Compile Include="Screens\Play\ComboResultCounter.cs" />
+    <Compile Include="Modes\ComboCounter.cs" />
+    <Compile Include="Modes\ComboResultCounter.cs" />
     <Compile Include="Graphics\UserInterface\RollingCounter.cs" />
-    <Compile Include="Screens\Play\Taiko\TaikoComboCounter.cs" />
+    <Compile Include="Modes\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="Screens\Play\Mania\ManiaComboCounter.cs" />
+    <Compile Include="Modes\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="Screens\Play\Catch\CatchComboCounter.cs" />
-    <Compile Include="Screens\Play\Osu\OsuComboCounter.cs" />
+    <Compile Include="Modes\Catch\CatchComboCounter.cs" />
+    <Compile Include="Modes\Osu\OsuComboCounter.cs" />
     <Compile Include="Graphics\UserInterface\StarCounter.cs" />
     <Compile Include="IPC\BeatmapImporter.cs" />
     <Compile Include="Online\API\APIAccess.cs" />