diff --git a/osu.Game/Screens/Edit/Screens/Compose/BeatmapWaveformGraph.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/BeatmapWaveformGraph.cs
similarity index 91%
rename from osu.Game/Screens/Edit/Screens/Compose/BeatmapWaveformGraph.cs
rename to osu.Game/Screens/Edit/Screens/Compose/Timeline/BeatmapWaveformGraph.cs
index f204c8c525..5acee675e8 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/BeatmapWaveformGraph.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/BeatmapWaveformGraph.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 
-namespace osu.Game.Screens.Edit.Screens.Compose
+namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
 {
     public class BeatmapWaveformGraph : CompositeDrawable
     {
diff --git a/osu.Game/Screens/Edit/Screens/Compose/ScrollableTimeline.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
similarity index 63%
rename from osu.Game/Screens/Edit/Screens/Compose/ScrollableTimeline.cs
rename to osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
index b5445883ab..5999241f61 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/ScrollableTimeline.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
@@ -12,7 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Screens.Edit.Screens.Compose
+namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
 {
     public class ScrollableTimeline : CompositeDrawable
     {
@@ -118,89 +118,5 @@ namespace osu.Game.Screens.Edit.Screens.Compose
 
             timelineContainer.Size = new Vector2(DrawSize.X - timelineContainer.DrawPosition.X, 1);
         }
-
-        private class ScrollingTimelineContainer : ScrollContainer
-        {
-            public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
-
-            private readonly BeatmapWaveformGraph graph;
-
-            public ScrollingTimelineContainer()
-                : base(Direction.Horizontal)
-            {
-                Masking = true;
-
-                Add(graph = new BeatmapWaveformGraph
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.FromHex("222"),
-                    Depth = float.MaxValue,
-                });
-
-                Content.AutoSizeAxes = Axes.None;
-                Content.RelativeSizeAxes = Axes.Both;
-
-                graph.Beatmap.BindTo(Beatmap);
-            }
-
-            private float minZoom = 1;
-            public float MinZoom
-            {
-                get { return minZoom; }
-                set
-                {
-                    if (value <= 0)
-                        throw new ArgumentOutOfRangeException(nameof(value));
-                    if (minZoom == value)
-                        return;
-                    minZoom = value;
-                }
-            }
-
-            private float maxZoom = 30;
-            public float MaxZoom
-            {
-                get { return maxZoom; }
-                set
-                {
-                    if (value <= 0)
-                        throw new ArgumentOutOfRangeException(nameof(value));
-                    if (maxZoom == value)
-                        return;
-                    maxZoom = value;
-                }
-            }
-
-            private float zoom = 1;
-            public float Zoom
-            {
-                get { return zoom; }
-                set
-                {
-                    value = MathHelper.Clamp(value, MinZoom, MaxZoom);
-                    if (zoom == value)
-                        return;
-                    zoom = value;
-
-                    Content.ResizeWidthTo(Zoom);
-                }
-            }
-
-            protected override bool OnWheel(InputState state)
-            {
-                if (!state.Keyboard.ControlPressed)
-                    return base.OnWheel(state);
-
-                float relativeContentPosition = Content.ToLocalSpace(state.Mouse.NativeState.Position).X / Content.DrawSize.X;
-                float position = ToLocalSpace(state.Mouse.NativeState.Position).X;
-
-                Zoom += state.Mouse.WheelDelta;
-
-                float scrollPos = Content.DrawSize.X * relativeContentPosition - position;
-                ScrollTo(scrollPos, false);
-
-                return true;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
new file mode 100644
index 0000000000..f4795452d5
--- /dev/null
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
@@ -0,0 +1,113 @@
+// 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 OpenTK;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
+{
+    internal class ScrollingTimelineContainer : ScrollContainer
+    {
+        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+
+        private readonly BeatmapWaveformGraph graph;
+
+        public ScrollingTimelineContainer()
+            : base(Direction.Horizontal)
+        {
+            Masking = true;
+
+            Add(graph = new BeatmapWaveformGraph
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = OsuColour.FromHex("222"),
+                Depth = float.MaxValue,
+            });
+
+            Content.AutoSizeAxes = Axes.None;
+            Content.RelativeSizeAxes = Axes.Both;
+
+            graph.Beatmap.BindTo(Beatmap);
+        }
+
+        private float minZoom = 1;
+        /// <summary>
+        /// The minimum zoom level allowed.
+        /// </summary>
+        public float MinZoom
+        {
+            get { return minZoom; }
+            set
+            {
+                if (value <= 0)
+                    throw new ArgumentOutOfRangeException(nameof(value));
+                if (minZoom == value)
+                    return;
+                minZoom = value;
+
+                // Update the zoom level
+                Zoom = Zoom;
+            }
+        }
+
+        private float maxZoom = 30;
+        /// <summary>
+        /// The maximum zoom level allowed.
+        /// </summary>
+        public float MaxZoom
+        {
+            get { return maxZoom; }
+            set
+            {
+                if (value <= 0)
+                    throw new ArgumentOutOfRangeException(nameof(value));
+                if (maxZoom == value)
+                    return;
+                maxZoom = value;
+
+                // Update the zoom level
+                Zoom = Zoom;
+            }
+        }
+
+        private float zoom = 1;
+        /// <summary>
+        /// The current zoom level.
+        /// </summary>
+        public float Zoom
+        {
+            get { return zoom; }
+            set
+            {
+                value = MathHelper.Clamp(value, MinZoom, MaxZoom);
+                if (zoom == value)
+                    return;
+                zoom = value;
+
+                Content.ResizeWidthTo(Zoom);
+            }
+        }
+
+        protected override bool OnWheel(InputState state)
+        {
+            if (!state.Keyboard.ControlPressed)
+                return base.OnWheel(state);
+
+            float relativeContentPosition = Content.ToLocalSpace(state.Mouse.NativeState.Position).X / Content.DrawSize.X;
+            float position = ToLocalSpace(state.Mouse.NativeState.Position).X;
+
+            Zoom += state.Mouse.WheelDelta;
+
+            float scrollPos = Content.DrawSize.X * relativeContentPosition - position;
+            ScrollTo(scrollPos, false);
+
+            return true;
+        }
+    }
+}
diff --git a/osu.Game/Tests/Visual/TestCaseEditorComposeTimeline.cs b/osu.Game/Tests/Visual/TestCaseEditorComposeTimeline.cs
index 4ec3b8c661..40d617d2ea 100644
--- a/osu.Game/Tests/Visual/TestCaseEditorComposeTimeline.cs
+++ b/osu.Game/Tests/Visual/TestCaseEditorComposeTimeline.cs
@@ -9,12 +9,13 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Game.Screens.Edit.Screens.Compose;
+using osu.Game.Screens.Edit.Screens.Compose.Timeline;
 
 namespace osu.Game.Tests.Visual
 {
     public class TestCaseEditorComposeTimeline : OsuTestCase
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ScrollableTimeline), typeof(BeatmapWaveformGraph) };
+        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ScrollableTimeline), typeof(ScrollingTimelineContainer), typeof(BeatmapWaveformGraph) };
 
         private readonly ScrollableTimeline timeline;
 
diff --git a/osu.Game/Tests/Visual/TestCaseWaveform.cs b/osu.Game/Tests/Visual/TestCaseWaveform.cs
index 4a6e93c7bf..c87be7e4b8 100644
--- a/osu.Game/Tests/Visual/TestCaseWaveform.cs
+++ b/osu.Game/Tests/Visual/TestCaseWaveform.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Screens.Edit.Screens.Compose;
+using osu.Game.Screens.Edit.Screens.Compose.Timeline;
 
 namespace osu.Game.Tests.Visual
 {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b1d410ba50..321c2df4b5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -266,7 +266,7 @@
     <Compile Include="Beatmaps\Drawables\BeatmapPanel.cs" />
     <Compile Include="Beatmaps\Drawables\BeatmapSetCover.cs" />
     <Compile Include="Beatmaps\Drawables\BeatmapSetHeader.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\BeatmapWaveformGraph.cs" />
+    <Compile Include="Screens\Edit\Screens\Compose\Timeline\BeatmapWaveformGraph.cs" />
     <Compile Include="Beatmaps\Drawables\DifficultyColouredContainer.cs" />
     <Compile Include="Beatmaps\Drawables\DifficultyIcon.cs" />
     <Compile Include="Beatmaps\Drawables\Panel.cs" />
@@ -630,7 +630,8 @@
     <Compile Include="Screens\Edit\Screens\Design\Design.cs" />
     <Compile Include="Screens\Edit\Screens\EditorScreen.cs" />
     <Compile Include="Screens\Edit\Screens\Compose\Compose.cs" />
-    <Compile Include="Screens\Edit\Screens\Compose\ScrollableTimeline.cs" />
+    <Compile Include="Screens\Edit\Screens\Compose\Timeline\ScrollableTimeline.cs" />
+    <Compile Include="Screens\Edit\Screens\Compose\Timeline\ScrollingTimelineContainer.cs" />
     <Compile Include="Screens\Loader.cs" />
     <Compile Include="Screens\Menu\Button.cs" />
     <Compile Include="Screens\Menu\ButtonSystem.cs" />