diff --git a/osu.Game/Users/UserCoverBackground.cs b/osu.Game/Users/UserCoverBackground.cs
new file mode 100644
index 0000000000..c0f0d09d9d
--- /dev/null
+++ b/osu.Game/Users/UserCoverBackground.cs
@@ -0,0 +1,26 @@
+// 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.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Users
+{
+    public class UserCoverBackground : Sprite
+    {
+        private readonly User user;
+
+        public UserCoverBackground(User user)
+        {
+            this.user = user;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            if (!string.IsNullOrEmpty(user.CoverUrl))
+                Texture = textures.Get(user.CoverUrl);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/UserPage/UserPageHeader.cs b/osu.Game/Users/UserPage/UserPageHeader.cs
similarity index 67%
rename from osu.Game/Overlays/UserPage/UserPageHeader.cs
rename to osu.Game/Users/UserPage/UserPageHeader.cs
index 9982d18d07..872088fbef 100644
--- a/osu.Game/Overlays/UserPage/UserPageHeader.cs
+++ b/osu.Game/Users/UserPage/UserPageHeader.cs
@@ -8,9 +8,14 @@ using System.Text;
 using System.Threading.Tasks;
 using osu.Framework.Graphics.Containers;
 
-namespace osu.Game.Overlays.UserPage
+namespace osu.Game.Users.UserPage
 {
     public class UserPageHeader : Container
     {
+        private readonly User user;
+        public UserPageHeader(User user)
+        {
+            this.user = user;
+        }
     }
 }
diff --git a/osu.Game/Overlays/UserPage/UserPageSection.cs b/osu.Game/Users/UserPage/UserPageSection.cs
similarity index 84%
rename from osu.Game/Overlays/UserPage/UserPageSection.cs
rename to osu.Game/Users/UserPage/UserPageSection.cs
index 77202d6aef..cb73218c05 100644
--- a/osu.Game/Overlays/UserPage/UserPageSection.cs
+++ b/osu.Game/Users/UserPage/UserPageSection.cs
@@ -2,9 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics.Containers;
-using osu.Game.Users;
 
-namespace osu.Game.Overlays.UserPage
+namespace osu.Game.Users.UserPage
 {
     public abstract class UserPageSection : Container
     {
diff --git a/osu.Game/Overlays/UserPageOverlay.cs b/osu.Game/Users/UserPageOverlay.cs
similarity index 88%
rename from osu.Game/Overlays/UserPageOverlay.cs
rename to osu.Game/Users/UserPageOverlay.cs
index 1e0d672c22..c7b49433d7 100644
--- a/osu.Game/Overlays/UserPageOverlay.cs
+++ b/osu.Game/Users/UserPageOverlay.cs
@@ -9,10 +9,9 @@ using System.Threading.Tasks;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.UserPage;
-using osu.Game.Users;
+using osu.Game.Users.UserPage;
 
-namespace osu.Game.Overlays
+namespace osu.Game.Users
 {
     public class UserPageOverlay : FocusedOverlayContainer
     {
@@ -25,7 +24,7 @@ namespace osu.Game.Overlays
             var sections = new UserPageSection[] { };
             var sectionsContainer = new SectionsContainer
             {
-                ExpandableHeader = new UserPageHeader(),
+                ExpandableHeader = new UserPageHeader(user),
                 FixedHeader = tab,
                 Sections = sections
             };
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index bdfe6d1c8e..0ef56f5060 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -9,7 +9,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
@@ -43,7 +42,7 @@ namespace osu.Game.Users
 
             Children = new Drawable[]
             {
-                new AsyncLoadWrapper(new CoverBackgroundSprite(user)
+                new AsyncLoadWrapper(new UserCoverBackground(user)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -193,22 +192,5 @@ namespace osu.Game.Users
                 statusMessage.Text = status.Message;
             }
         }
-
-        private class CoverBackgroundSprite : Sprite
-        {
-            private readonly User user;
-
-            public CoverBackgroundSprite(User user)
-            {
-                this.user = user;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                if (!string.IsNullOrEmpty(user.CoverUrl))
-                    Texture = textures.Get(user.CoverUrl);
-            }
-        }
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5261219422..049f4e14f3 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -85,9 +85,10 @@
     <Compile Include="Overlays\Settings\SettingsHeader.cs" />
     <Compile Include="Overlays\Settings\Sections\Audio\MainMenuSettings.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarChatButton.cs" />
-    <Compile Include="Overlays\UserPageOverlay.cs" />
-    <Compile Include="Overlays\UserPage\UserPageHeader.cs" />
-    <Compile Include="Overlays\UserPage\UserPageSection.cs" />
+    <Compile Include="Users\UserCoverBackground.cs" />
+    <Compile Include="Users\UserPageOverlay.cs" />
+    <Compile Include="Users\UserPage\UserPageHeader.cs" />
+    <Compile Include="Users\UserPage\UserPageSection.cs" />
     <Compile Include="Rulesets\Beatmaps\BeatmapConverter.cs" />
     <Compile Include="Rulesets\Beatmaps\BeatmapProcessor.cs" />
     <Compile Include="Beatmaps\ControlPoints\ControlPoint.cs" />