diff --git a/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
index fdf791d2d1..7f53409a32 100644
--- a/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
+++ b/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
-using osu.Game.Rulesets.Osu.Edit.Masks;
+using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle;
 using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Edit
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCircleMask.cs
similarity index 87%
rename from osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCircleMask.cs
index 696726e8bf..b43399ff18 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/Components/HitCircleMask.cs
@@ -9,13 +9,13 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using OpenTK;
 
-namespace osu.Game.Rulesets.Osu.Edit.Masks
+namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components
 {
     public class HitCircleMask : CompositeDrawable
     {
-        private readonly HitCircle hitCircle;
+        private readonly Objects.HitCircle hitCircle;
 
-        public HitCircleMask(HitCircle hitCircle)
+        public HitCircleMask(Objects.HitCircle hitCircle)
         {
             this.hitCircle = hitCircle;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCirclePlacementMask.cs
similarity index 81%
rename from osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCirclePlacementMask.cs
index 2c259f562d..c7bc7decc4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCirclePlacementMask.cs
@@ -3,16 +3,16 @@
 
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
 
-namespace osu.Game.Rulesets.Osu.Edit.Masks
+namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle
 {
     public class HitCirclePlacementMask : PlacementMask
     {
-        public new HitCircle HitObject => (HitCircle)base.HitObject;
+        public new Objects.HitCircle HitObject => (Objects.HitCircle)base.HitObject;
 
         public HitCirclePlacementMask()
-            : base(new HitCircle())
+            : base(new Objects.HitCircle())
         {
             InternalChild = new HitCircleMask(HitObject);
         }
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircleSelectionMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCircleSelectionMask.cs
similarity index 67%
rename from osu.Game.Rulesets.Osu/Edit/Masks/HitCircleSelectionMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCircleSelectionMask.cs
index 49ff955896..dd6bcc6fad 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircleSelectionMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircle/HitCircleSelectionMask.cs
@@ -2,17 +2,17 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Osu.Edit.Masks
+namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircle
 {
     public class HitCircleSelectionMask : SelectionMask
     {
         public HitCircleSelectionMask(DrawableHitCircle hitCircle)
             : base(hitCircle)
         {
-            InternalChild = new HitCircleMask((HitCircle)hitCircle.HitObject);
+            InternalChild = new HitCircleMask((Objects.HitCircle)hitCircle.HitObject);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/SliderBodyMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderBodyMask.cs
similarity index 88%
rename from osu.Game.Rulesets.Osu/Edit/Masks/SliderBodyMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderBodyMask.cs
index c95b2d7722..733a777dff 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/SliderBodyMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderBodyMask.cs
@@ -4,18 +4,17 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using OpenTK.Graphics;
 
-namespace osu.Game.Rulesets.Osu.Edit.Masks
+namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components
 {
     public class SliderBodyMask : CompositeDrawable
     {
-        private readonly Slider slider;
+        private readonly Objects.Slider slider;
         private readonly SliderBody body;
 
-        public SliderBodyMask(Slider slider)
+        public SliderBodyMask(Objects.Slider slider)
         {
             this.slider = slider;
             InternalChild = body = new SliderBody(slider)
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/SliderCircleMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCircleMask.cs
similarity index 76%
rename from osu.Game.Rulesets.Osu/Edit/Masks/SliderCircleMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCircleMask.cs
index de128552c6..37c0846285 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/SliderCircleMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/Components/SliderCircleMask.cs
@@ -1,16 +1,16 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
 
-namespace osu.Game.Rulesets.Osu.Edit.Masks
+namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components
 {
     public class SliderCircleMask : HitCircleMask
     {
-        private readonly Slider slider;
+        private readonly Objects.Slider slider;
         private readonly SliderPosition position;
 
-        public SliderCircleMask(Slider slider, SliderPosition position)
+        public SliderCircleMask(Objects.Slider slider, SliderPosition position)
             : base(slider.HeadCircle)
         {
             this.slider = slider;
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/SliderCircleSelectionMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderCircleSelectionMask.cs
similarity index 81%
rename from osu.Game.Rulesets.Osu/Edit/Masks/SliderCircleSelectionMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderCircleSelectionMask.cs
index ebbb050c18..22aadba478 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/SliderCircleSelectionMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderCircleSelectionMask.cs
@@ -2,14 +2,14 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Osu.Edit.Masks
+namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
 {
     public class SliderCircleSelectionMask : SelectionMask
     {
-        public SliderCircleSelectionMask(DrawableOsuHitObject hitObject, Slider slider, SliderPosition position)
+        public SliderCircleSelectionMask(DrawableOsuHitObject hitObject, Objects.Slider slider, SliderPosition position)
             : base(hitObject)
         {
             InternalChild = new SliderCircleMask(slider, position);
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/SliderPosition.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderPosition.cs
similarity index 82%
rename from osu.Game.Rulesets.Osu/Edit/Masks/SliderPosition.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderPosition.cs
index dc5f670d48..07f45af3ef 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/SliderPosition.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderPosition.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.Rulesets.Osu.Edit.Masks
+namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
 {
     public enum SliderPosition
     {
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/SliderSelectionMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderSelectionMask.cs
similarity index 84%
rename from osu.Game.Rulesets.Osu/Edit/Masks/SliderSelectionMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderSelectionMask.cs
index c330641bcf..e22a8119f9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/SliderSelectionMask.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderSelectionMask.cs
@@ -3,11 +3,11 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Edit.Masks.Slider.Components;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using OpenTK;
 
-namespace osu.Game.Rulesets.Osu.Edit.Masks
+namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
 {
     public class SliderSelectionMask : SelectionMask
     {
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks
         public SliderSelectionMask(DrawableSlider slider)
             : base(slider)
         {
-            var sliderObject = (Slider)slider.HitObject;
+            var sliderObject = (Objects.Slider)slider.HitObject;
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 2dbd15fdc0..df72d2acca 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -8,7 +8,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Edit.Masks;
+using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle;
+using osu.Game.Rulesets.Osu.Edit.Masks.Slider;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.UI;
diff --git a/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs b/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
index 9e1ec7feb2..8b7355e456 100644
--- a/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
@@ -13,7 +13,8 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Edit;
-using osu.Game.Rulesets.Osu.Edit.Masks;
+using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle;
+using osu.Game.Rulesets.Osu.Edit.Masks.HitCircle.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Screens.Compose;
 using osu.Game.Screens.Edit.Screens.Compose.Layers;