diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
index 7aeb75ef8d..1f0bdf40e0 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
@@ -6,7 +6,7 @@ using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 
 namespace osu.Desktop.VisualTests.Tests
 {
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
index 7d606d7dd3..c7ef33c573 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
@@ -8,7 +8,7 @@ using osu.Framework.Testing;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
 using osu.Game.Modes.Taiko.Objects;
-using osu.Game.Modes.Taiko.Objects.Drawable;
+using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.UI;
 
 namespace osu.Desktop.VisualTests.Tests
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBarLine.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableBarLine.cs
similarity index 94%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableBarLine.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableBarLine.cs
index 8c963a8e4f..6567975796 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBarLine.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using OpenTK;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     /// <summary>
     /// A line that scrolls alongside hit objects in the playfield and visualises control points.
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableCentreHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs
similarity index 85%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableCentreHit.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs
index 76eb6bb77d..c79351f4d9 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableCentreHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs
@@ -1,12 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
-using osu.Game.Graphics;
 using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK.Input;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableCentreHit : DrawableHit
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRoll.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
similarity index 94%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRoll.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index ea6b0043d7..4e8d75315d 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRoll.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -1,18 +1,18 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using OpenTK.Graphics;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
-using System.Linq;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK;
+using OpenTK.Graphics;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableDrumRoll : DrawableTaikoHitObject
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRollTick.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
similarity index 95%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRollTick.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index b7509bc51d..85f9e32c6c 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableDrumRollTick.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -1,17 +1,17 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
-using osu.Game.Modes.Taiko.Judgements;
 using System;
-using osu.Game.Modes.Objects.Drawables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Judgements;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Graphics.Sprites;
+using OpenTK.Input;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableDrumRollTick : DrawableTaikoHitObject
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs
similarity index 91%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs
index 87f0e76f60..25ecd5ac84 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs
@@ -1,16 +1,16 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
+using System;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
-using System;
-using System.Linq;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK.Input;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public abstract class DrawableHit : DrawableTaikoHitObject
     {
@@ -19,7 +19,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         /// </summary>
         protected abstract Key[] HitKeys { get; }
 
-        protected override Container<Framework.Graphics.Drawable> Content => bodyContainer;
+        protected override Container<Drawable> Content => bodyContainer;
 
         protected readonly CirclePiece Circle;
 
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableMajorBarLine.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableMajorBarLine.cs
similarity index 94%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableMajorBarLine.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableMajorBarLine.cs
index 684ea93dec..14d3d84f4b 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableMajorBarLine.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableMajorBarLine.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using OpenTK;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableMajorBarLine : DrawableBarLine
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableRimHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs
similarity index 85%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableRimHit.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs
index 893a6fbb4d..0fa51b1661 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableRimHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs
@@ -3,10 +3,10 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 using OpenTK.Input;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableRimHit : DrawableHit
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongCentreHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongCentreHit.cs
similarity index 85%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongCentreHit.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongCentreHit.cs
index bac44f48fb..815c19779a 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongCentreHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongCentreHit.cs
@@ -1,12 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK.Input;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableStrongCentreHit : DrawableStrongHit
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongDrumRoll.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongDrumRoll.cs
similarity index 82%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongDrumRoll.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongDrumRoll.cs
index e9723a0162..bb7e197502 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongDrumRoll.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongDrumRoll.cs
@@ -2,9 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Modes.Taiko.Judgements;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableStrongDrumRoll : DrawableDrumRoll
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongHit.cs
similarity index 95%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongHit.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongHit.cs
index a6cb6ae7fa..116ef94ee4 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongHit.cs
@@ -1,14 +1,14 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
 using System;
 using System.Linq;
 using osu.Framework.Input;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
+using OpenTK.Input;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public abstract class DrawableStrongHit : DrawableHit
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongRimHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongRimHit.cs
similarity index 85%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongRimHit.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongRimHit.cs
index 985ba1c2df..3af0ff399b 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableStrongRimHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongRimHit.cs
@@ -3,10 +3,10 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 using OpenTK.Input;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableStrongRimHit : DrawableStrongHit
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableSwell.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableSwell.cs
similarity index 94%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableSwell.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableSwell.cs
index ec1ab42bfc..717cda9126 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableSwell.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -1,9 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using OpenTK.Graphics;
-using OpenTK.Input;
+using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -12,11 +11,12 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
-using osu.Game.Modes.Taiko.Objects.Drawable.Pieces;
-using System;
-using System.Linq;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public class DrawableSwell : DrawableTaikoHitObject
     {
@@ -56,11 +56,11 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         {
             this.swell = swell;
 
-            Children = new Framework.Graphics.Drawable[]
+            Children = new Drawable[]
             {
                 bodyContainer = new Container
                 {
-                    Children = new Framework.Graphics.Drawable[]
+                    Children = new Drawable[]
                     {
                         expandingRing = new CircularContainer
                         {
@@ -89,7 +89,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
                             Masking = true,
                             BorderThickness = target_ring_thick_border,
                             BlendingMode = BlendingMode.Additive,
-                            Children = new Framework.Graphics.Drawable[]
+                            Children = new Drawable[]
                             {
                                 new Box
                                 {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
similarity index 95%
rename from osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 8da05d8bed..5f85903827 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -1,14 +1,14 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
+using System.Collections.Generic;
 using osu.Framework.Graphics;
+using osu.Framework.Input;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
-using System.Collections.Generic;
-using osu.Framework.Input;
+using OpenTK.Input;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable
+namespace osu.Game.Modes.Taiko.Objects.Drawables
 {
     public abstract class DrawableTaikoHitObject : DrawableHitObject<TaikoHitObject, TaikoJudgement>
     {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CentreHitSymbolPiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs
similarity index 90%
rename from osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CentreHitSymbolPiece.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs
index e62ca6b073..0cf4e97b41 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CentreHitSymbolPiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CentreHitSymbolPiece.cs
@@ -1,12 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using OpenTK;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
 {
     /// <summary>
     /// The symbol used for centre hit pieces.
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CirclePiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
similarity index 92%
rename from osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CirclePiece.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index d51c06bcad..941ef3b37f 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CirclePiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -1,16 +1,16 @@
 // 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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using OpenTK.Graphics;
-using System;
-using osu.Game.Graphics;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
 {
     /// <summary>
     /// A circle piece which is used uniformly through osu!taiko to visualise hitobjects.
@@ -63,7 +63,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
             set { throw new InvalidOperationException($"{nameof(CirclePiece)} must always use CentreLeft origin."); }
         }
 
-        protected override Container<Framework.Graphics.Drawable> Content => SymbolContainer;
+        protected override Container<Drawable> Content => SymbolContainer;
         protected readonly Container SymbolContainer;
 
         private readonly Container background;
@@ -81,7 +81,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Y,
-                Children = new Framework.Graphics.Drawable[]
+                Children = new Drawable[]
                 {
                     background = new CircularContainer
                     {
@@ -90,7 +90,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
                         Masking = true,
-                        Children = new Framework.Graphics.Drawable[]
+                        Children = new Drawable[]
                         {
                             new Box
                             {
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/RimHitSymbolPiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/RimHitSymbolPiece.cs
similarity index 91%
rename from osu.Game.Modes.Taiko/Objects/Drawable/Pieces/RimHitSymbolPiece.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/Pieces/RimHitSymbolPiece.cs
index 6999634108..6e19497978 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/RimHitSymbolPiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/RimHitSymbolPiece.cs
@@ -1,13 +1,13 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
 {
     /// <summary>
     /// The symbol used for rim hit pieces.
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/StrongCirclePiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/StrongCirclePiece.cs
similarity index 90%
rename from osu.Game.Modes.Taiko/Objects/Drawable/Pieces/StrongCirclePiece.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/Pieces/StrongCirclePiece.cs
index 319ca17cb8..9676c4a19f 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/StrongCirclePiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/StrongCirclePiece.cs
@@ -3,7 +3,7 @@
 
 using OpenTK;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
 {
     /// <summary>
     /// A type of circle piece which is drawn at a higher scale to represent a "strong" piece.
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/SwellSymbolPiece.cs b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
similarity index 88%
rename from osu.Game.Modes.Taiko/Objects/Drawable/Pieces/SwellSymbolPiece.cs
rename to osu.Game.Modes.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
index 2bd86406a7..e491793902 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/SwellSymbolPiece.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs
@@ -1,10 +1,10 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Graphics;
 using osu.Framework.Graphics;
+using osu.Game.Graphics;
 
-namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces
+namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
 {
     /// <summary>
     /// The symbol used for swell pieces.
diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
index a44410c4a4..9399994078 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
@@ -13,7 +13,7 @@ using osu.Game.Modes.Scoring;
 using osu.Game.Modes.Taiko.Beatmaps;
 using osu.Game.Modes.Taiko.Judgements;
 using osu.Game.Modes.Taiko.Objects;
-using osu.Game.Modes.Taiko.Objects.Drawable;
+using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.Scoring;
 using osu.Game.Modes.UI;
 using osu.Game.Modes.Taiko.Replays;
diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index 65cb0db33e..958055d768 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -14,8 +14,8 @@ using osu.Game.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Primitives;
-using osu.Game.Modes.Taiko.Objects.Drawable;
 using System.Linq;
+using osu.Game.Modes.Taiko.Objects.Drawables;
 
 namespace osu.Game.Modes.Taiko.UI
 {
diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
index 261dda95ed..1fbf1b27a1 100644
--- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
+++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
@@ -54,25 +54,25 @@
     <Compile Include="Judgements\TaikoJudgement.cs" />
     <Compile Include="Judgements\TaikoHitResult.cs" />
     <Compile Include="Objects\BarLine.cs" />
-    <Compile Include="Objects\Drawable\DrawableBarLine.cs" />
-    <Compile Include="Objects\Drawable\DrawableMajorBarLine.cs" />
+    <Compile Include="Objects\Drawables\DrawableBarLine.cs" />
+    <Compile Include="Objects\Drawables\DrawableMajorBarLine.cs" />
     <Compile Include="Objects\CentreHit.cs" />
-    <Compile Include="Objects\Drawable\DrawableRimHit.cs" />
-    <Compile Include="Objects\Drawable\DrawableStrongRimHit.cs" />
-    <Compile Include="Objects\Drawable\DrawableCentreHit.cs" />
-    <Compile Include="Objects\Drawable\DrawableHit.cs" />
-    <Compile Include="Objects\Drawable\DrawableStrongDrumRoll.cs" />
-    <Compile Include="Objects\Drawable\DrawableStrongCentreHit.cs" />
-    <Compile Include="Objects\Drawable\DrawableStrongHit.cs" />
-    <Compile Include="Objects\Drawable\Pieces\CentreHitSymbolPiece.cs" />
-    <Compile Include="Objects\Drawable\DrawableDrumRoll.cs" />
-    <Compile Include="Objects\Drawable\DrawableDrumRollTick.cs" />
-    <Compile Include="Objects\Drawable\DrawableSwell.cs" />
-    <Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
-    <Compile Include="Objects\Drawable\Pieces\RimHitSymbolPiece.cs" />
-    <Compile Include="Objects\Drawable\Pieces\StrongCirclePiece.cs" />
-    <Compile Include="Objects\Drawable\Pieces\CirclePiece.cs" />
-    <Compile Include="Objects\Drawable\Pieces\SwellSymbolPiece.cs" />
+    <Compile Include="Objects\Drawables\DrawableRimHit.cs" />
+    <Compile Include="Objects\Drawables\DrawableStrongRimHit.cs" />
+    <Compile Include="Objects\Drawables\DrawableCentreHit.cs" />
+    <Compile Include="Objects\Drawables\DrawableHit.cs" />
+    <Compile Include="Objects\Drawables\DrawableStrongDrumRoll.cs" />
+    <Compile Include="Objects\Drawables\DrawableStrongCentreHit.cs" />
+    <Compile Include="Objects\Drawables\DrawableStrongHit.cs" />
+    <Compile Include="Objects\Drawables\Pieces\CentreHitSymbolPiece.cs" />
+    <Compile Include="Objects\Drawables\DrawableDrumRoll.cs" />
+    <Compile Include="Objects\Drawables\DrawableDrumRollTick.cs" />
+    <Compile Include="Objects\Drawables\DrawableSwell.cs" />
+    <Compile Include="Objects\Drawables\DrawableTaikoHitObject.cs" />
+    <Compile Include="Objects\Drawables\Pieces\RimHitSymbolPiece.cs" />
+    <Compile Include="Objects\Drawables\Pieces\StrongCirclePiece.cs" />
+    <Compile Include="Objects\Drawables\Pieces\CirclePiece.cs" />
+    <Compile Include="Objects\Drawables\Pieces\SwellSymbolPiece.cs" />
     <Compile Include="Objects\DrumRoll.cs" />
     <Compile Include="Objects\DrumRollTick.cs" />
     <Compile Include="Objects\Hit.cs" />