diff --git a/osu.Desktop.VisualTests/app.config b/osu.Desktop.VisualTests/app.config
index 855da39b10..b9af3fdc80 100644
--- a/osu.Desktop.VisualTests/app.config
+++ b/osu.Desktop.VisualTests/app.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Desktop.VisualTests/packages.config b/osu.Desktop.VisualTests/packages.config
index c3f267ac89..5a30c50600 100644
--- a/osu.Desktop.VisualTests/packages.config
+++ b/osu.Desktop.VisualTests/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
index 6460751570..9791554f02 100644
--- a/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -1,7 +1,6 @@
 // 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.Game.Beatmaps;
 using osu.Game.Modes.Catch.Objects;
 using System.Collections.Generic;
diff --git a/osu.Game.Modes.Catch/packages.config b/osu.Game.Modes.Catch/packages.config
index 08fca09c35..4031dd62a8 100644
--- a/osu.Game.Modes.Catch/packages.config
+++ b/osu.Game.Modes.Catch/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 0f42da4ac8..3ff210c1cc 100644
--- a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -1,7 +1,6 @@
 // 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.Game.Beatmaps;
 using osu.Game.Modes.Mania.Objects;
 using System.Collections.Generic;
diff --git a/osu.Game.Modes.Mania/app.config b/osu.Game.Modes.Mania/app.config
index 855da39b10..b9af3fdc80 100644
--- a/osu.Game.Modes.Mania/app.config
+++ b/osu.Game.Modes.Mania/app.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Mania/packages.config b/osu.Game.Modes.Mania/packages.config
index 08fca09c35..4031dd62a8 100644
--- a/osu.Game.Modes.Mania/packages.config
+++ b/osu.Game.Modes.Mania/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
index 921875adba..1df61e0171 100644
--- a/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-
 using OpenTK;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects;
