diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index cf0a0fee37..406fc2ffd2 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Graphics
             AutoSizeAxes = Axes.Both;
             Font = "Exo2.0-RegularItalic";
 
-            this.Date = date.ToLocalTime();
+            Date = date.ToLocalTime();
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Graphics/DrawableJoinDate.cs b/osu.Game/Overlays/Profile/Components/DrawableJoinDate.cs
similarity index 88%
rename from osu.Game/Graphics/DrawableJoinDate.cs
rename to osu.Game/Overlays/Profile/Components/DrawableJoinDate.cs
index a0d28406d3..11ee329f33 100644
--- a/osu.Game/Graphics/DrawableJoinDate.cs
+++ b/osu.Game/Overlays/Profile/Components/DrawableJoinDate.cs
@@ -2,8 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using osu.Game.Graphics;
 
-namespace osu.Game.Graphics
+namespace osu.Game.Overlays.Profile.Components
 {
     public class DrawableJoinDate : DrawableDate
     {
diff --git a/osu.Game/Overlays/Profile/Components/GradeBadge.cs b/osu.Game/Overlays/Profile/Components/GradeBadge.cs
new file mode 100644
index 0000000000..14a47e8d03
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Components/GradeBadge.cs
@@ -0,0 +1,50 @@
+// Copyright (c) 2007-2018 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;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Profile.Components
+{
+    public class GradeBadge : Container
+    {
+        private const float width = 50;
+        private readonly string grade;
+        private readonly Sprite badge;
+        private readonly SpriteText numberText;
+
+        public int DisplayCount
+        {
+            set => numberText.Text = value.ToString(@"#,0");
+        }
+
+        public GradeBadge(string grade)
+        {
+            this.grade = grade;
+            Width = width;
+            Height = 41;
+            Add(badge = new Sprite
+            {
+                Width = width,
+                Height = 26
+            });
+            Add(numberText = new OsuSpriteText
+            {
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+                TextSize = 14,
+                Font = @"Exo2.0-Bold"
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            badge.Texture = textures.Get($"Grades/{grade}");
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 47763d4773..c72ff6131b 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Profile.Components;
 using osu.Game.Overlays.Profile.Header;
 using osu.Game.Users;
 
@@ -470,43 +471,5 @@ namespace osu.Game.Overlays.Profile
 
             infoTextRight.NewLine();
         }
-
-        private class GradeBadge : Container
-        {
-            private const float width = 50;
-            private readonly string grade;
-            private readonly Sprite badge;
-            private readonly SpriteText numberText;
-
-            public int DisplayCount
-            {
-                set { numberText.Text = value.ToString(@"#,0"); }
-            }
-
-            public GradeBadge(string grade)
-            {
-                this.grade = grade;
-                Width = width;
-                Height = 41;
-                Add(badge = new Sprite
-                {
-                    Width = width,
-                    Height = 26
-                });
-                Add(numberText = new OsuSpriteText
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    TextSize = 14,
-                    Font = @"Exo2.0-Bold"
-                });
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                badge.Texture = textures.Get($"Grades/{grade}");
-            }
-        }
     }
 }