diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 733cb83aa8..d481a446b8 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -21,6 +21,7 @@ using osu.Game.Database;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Transformations;
 using osu.Game.Modes;
+using osu.Game.Overlays.Toolbar;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
diff --git a/osu.Game/Overlays/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
similarity index 95%
rename from osu.Game/Overlays/Toolbar.cs
rename to osu.Game/Overlays/Toolbar/Toolbar.cs
index 3404263486..966a0d3617 100644
--- a/osu.Game/Overlays/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -2,23 +2,21 @@
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
+using osu.Framework.Input;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Colour;
 using osu.Game.Modes;
-using osu.Game.Screens.Play;
-using osu.Framework.Input;
 using osu.Game.Online.API;
+using OpenTK;
+using OpenTK.Graphics;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Overlays.Toolbar
 {
     public class Toolbar : OverlayContainer, IOnlineComponent
     {
diff --git a/osu.Game/Overlays/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
similarity index 95%
rename from osu.Game/Overlays/ToolbarButton.cs
rename to osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 1d8bf51795..798dcc214f 100644
--- a/osu.Game/Overlays/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -4,15 +4,14 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework;
-using osu.Framework.Graphics.Primitives;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarButton : Container
     {
diff --git a/osu.Game/Overlays/ToolbarModeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarModeButton.cs
similarity index 88%
rename from osu.Game/Overlays/ToolbarModeButton.cs
rename to osu.Game/Overlays/Toolbar/ToolbarModeButton.cs
index c10b8514db..e0b384c333 100644
--- a/osu.Game/Overlays/ToolbarModeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarModeButton.cs
@@ -3,13 +3,9 @@
 
 using osu.Framework.Extensions;
 using osu.Game.Graphics;
-using OpenTK.Graphics;
-using osu.Framework;
-using osu.Framework.Allocation;
 using osu.Game.Modes;
-using osu.Game.Screens.Play;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarModeButton : ToolbarButton
     {
diff --git a/osu.Game/Overlays/ToolbarModeSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
similarity index 93%
rename from osu.Game/Overlays/ToolbarModeSelector.cs
rename to osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
index 9b6d8a7fe1..1a0683c571 100644
--- a/osu.Game/Overlays/ToolbarModeSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
@@ -3,19 +3,16 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
+using osu.Game.Modes;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework;
-using osu.Framework.Caching;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Allocation;
-using osu.Game.Modes;
-using osu.Game.Screens.Play;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Overlays.Toolbar
 {
     class ToolbarModeSelector : Container
     {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 581ab7916d..e51abbed5a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -159,10 +159,10 @@
     <Compile Include="OsuGameBase.cs" />
     <Compile Include="Overlays\ChatOverlay.cs" />
     <Compile Include="Overlays\OptionsOverlay.cs" />
-    <Compile Include="Overlays\Toolbar.cs" />
-    <Compile Include="Overlays\ToolbarButton.cs" />
-    <Compile Include="Overlays\ToolbarModeButton.cs" />
-    <Compile Include="Overlays\ToolbarModeSelector.cs" />
+    <Compile Include="Overlays\Toolbar\Toolbar.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarModeButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarModeSelector.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Screens\Select\BeatmapInfoWedge.cs" />
     <Compile Include="Users\User.cs" />