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/Judgements/CatchJudgementInfo.cs b/osu.Game.Modes.Catch/Judgements/CatchJudgementInfo.cs
index eea85b1cb9..33e84d2f97 100644
--- a/osu.Game.Modes.Catch/Judgements/CatchJudgementInfo.cs
+++ b/osu.Game.Modes.Catch/Judgements/CatchJudgementInfo.cs
@@ -1,4 +1,7 @@
-using osu.Game.Modes.Judgements;
+// 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.Judgements;
 
 namespace osu.Game.Modes.Catch.Judgements
 {
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/Judgements/ManiaJudgementInfo.cs b/osu.Game.Modes.Mania/Judgements/ManiaJudgementInfo.cs
index f724979e75..a75f95abe7 100644
--- a/osu.Game.Modes.Mania/Judgements/ManiaJudgementInfo.cs
+++ b/osu.Game.Modes.Mania/Judgements/ManiaJudgementInfo.cs
@@ -1,4 +1,7 @@
-using osu.Game.Modes.Judgements;
+// 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.Judgements;
 
 namespace osu.Game.Modes.Mania.Judgements
 {
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 33d4562032..df293448b3 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/Judgements/OsuJudgementInfo.cs b/osu.Game.Modes.Osu/Judgements/OsuJudgementInfo.cs
index 9cbb8bfd1c..20d36efe55 100644
--- a/osu.Game.Modes.Osu/Judgements/OsuJudgementInfo.cs
+++ b/osu.Game.Modes.Osu/Judgements/OsuJudgementInfo.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.Modes.Judgements;
 using osu.Game.Modes.Osu.Objects.Drawables;
 
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/Judgements/TaikoJudgementInfo.cs b/osu.Game.Modes.Taiko/Judgements/TaikoJudgementInfo.cs
index 499e0a62b8..38b9d784dd 100644
--- a/osu.Game.Modes.Taiko/Judgements/TaikoJudgementInfo.cs
+++ b/osu.Game.Modes.Taiko/Judgements/TaikoJudgementInfo.cs
@@ -1,4 +1,7 @@
-using osu.Game.Modes.Judgements;
+// 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.Judgements;
 
 namespace osu.Game.Modes.Taiko.Judgements
 {
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/Judgements/JudgementInfo.cs b/osu.Game/Modes/Judgements/JudgementInfo.cs
index cb6710dd32..8e7539134e 100644
--- a/osu.Game/Modes/Judgements/JudgementInfo.cs
+++ b/osu.Game/Modes/Judgements/JudgementInfo.cs
@@ -1,4 +1,7 @@
-using osu.Game.Modes.Objects.Drawables;
+// 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.Drawables;
 
 namespace osu.Game.Modes.Judgements
 {
diff --git a/osu.Game/Modes/Mods/IApplicableMod.cs b/osu.Game/Modes/Mods/IApplicableMod.cs
index 25d0f8d701..90547f4402 100644
--- a/osu.Game/Modes/Mods/IApplicableMod.cs
+++ b/osu.Game/Modes/Mods/IApplicableMod.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.Modes.Objects;
 using osu.Game.Modes.UI;
 
diff --git a/osu.Game/Modes/Objects/Drawables/ArmedState.cs b/osu.Game/Modes/Objects/Drawables/ArmedState.cs
index dcbe7cc425..2f8d3ad07a 100644
--- a/osu.Game/Modes/Objects/Drawables/ArmedState.cs
+++ b/osu.Game/Modes/Objects/Drawables/ArmedState.cs
@@ -1,3 +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
+
 namespace osu.Game.Modes.Objects.Drawables
 {
     public enum ArmedState
diff --git a/osu.Game/Modes/Objects/Drawables/HitResult.cs b/osu.Game/Modes/Objects/Drawables/HitResult.cs
index 2a66f14bdc..1bbf9269bb 100644
--- a/osu.Game/Modes/Objects/Drawables/HitResult.cs
+++ b/osu.Game/Modes/Objects/Drawables/HitResult.cs
@@ -1,3 +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 System.ComponentModel;
 
 namespace osu.Game.Modes.Objects.Drawables
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/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