diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
index 57d52243ba..ef56f456ea 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
@@ -9,7 +9,7 @@
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD.ComboCounters;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
diff --git a/osu.Game/Screens/Play/HUD/ComboCounters/ComboCounter.cs b/osu.Game/Screens/Play/HUD/ComboCounter.cs
similarity index 90%
rename from osu.Game/Screens/Play/HUD/ComboCounters/ComboCounter.cs
rename to osu.Game/Screens/Play/HUD/ComboCounter.cs
index 9bd08f3930..4179d41646 100644
--- a/osu.Game/Screens/Play/HUD/ComboCounters/ComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ComboCounter.cs
@@ -1,13 +1,11 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Skinning;
 
-namespace osu.Game.Screens.Play.HUD.ComboCounters
+namespace osu.Game.Screens.Play.HUD
 {
     public abstract class ComboCounter : RollingCounter<int>, ISkinnableDrawable
     {
diff --git a/osu.Game/Screens/Play/HUD/ComboCounters/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
similarity index 92%
rename from osu.Game/Screens/Play/HUD/ComboCounters/DefaultComboCounter.cs
rename to osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index a612f042f5..0c9c363280 100644
--- a/osu.Game/Screens/Play/HUD/ComboCounters/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
@@ -10,7 +8,7 @@
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 
-namespace osu.Game.Screens.Play.HUD.ComboCounters
+namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultComboCounter : ComboCounter
     {
diff --git a/osu.Game/Screens/Play/HUD/ComboCounters/LongestComboCounter.cs b/osu.Game/Screens/Play/HUD/LongestComboCounter.cs
similarity index 97%
rename from osu.Game/Screens/Play/HUD/ComboCounters/LongestComboCounter.cs
rename to osu.Game/Screens/Play/HUD/LongestComboCounter.cs
index b6be42764a..0e7af69af2 100644
--- a/osu.Game/Screens/Play/HUD/ComboCounters/LongestComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LongestComboCounter.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -13,7 +11,7 @@
 using osu.Game.Rulesets.Scoring;
 using osuTK;
 
-namespace osu.Game.Screens.Play.HUD.ComboCounters
+namespace osu.Game.Screens.Play.HUD
 {
     public class LongestComboCounter : ComboCounter
     {
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 006f6b4e46..010e2175e1 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -15,7 +15,6 @@
 using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.Play.HUD.ComboCounters;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index 84b39f2768..2c70963524 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -16,7 +16,6 @@
 using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.Play.HUD.ComboCounters;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osuTK;
 using osuTK.Graphics;