diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 4b5eefe5b6..c15a179e8c 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -19,11 +19,8 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using System.Linq;
 using osu.Framework.Configuration;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Rulesets;
-using osu.Framework.Input;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -157,9 +154,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         }
 
         private APIAccess api;
-
         private BeatmapInfo beatmap;
-
         private OsuGame osuGame;
 
         private ScheduledDelegate pendingBeatmapSwitch;
@@ -316,107 +311,6 @@ namespace osu.Game.Screens.Select.Leaderboards
                 }
             }
         }
-
-        private abstract class Placeholder : FillFlowContainer, IEquatable<Placeholder>
-        {
-            protected Placeholder()
-            {
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-            }
-
-            public virtual bool Equals(Placeholder other) => GetType() == other?.GetType();
-        }
-
-        private class MessagePlaceholder : Placeholder
-        {
-            private readonly string message;
-
-            public MessagePlaceholder(string message)
-            {
-                Direction = FillDirection.Horizontal;
-                AutoSizeAxes = Axes.Both;
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Icon = FontAwesome.fa_exclamation_circle,
-                        Size = new Vector2(26),
-                        Margin = new MarginPadding { Right = 10 },
-                    },
-                    new OsuSpriteText
-                    {
-                        Text = this.message = message,
-                        TextSize = 22,
-                    },
-                };
-            }
-
-            public override bool Equals(Placeholder other) => (other as MessagePlaceholder)?.message == message;
-        }
-
-        private class RetrievalFailurePlaceholder : Placeholder
-        {
-            public Action OnRetry;
-
-            public RetrievalFailurePlaceholder()
-            {
-                Direction = FillDirection.Horizontal;
-                AutoSizeAxes = Axes.Both;
-                Children = new Drawable[]
-                {
-                    new RetryButton
-                    {
-                        Action = () => OnRetry?.Invoke(),
-                        Margin = new MarginPadding { Right = 10 },
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.TopLeft,
-                        Text = @"Couldn't retrieve scores!",
-                        TextSize = 22,
-                    },
-                };
-            }
-
-            private class RetryButton : OsuHoverContainer
-            {
-                private readonly SpriteIcon icon;
-
-                public Action Action;
-
-                public RetryButton()
-                {
-                    Height = 26;
-                    Width = 26;
-                    Child = new OsuClickableContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Action = () => Action?.Invoke(),
-                        Child = icon = new SpriteIcon
-                        {
-                            Icon = FontAwesome.fa_refresh,
-                            Size = new Vector2(26),
-                            Shadow = true,
-                        },
-                    };
-                }
-
-                protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
-                {
-                    icon.ScaleTo(0.8f, 4000, Easing.OutQuint);
-                    return base.OnMouseDown(state, args);
-                }
-
-                protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
-                {
-                    icon.ScaleTo(1, 1000, Easing.OutElastic);
-                    return base.OnMouseUp(state, args);
-                }
-            }
-        }
     }
 
     public enum LeaderboardScope
diff --git a/osu.Game/Screens/Select/Leaderboards/MessagePlaceholder.cs b/osu.Game/Screens/Select/Leaderboards/MessagePlaceholder.cs
new file mode 100644
index 0000000000..4f94087d30
--- /dev/null
+++ b/osu.Game/Screens/Select/Leaderboards/MessagePlaceholder.cs
@@ -0,0 +1,38 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using OpenTK;
+
+namespace osu.Game.Screens.Select.Leaderboards
+{
+    public class MessagePlaceholder : Placeholder
+    {
+        private readonly string message;
+
+        public MessagePlaceholder(string message)
+        {
+            Direction = FillDirection.Horizontal;
+            AutoSizeAxes = Axes.Both;
+            Children = new Drawable[]
+            {
+                new SpriteIcon
+                {
+                    Icon = FontAwesome.fa_exclamation_circle,
+                    Size = new Vector2(26),
+                    Margin = new MarginPadding { Right = 10 },
+                },
+                new OsuSpriteText
+                {
+                    Text = this.message = message,
+                    TextSize = 22,
+                },
+            };
+        }
+
+        public override bool Equals(Placeholder other) => (other as MessagePlaceholder)?.message == message;
+    }
+}
diff --git a/osu.Game/Screens/Select/Leaderboards/Placeholder.cs b/osu.Game/Screens/Select/Leaderboards/Placeholder.cs
new file mode 100644
index 0000000000..8427259106
--- /dev/null
+++ b/osu.Game/Screens/Select/Leaderboards/Placeholder.cs
@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Select.Leaderboards
+{
+    public abstract class Placeholder : FillFlowContainer, IEquatable<Placeholder>
+    {
+        protected Placeholder()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
+
+        public virtual bool Equals(Placeholder other) => GetType() == other?.GetType();
+    }
+}
diff --git a/osu.Game/Screens/Select/Leaderboards/RetrievalFailurePlaceholder.cs b/osu.Game/Screens/Select/Leaderboards/RetrievalFailurePlaceholder.cs
new file mode 100644
index 0000000000..7563c08c8b
--- /dev/null
+++ b/osu.Game/Screens/Select/Leaderboards/RetrievalFailurePlaceholder.cs
@@ -0,0 +1,77 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using OpenTK;
+
+namespace osu.Game.Screens.Select.Leaderboards
+{
+    public class RetrievalFailurePlaceholder : Placeholder
+    {
+        public Action OnRetry;
+
+        public RetrievalFailurePlaceholder()
+        {
+            Direction = FillDirection.Horizontal;
+            AutoSizeAxes = Axes.Both;
+            Children = new Drawable[]
+            {
+                new RetryButton
+                {
+                    Action = () => OnRetry?.Invoke(),
+                    Margin = new MarginPadding { Right = 10 },
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.TopLeft,
+                    Text = @"Couldn't retrieve scores!",
+                    TextSize = 22,
+                },
+            };
+        }
+
+        public class RetryButton : OsuHoverContainer
+        {
+            private readonly SpriteIcon icon;
+
+            public Action Action;
+
+            public RetryButton()
+            {
+                Height = 26;
+                Width = 26;
+                Child = new OsuClickableContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Action = () => Action?.Invoke(),
+                    Child = icon = new SpriteIcon
+                    {
+                        Icon = FontAwesome.fa_refresh,
+                        Size = new Vector2(26),
+                        Shadow = true,
+                    },
+                };
+            }
+
+            protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+            {
+                icon.ScaleTo(0.8f, 4000, Easing.OutQuint);
+                return base.OnMouseDown(state, args);
+            }
+
+            protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+            {
+                icon.ScaleTo(1, 1000, Easing.OutElastic);
+                return base.OnMouseUp(state, args);
+            }
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1004d9dc95..1c78ba379e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -781,6 +781,9 @@
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
     <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
     <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
+    <Compile Include="Screens\Select\Leaderboards\MessagePlaceholder.cs" />
+    <Compile Include="Screens\Select\Leaderboards\Placeholder.cs" />
+    <Compile Include="Screens\Select\Leaderboards\RetrievalFailurePlaceholder.cs" />
     <Compile Include="Screens\Select\MatchSongSelect.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsButton.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />