Remove intermediate Screens namespace

osu.Game.Tests/Visual/TestCaseBeatDivisorControl.cs

@@ -5,8 +5,8 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Screens.Edit.Screens.Compose;
+using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Screens.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components;
 using OpenTK;
 
 namespace osu.Game.Tests.Visual

osu.Game.Tests/Visual/TestCaseEditorCompose.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Edit.Screens.Compose;
+using osu.Game.Screens.Edit.Compose;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual

osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs

@@ -13,7 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using OpenTK.Graphics;
 
 namespace osu.Game.Tests.Visual

osu.Game.Tests/Visual/TestCaseEditorMenuBar.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Edit.Menus;
+using osu.Game.Screens.Edit.Components.Menus;
 
 namespace osu.Game.Tests.Visual
 {

osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs

@@ -16,8 +16,8 @@ using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks;
 using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks.Components;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Screens.Edit.Screens.Compose;
+using osu.Game.Screens.Edit.Compose;
-using osu.Game.Screens.Edit.Screens.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual

osu.Game.Tests/Visual/TestCaseLabelledTextBox.cs

@@ -5,9 +5,9 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents;
 using System;
 using System.Collections.Generic;
+using osu.Game.Screens.Edit.Setup.Components.LabelledComponents;
 
 namespace osu.Game.Tests.Visual
 {

osu.Game.Tests/Visual/TestCaseZoomableScrollContainer.cs

@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
-using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using OpenTK;
 using OpenTK.Graphics;
 

osu.Game/Rulesets/Edit/HitObjectComposer.cs

@@ -17,7 +17,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Components.RadioButtons;
-using osu.Game.Screens.Edit.Screens.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Edit
 {

osu.Game/Rulesets/Edit/PlacementBlueprint.cs

@@ -10,7 +10,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Screens.Edit.Screens.Compose;
+using osu.Game.Screens.Edit.Compose;
 using OpenTK;
 
 namespace osu.Game.Rulesets.Edit

osu.Game/Screens/Edit/BindableBeatDivisor.cs

@@ -5,7 +5,7 @@ using System;
 using System.Linq;
 using osu.Framework.Configuration;
 
-namespace osu.Game.Screens.Edit.Screens.Compose
+namespace osu.Game.Screens.Edit
 {
     public class BindableBeatDivisor : BindableNumber<int>
     {

osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs

@@ -2,19 +2,18 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Configuration;
-using osu.Framework.Input.Events;
-using osu.Game.Screens.Edit.Screens;
 
-namespace osu.Game.Screens.Edit.Menus
+namespace osu.Game.Screens.Edit.Components.Menus
 {
     public class EditorMenuBar : OsuMenu
     {

osu.Game/Screens/Edit/Components/Menus/EditorMenuItem.cs

@@ -4,7 +4,7 @@
 using System;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Screens.Edit.Menus
+namespace osu.Game.Screens.Edit.Components.Menus
 {
     public class EditorMenuItem : OsuMenuItem
     {

osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-namespace osu.Game.Screens.Edit.Menus
+namespace osu.Game.Screens.Edit.Components.Menus
 {
     public class EditorMenuItemSpacer : EditorMenuItem
     {

osu.Game/Screens/Edit/Components/Menus/ScreenSelectionTabControl.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 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.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -9,10 +8,10 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Edit.Screens;
 using OpenTK;
+using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Menus
+namespace osu.Game.Screens.Edit.Components.Menus
 {
     public class ScreenSelectionTabControl : OsuTabControl<EditorScreenMode>
     {

osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs

@@ -19,7 +19,7 @@ using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components
+namespace osu.Game.Screens.Edit.Compose.Components
 {
     public class BeatDivisorControl : CompositeDrawable
     {

osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs

@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects.Drawables;
 using OpenTK;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components
+namespace osu.Game.Screens.Edit.Compose.Components
 {
     public class BlueprintContainer : CompositeDrawable
     {

osu.Game/Screens/Edit/Compose/Components/DragBox.cs

@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components
+namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
     /// A box that displays the drag selection and provides selection events for users to handle.

osu.Game/Screens/Edit/Compose/Components/EditorPlayfieldBorder.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components
+namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
     /// Provides a border around the playfield.

osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs

@@ -16,7 +16,7 @@ using osu.Game.Rulesets.Edit.Types;
 using OpenTK;
 using OpenTK.Input;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components
+namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
     /// A box which surrounds <see cref="SelectionBlueprint"/>s and provides interactive handles, context menus etc.

osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using OpenTK;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class CentreMarker : CompositeDrawable
     {

osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs

@@ -12,7 +12,7 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class Timeline : ZoomableScrollContainer
     {

osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs

@@ -8,7 +8,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineArea : CompositeDrawable
     {

osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs

@@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineButton : CompositeDrawable
     {

osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs

@@ -9,7 +9,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.MathUtils;
 using OpenTK;
 
-namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class ZoomableScrollContainer : ScrollContainer
     {

osu.Game/Screens/Edit/Compose/Compose.cs

@@ -3,7 +3,6 @@
 
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -11,10 +10,11 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Logging;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Screens.Edit.Screens.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
+using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Screens.Compose
+namespace osu.Game.Screens.Edit.Compose
 {
     [Cached(Type = typeof(IPlacementHandler))]
     public class Compose : EditorScreen, IPlacementHandler

osu.Game/Screens/Edit/Compose/IPlacementHandler.cs

@@ -3,7 +3,7 @@
 
 using osu.Game.Rulesets.Objects;
 
-namespace osu.Game.Screens.Edit.Screens.Compose
+namespace osu.Game.Screens.Edit.Compose
 {
     public interface IPlacementHandler
     {

osu.Game/Screens/Edit/Design/Design.cs

@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Sprites;
 using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Screens.Design
+namespace osu.Game.Screens.Edit.Design
 {
     public class Design : EditorScreen
     {

osu.Game/Screens/Edit/Editor.cs

@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Screens.Edit.Menus;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.UserInterface;
@@ -16,10 +15,8 @@ using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osu.Framework.Timing;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Edit.Screens;
-using osu.Game.Screens.Edit.Screens.Compose;
-using osu.Game.Screens.Edit.Screens.Design;
 using osu.Game.Screens.Edit.Components;
+using osu.Game.Screens.Edit.Components.Menus;
 
 namespace osu.Game.Screens.Edit
 {
@@ -169,10 +166,10 @@ namespace osu.Game.Screens.Edit
             switch (mode)
             {
                 case EditorScreenMode.Compose:
-                    currentScreen = new Compose();
+                    currentScreen = new Compose.Compose();
                     break;
                 case EditorScreenMode.Design:
-                    currentScreen = new Design();
+                    currentScreen = new Design.Design();
                     break;
                 default:
                     currentScreen = new EditorScreen();

osu.Game/Screens/Edit/EditorClock.cs

@@ -7,7 +7,6 @@ using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Screens.Edit.Screens.Compose;
 using OpenTK;
 
 namespace osu.Game.Screens.Edit

osu.Game/Screens/Edit/EditorScreen.cs

@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 
-namespace osu.Game.Screens.Edit.Screens
+namespace osu.Game.Screens.Edit
 {
     /// <summary>
     /// TODO: eventually make this inherit Screen and add a local scren stack inside the Editor.

osu.Game/Screens/Edit/EditorScreenMode.cs

@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.Screens.Edit.Screens
+namespace osu.Game.Screens.Edit
 {
     public enum EditorScreenMode
     {

osu.Game/Screens/Edit/Setup/Components/LabelledComponents/LabelledTextBox.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
-using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -10,8 +9,9 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using OpenTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents
+namespace osu.Game.Screens.Edit.Setup.Components.LabelledComponents
 {
     public class LabelledTextBox : CompositeDrawable
     {

osu.Game/Tests/Visual/EditorClockTestCase.cs

@@ -7,7 +7,6 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Screens.Compose;
 
 namespace osu.Game.Tests.Visual
 {

osu.Game/Tests/Visual/EditorTestCase.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Edit.Screens;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual

osu.Game/Tests/Visual/PlacementBlueprintTestCase.cs

@@ -8,7 +8,7 @@ using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Screens.Edit.Screens.Compose;
+using osu.Game.Screens.Edit.Compose;
 
 namespace osu.Game.Tests.Visual
 {