diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
new file mode 100644
index 0000000000..c666fa9b32
--- /dev/null
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -0,0 +1,17 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Game.Beatmaps.Objects;
+using osu.Game.Users;
+
+namespace osu.Game.Beatmaps
+{
+    public class Beatmap
+    {
+        public List<HitObject> HitObjects;
+
+        public string Difficulty;
+        public User Creator;
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Beatmaps/BeatmapSet.cs b/osu.Game/Beatmaps/BeatmapSet.cs
new file mode 100644
index 0000000000..de886f9375
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapSet.cs
@@ -0,0 +1,21 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Game.Users;
+
+namespace osu.Game.Beatmaps
+{
+    /// <summary>
+    /// A beatmap set contains multiple beatmap (difficulties).
+    /// </summary>
+    public class BeatmapSet
+    {
+        public List<Beatmap> Beatmaps { get; protected set; }
+
+        public string Artist;
+        public string Title;
+
+        public User Creator;
+    }
+}
diff --git a/osu.Game/Beatmaps/Objects/HitObject.cs b/osu.Game/Beatmaps/Objects/HitObject.cs
new file mode 100644
index 0000000000..1990cfd704
--- /dev/null
+++ b/osu.Game/Beatmaps/Objects/HitObject.cs
@@ -0,0 +1,18 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps.Samples;
+
+namespace osu.Game.Beatmaps.Objects
+{
+    /// <summary>
+    /// A hitobject describes a point in a beatmap 
+    /// </summary>
+    public class HitObject
+    {
+        public double StartTime;
+        public double? EndTime;
+
+        public SampleInfo Sample;
+    }
+}
diff --git a/osu.Game/Beatmaps/Samples/SampleBank.cs b/osu.Game/Beatmaps/Samples/SampleBank.cs
new file mode 100644
index 0000000000..5284712549
--- /dev/null
+++ b/osu.Game/Beatmaps/Samples/SampleBank.cs
@@ -0,0 +1,12 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Beatmaps.Samples
+{
+    public enum SampleBank
+    {
+        Default = 0,
+        Custom1 = 1,
+        Custom2 = 2
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Beatmaps/Samples/SampleInfo.cs b/osu.Game/Beatmaps/Samples/SampleInfo.cs
new file mode 100644
index 0000000000..0b595b3d74
--- /dev/null
+++ b/osu.Game/Beatmaps/Samples/SampleInfo.cs
@@ -0,0 +1,11 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Beatmaps.Samples
+{
+    public class SampleInfo
+    {
+        public SampleBank Bank;
+        public SampleSet Set;
+    }
+}
diff --git a/osu.Game/Beatmaps/Samples/SampleSet.cs b/osu.Game/Beatmaps/Samples/SampleSet.cs
new file mode 100644
index 0000000000..db4d9a9f05
--- /dev/null
+++ b/osu.Game/Beatmaps/Samples/SampleSet.cs
@@ -0,0 +1,13 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Beatmaps.Samples
+{
+    public enum SampleSet
+    {
+        None = 0,
+        Normal = 1,
+        Soft = 2,
+        Drum = 3
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Graphics/Components/FpsDisplay.cs b/osu.Game/Graphics/Components/FpsDisplay.cs
new file mode 100644
index 0000000000..c2e5d75059
--- /dev/null
+++ b/osu.Game/Graphics/Components/FpsDisplay.cs
@@ -0,0 +1,28 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Graphics.Components
+{
+    class FpsDisplay : OsuComponent
+    {
+        SpriteText fpsText;
+        public override void Load()
+        {
+            base.Load();
+
+            Add(fpsText = new SpriteText());
+
+            fpsText.Text = "...";
+        }
+
+        protected override void Update()
+        {
+            fpsText.Text = ((int)(1000 / Clock.ElapsedFrameTime)).ToString();
+            base.Update();
+        }
+    }
+}
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
new file mode 100644
index 0000000000..33f9e65d51
--- /dev/null
+++ b/osu.Game/Users/User.cs
@@ -0,0 +1,17 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu.Game.Users
+{
+    public class User
+    {
+        public int Id;
+        public string Username;
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5bea3d41f4..2c1a4fa1ba 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -45,6 +45,12 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Beatmaps\Beatmap.cs" />
+    <Compile Include="Beatmaps\BeatmapSet.cs" />
+    <Compile Include="Beatmaps\Objects\HitObject.cs" />
+    <Compile Include="Beatmaps\Samples\SampleBank.cs" />
+    <Compile Include="Beatmaps\Samples\SampleInfo.cs" />
+    <Compile Include="Beatmaps\Samples\SampleSet.cs" />
     <Compile Include="Configuration\OsuConfigManager.cs" />
     <Compile Include="GameModes\FontTest.cs" />
     <Compile Include="GameModes\Menu\ButtonSystem.cs" />
@@ -68,6 +74,7 @@
     <Compile Include="Online\Chat\Message.cs" />
     <Compile Include="OsuGame.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Users\User.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">