diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
index f63591311f..f4920b4412 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
@@ -4,6 +4,8 @@
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections;
 using osuTK;
diff --git a/osu.Game/Overlays/ExpandingButtonContainer.cs b/osu.Game/Graphics/Containers/ExpandingButtonContainer.cs
similarity index 94%
rename from osu.Game/Overlays/ExpandingButtonContainer.cs
rename to osu.Game/Graphics/Containers/ExpandingButtonContainer.cs
index 8fb3e1b550..b79af22bd2 100644
--- a/osu.Game/Overlays/ExpandingButtonContainer.cs
+++ b/osu.Game/Graphics/Containers/ExpandingButtonContainer.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace osu.Game.Overlays
+namespace osu.Game.Graphics.Containers
 {
     /// <summary>
     /// An <see cref="ExpandingContainer"/> with a long hover expansion delay.
diff --git a/osu.Game/Overlays/ExpandingContainer.cs b/osu.Game/Graphics/Containers/ExpandingContainer.cs
similarity index 97%
rename from osu.Game/Overlays/ExpandingContainer.cs
rename to osu.Game/Graphics/Containers/ExpandingContainer.cs
index ea3fffcb78..b50e008362 100644
--- a/osu.Game/Overlays/ExpandingContainer.cs
+++ b/osu.Game/Graphics/Containers/ExpandingContainer.cs
@@ -6,9 +6,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
-using osu.Game.Graphics.Containers;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Graphics.Containers
 {
     /// <summary>
     /// Represents a <see cref="Container"/> with the ability to expand/contract on hover.
diff --git a/osu.Game/Overlays/IExpandable.cs b/osu.Game/Graphics/Containers/IExpandable.cs
similarity index 93%
rename from osu.Game/Overlays/IExpandable.cs
rename to osu.Game/Graphics/Containers/IExpandable.cs
index 770ac97847..593564a2f9 100644
--- a/osu.Game/Overlays/IExpandable.cs
+++ b/osu.Game/Graphics/Containers/IExpandable.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Graphics.Containers
 {
     /// <summary>
     /// An interface for drawables with ability to expand/contract.
diff --git a/osu.Game/Overlays/IExpandingContainer.cs b/osu.Game/Graphics/Containers/IExpandingContainer.cs
similarity index 88%
rename from osu.Game/Overlays/IExpandingContainer.cs
rename to osu.Game/Graphics/Containers/IExpandingContainer.cs
index ec5f0c90f4..a82faa3cd1 100644
--- a/osu.Game/Overlays/IExpandingContainer.cs
+++ b/osu.Game/Graphics/Containers/IExpandingContainer.cs
@@ -3,8 +3,9 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Graphics.Containers
 {
     /// <summary>
     /// A target expanding container that should be resolved by children <see cref="IExpandable"/>s to propagate state changes.
diff --git a/osu.Game/Overlays/ExpandableSlider.cs b/osu.Game/Graphics/UserInterface/ExpandableSlider.cs
similarity index 97%
rename from osu.Game/Overlays/ExpandableSlider.cs
rename to osu.Game/Graphics/UserInterface/ExpandableSlider.cs
index 062de98659..60e83f9c81 100644
--- a/osu.Game/Overlays/ExpandableSlider.cs
+++ b/osu.Game/Graphics/UserInterface/ExpandableSlider.cs
@@ -8,11 +8,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Graphics.UserInterface
 {
     /// <summary>
     /// An <see cref="IExpandable"/> implementation for the UI slider bar control.
diff --git a/osu.Game/Overlays/Settings/SettingsSidebar.cs b/osu.Game/Overlays/Settings/SettingsSidebar.cs
index e6ce90c33e..4e6a1eb914 100644
--- a/osu.Game/Overlays/Settings/SettingsSidebar.cs
+++ b/osu.Game/Overlays/Settings/SettingsSidebar.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
 {
diff --git a/osu.Game/Overlays/SettingsToolboxGroup.cs b/osu.Game/Overlays/SettingsToolboxGroup.cs
index 9e7223df9d..08321f68fe 100644
--- a/osu.Game/Overlays/SettingsToolboxGroup.cs
+++ b/osu.Game/Overlays/SettingsToolboxGroup.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Layout;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 92ea2db338..39783cc8bb 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -13,7 +13,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
-using osu.Game.Overlays;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;