diff --git a/osu.Game.Modes.Osu/Objects/HitObjectType.cs b/osu.Game.Modes.Osu/Objects/HitObjectType.cs
index bc2a27020d..7d2d84c94c 100644
--- a/osu.Game.Modes.Osu/Objects/HitObjectType.cs
+++ b/osu.Game.Modes.Osu/Objects/HitObjectType.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Modes.Osu.Objects
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Osu.Objects
 {
     public enum HitObjectType
     {
diff --git a/osu.Game.Modes.Osu/app.config b/osu.Game.Modes.Osu/app.config
index 88af66254d..f77f36199c 100644
--- a/osu.Game.Modes.Osu/app.config
+++ b/osu.Game.Modes.Osu/app.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Osu/packages.config b/osu.Game.Modes.Osu/packages.config
index 08fca09c35..4031dd62a8 100644
--- a/osu.Game.Modes.Osu/packages.config
+++ b/osu.Game.Modes.Osu/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Taiko/packages.config b/osu.Game.Modes.Taiko/packages.config
index 08fca09c35..4031dd62a8 100644
--- a/osu.Game.Modes.Taiko/packages.config
+++ b/osu.Game.Modes.Taiko/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game/Modes/Objects/Hit.cs b/osu.Game/Modes/Objects/Hit.cs
index a1cfc275fb..5a7ad87d39 100644
--- a/osu.Game/Modes/Objects/Hit.cs
+++ b/osu.Game/Modes/Objects/Hit.cs
@@ -1,4 +1,7 @@
-using osu.Game.Modes.Objects.Types;
+// 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.Game.Modes.Objects.Types;
 using OpenTK;
 using OpenTK.Graphics;
 
diff --git a/osu.Game/Modes/Objects/IHitObjectConverter.cs b/osu.Game/Modes/Objects/IHitObjectConverter.cs
index 777a1597a1..8f4bb05c0c 100644
--- a/osu.Game/Modes/Objects/IHitObjectConverter.cs
+++ b/osu.Game/Modes/Objects/IHitObjectConverter.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Modes.Objects
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Objects
 {
     /// <summary>
     /// Converts HitObjects to another mode.
diff --git a/osu.Game/Modes/Objects/LegacyHitObjectParser.cs b/osu.Game/Modes/Objects/LegacyHitObjectParser.cs
index 7dcece0477..394c2ba80c 100644
--- a/osu.Game/Modes/Objects/LegacyHitObjectParser.cs
+++ b/osu.Game/Modes/Objects/LegacyHitObjectParser.cs
@@ -1,4 +1,7 @@
-using OpenTK;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects.Types;
 using System;
diff --git a/osu.Game/Modes/Objects/Slider.cs b/osu.Game/Modes/Objects/Slider.cs
index c567a668a8..8605a07137 100644
--- a/osu.Game/Modes/Objects/Slider.cs
+++ b/osu.Game/Modes/Objects/Slider.cs
@@ -1,4 +1,7 @@
-using osu.Game.Modes.Objects.Types;
+// 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.Game.Modes.Objects.Types;
 using System.Collections.Generic;
 using OpenTK;
 using OpenTK.Graphics;
diff --git a/osu.Game/Modes/Objects/Spinner.cs b/osu.Game/Modes/Objects/Spinner.cs
index 68717bec19..f98abdbed9 100644
--- a/osu.Game/Modes/Objects/Spinner.cs
+++ b/osu.Game/Modes/Objects/Spinner.cs
@@ -1,4 +1,7 @@
-using osu.Game.Modes.Objects.Types;
+// 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.Game.Modes.Objects.Types;
 
 namespace osu.Game.Modes.Objects
 {
diff --git a/osu.Game/Modes/Objects/Types/CurveType.cs b/osu.Game/Modes/Objects/Types/CurveType.cs
index 6f4668428d..ba5d3f37ac 100644
--- a/osu.Game/Modes/Objects/Types/CurveType.cs
+++ b/osu.Game/Modes/Objects/Types/CurveType.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Modes.Objects.Types
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Objects.Types
 {
     public enum CurveType
     {
diff --git a/osu.Game/Modes/Objects/Types/IHasCombo.cs b/osu.Game/Modes/Objects/Types/IHasCombo.cs
index 8d83ccaa05..9c4e9a70df 100644
--- a/osu.Game/Modes/Objects/Types/IHasCombo.cs
+++ b/osu.Game/Modes/Objects/Types/IHasCombo.cs
@@ -1,4 +1,7 @@
-using OpenTK.Graphics;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Objects.Types
 {
diff --git a/osu.Game/Modes/Objects/Types/IHasCurve.cs b/osu.Game/Modes/Objects/Types/IHasCurve.cs
index ab5b2d55fd..c30f05f7a2 100644
--- a/osu.Game/Modes/Objects/Types/IHasCurve.cs
+++ b/osu.Game/Modes/Objects/Types/IHasCurve.cs
@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+// 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.Collections.Generic;
 using OpenTK;
 
 namespace osu.Game.Modes.Objects.Types
diff --git a/osu.Game/Modes/Objects/Types/IHasDistance.cs b/osu.Game/Modes/Objects/Types/IHasDistance.cs
index 2489abf591..579d557ac0 100644
--- a/osu.Game/Modes/Objects/Types/IHasDistance.cs
+++ b/osu.Game/Modes/Objects/Types/IHasDistance.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Modes.Objects.Types
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Objects.Types
 {
     /// <summary>
     /// A HitObject that has a distance.
diff --git a/osu.Game/Modes/Objects/Types/IHasEndTime.cs b/osu.Game/Modes/Objects/Types/IHasEndTime.cs
index ac0fc562f8..e96258812c 100644
--- a/osu.Game/Modes/Objects/Types/IHasEndTime.cs
+++ b/osu.Game/Modes/Objects/Types/IHasEndTime.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Modes.Objects.Types
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Objects.Types
 {
     /// <summary>
     /// A HitObject that ends at a different time than its start time.
diff --git a/osu.Game/Modes/Objects/Types/IHasPosition.cs b/osu.Game/Modes/Objects/Types/IHasPosition.cs
index 09e04ef3a0..8138bf6662 100644
--- a/osu.Game/Modes/Objects/Types/IHasPosition.cs
+++ b/osu.Game/Modes/Objects/Types/IHasPosition.cs
@@ -1,4 +1,7 @@
-using OpenTK;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
 
 namespace osu.Game.Modes.Objects.Types
 {
diff --git a/osu.Game/Modes/Objects/Types/IHasRepeats.cs b/osu.Game/Modes/Objects/Types/IHasRepeats.cs
index 4256990049..958d67e264 100644
--- a/osu.Game/Modes/Objects/Types/IHasRepeats.cs
+++ b/osu.Game/Modes/Objects/Types/IHasRepeats.cs
@@ -1,4 +1,7 @@
-namespace osu.Game.Modes.Objects.Types
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Objects.Types
 {
     /// <summary>
     /// A HitObject that spans some length.
diff --git a/osu.Game/Modes/Objects/Types/LegacyHitObjectLive.cs b/osu.Game/Modes/Objects/Types/LegacyHitObjectLive.cs
index 63495e2f6a..45d23cb69c 100644
--- a/osu.Game/Modes/Objects/Types/LegacyHitObjectLive.cs
+++ b/osu.Game/Modes/Objects/Types/LegacyHitObjectLive.cs
@@ -1,4 +1,7 @@
-using System;
+// 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;
 
 namespace osu.Game.Modes.Objects.Types
 {
diff --git a/osu.Game/Modes/UI/StandardHealthDisplay.cs b/osu.Game/Modes/UI/StandardHealthDisplay.cs
index b6a3dc7f89..c639f3d482 100644
--- a/osu.Game/Modes/UI/StandardHealthDisplay.cs
+++ b/osu.Game/Modes/UI/StandardHealthDisplay.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
diff --git a/osu.Game/app.config b/osu.Game/app.config
index 855da39b10..b9af3fdc80 100644
--- a/osu.Game/app.config
+++ b/osu.Game/app.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game/packages.config b/osu.Game/packages.config
index b2168b864e..93df6b7e42 100644
--- a/osu.Game/packages.config
+++ b/osu.Game/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE