diff --git a/osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs b/osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs
index 793643d91f..7a22e46c09 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs
@@ -15,9 +15,7 @@ using osu.Framework.Timing;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using System.Linq;
 using osu.Game.Rulesets.Mania.Timing;
-using osu.Game.Rulesets.Mania.Timing.Drawables;
 using osu.Game.Rulesets.Timing;
-using osu.Game.Rulesets.Timing.Drawables;
 
 namespace osu.Desktop.VisualTests.Tests
 {
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
index 1a0b97a625..3e4f7ae0ea 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
@@ -13,10 +13,8 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Timing;
-using osu.Game.Rulesets.Mania.Timing.Drawables;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Timing;
-using osu.Game.Rulesets.Timing.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
diff --git a/osu.Game.Rulesets.Mania/Timing/Drawables/BasicScrollingDrawableTimingSection.cs b/osu.Game.Rulesets.Mania/Timing/BasicScrollingDrawableTimingSection.cs
similarity index 90%
rename from osu.Game.Rulesets.Mania/Timing/Drawables/BasicScrollingDrawableTimingSection.cs
rename to osu.Game.Rulesets.Mania/Timing/BasicScrollingDrawableTimingSection.cs
index 581887f574..eaad81757f 100644
--- a/osu.Game.Rulesets.Mania/Timing/Drawables/BasicScrollingDrawableTimingSection.cs
+++ b/osu.Game.Rulesets.Mania/Timing/BasicScrollingDrawableTimingSection.cs
@@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Timing;
 using osu.Game.Rulesets.Timing.Drawables;
 
-namespace osu.Game.Rulesets.Mania.Timing.Drawables
+namespace osu.Game.Rulesets.Mania.Timing
 {
     internal class BasicScrollingDrawableTimingSection : DrawableTimingSection
     {
diff --git a/osu.Game.Rulesets.Mania/Timing/Drawables/GravityScrollingDrawableTimingSection.cs b/osu.Game.Rulesets.Mania/Timing/GravityScrollingDrawableTimingSection.cs
similarity index 89%
rename from osu.Game.Rulesets.Mania/Timing/Drawables/GravityScrollingDrawableTimingSection.cs
rename to osu.Game.Rulesets.Mania/Timing/GravityScrollingDrawableTimingSection.cs
index 9e90acde96..ca66902799 100644
--- a/osu.Game.Rulesets.Mania/Timing/Drawables/GravityScrollingDrawableTimingSection.cs
+++ b/osu.Game.Rulesets.Mania/Timing/GravityScrollingDrawableTimingSection.cs
@@ -1,12 +1,11 @@
 // Copyright (c) 2007-2017 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.Game.Rulesets.Timing;
 using osu.Game.Rulesets.Timing.Drawables;
 
-namespace osu.Game.Rulesets.Mania.Timing.Drawables
+namespace osu.Game.Rulesets.Mania.Timing
 {
     internal class GravityScrollingDrawableTimingSection : DrawableTimingSection
     {
@@ -52,10 +51,10 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
         private double acceleration => 1 / VisibleTimeRange;
 
         /// <summary>
-        /// Computes the current time relative to <paramref name="time"/>, accounting for <see cref="timeSpan"/>.
+        /// Computes the current time relative to <paramref name="time"/>, accounting for <see cref="DrawableTimingSection.VisibleTimeRange"/>.
         /// </summary>
         /// <param name="time">The non-offset time.</param>
-        /// <returns>The current time relative to <paramref name="time"/> - <see cref="timeSpan"/>. </returns>
+        /// <returns>The current time relative to <paramref name="time"/> - <see cref="DrawableTimingSection.VisibleTimeRange"/>. </returns>
         private double relativeTimeAt(double time) => Time.Current - time + VisibleTimeRange;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Timing/Drawables/ManiaSpeedAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/Timing/ManiaSpeedAdjustmentContainer.cs
similarity index 94%
rename from osu.Game.Rulesets.Mania/Timing/Drawables/ManiaSpeedAdjustmentContainer.cs
rename to osu.Game.Rulesets.Mania/Timing/ManiaSpeedAdjustmentContainer.cs
index fb15ff99ed..28530e2e1e 100644
--- a/osu.Game.Rulesets.Mania/Timing/Drawables/ManiaSpeedAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Mania/Timing/ManiaSpeedAdjustmentContainer.cs
@@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Timing;
 using osu.Game.Rulesets.Timing.Drawables;
 
-namespace osu.Game.Rulesets.Mania.Timing.Drawables
+namespace osu.Game.Rulesets.Mania.Timing
 {
     public class ManiaSpeedAdjustmentContainer : SpeedAdjustmentContainer
     {
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 4737cd3db1..a0dc0a8c18 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using System;
 using osu.Framework.Configuration;
 using osu.Game.Rulesets.Timing;
-using osu.Game.Rulesets.Timing.Drawables;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
index 33b2faf3ba..770a01185b 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
@@ -21,12 +21,10 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mania.Timing;
-using osu.Game.Rulesets.Mania.Timing.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Timing;
-using osu.Game.Rulesets.Timing.Drawables;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.UI
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index dd3e3fee1e..dbf2fa2d65 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -15,14 +15,12 @@ using osu.Framework.Allocation;
 using OpenTK.Input;
 using System.Linq;
 using System.Collections.Generic;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Input;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Timing;
-using osu.Game.Rulesets.Timing.Drawables;
 using osu.Framework.Configuration;
 
 namespace osu.Game.Rulesets.Mania.UI
diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
index eda50dd627..1560d780be 100644
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@@ -77,8 +77,8 @@
     <Compile Include="Objects\ManiaHitObject.cs" />
     <Compile Include="Objects\Note.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Timing\Drawables\BasicScrollingDrawableTimingSection.cs" />
-    <Compile Include="Timing\Drawables\GravityScrollingDrawableTimingSection.cs" />
+    <Compile Include="Timing\BasicScrollingDrawableTimingSection.cs" />
+    <Compile Include="Timing\GravityScrollingDrawableTimingSection.cs" />
     <Compile Include="Timing\ScrollingAlgorithm.cs" />
     <Compile Include="UI\Column.cs" />
     <Compile Include="UI\ManiaHitRenderer.cs" />
@@ -87,7 +87,7 @@
     <Compile Include="Mods\ManiaMod.cs" />
     <Compile Include="Mods\ManiaModGravity.cs" />
     <Compile Include="UI\SpecialColumnPosition.cs" />
-    <Compile Include="Timing\Drawables\ManiaSpeedAdjustmentContainer.cs" />
+    <Compile Include="Timing\ManiaSpeedAdjustmentContainer.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
diff --git a/osu.Game/Rulesets/Timing/Drawables/DrawableTimingSection.cs b/osu.Game/Rulesets/Timing/DrawableTimingSection.cs
similarity index 100%
rename from osu.Game/Rulesets/Timing/Drawables/DrawableTimingSection.cs
rename to osu.Game/Rulesets/Timing/DrawableTimingSection.cs
diff --git a/osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs b/osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs
index 2ebda1ffb5..c50f417add 100644
--- a/osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs
+++ b/osu.Game/Rulesets/Timing/SpeedAdjustmentCollection.cs
@@ -8,7 +8,6 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Timing.Drawables;
 
 namespace osu.Game.Rulesets.Timing
 {
diff --git a/osu.Game/Rulesets/Timing/Drawables/SpeedAdjustmentContainer.cs b/osu.Game/Rulesets/Timing/SpeedAdjustmentContainer.cs
similarity index 95%
rename from osu.Game/Rulesets/Timing/Drawables/SpeedAdjustmentContainer.cs
rename to osu.Game/Rulesets/Timing/SpeedAdjustmentContainer.cs
index bb2c6eec28..449d3fe51d 100644
--- a/osu.Game/Rulesets/Timing/Drawables/SpeedAdjustmentContainer.cs
+++ b/osu.Game/Rulesets/Timing/SpeedAdjustmentContainer.cs
@@ -3,13 +3,14 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Timing.Drawables;
 using OpenTK;
-using osu.Framework.Configuration;
 
-namespace osu.Game.Rulesets.Timing.Drawables
+namespace osu.Game.Rulesets.Timing
 {
     /// <summary>
     /// A container for hit objects which applies applies the speed changes defined by the <see cref="Timing.SpeedAdjustment.BeatLength"/> and <see cref="Timing.SpeedAdjustment.SpeedMultiplier"/>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fcb890fe28..90c690bbda 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -195,8 +195,8 @@
     <Compile Include="Database\RulesetDatabase.cs" />
     <Compile Include="Rulesets\Scoring\Score.cs" />
     <Compile Include="Rulesets\Scoring\ScoreProcessor.cs" />
-    <Compile Include="Rulesets\Timing\Drawables\SpeedAdjustmentContainer.cs" />
-    <Compile Include="Rulesets\Timing\Drawables\DrawableTimingSection.cs" />
+    <Compile Include="Rulesets\Timing\SpeedAdjustmentContainer.cs" />
+    <Compile Include="Rulesets\Timing\DrawableTimingSection.cs" />
     <Compile Include="Rulesets\Timing\SpeedAdjustment.cs" />
     <Compile Include="Rulesets\Timing\SpeedAdjustmentCollection.cs" />
     <Compile Include="Screens\Menu\MenuSideFlashes.cs" />