diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index d12ecc273d..70dd0fee46 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -150,7 +150,7 @@
       <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
       <Name>osu.Game.Resources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{c92a607b-1fdd-4954-9f92-03ff547d9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 95d3ad64c5..ce0e39b6d9 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -130,7 +130,7 @@
       <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
       <Name>osu.Game.Resources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{c92a607b-1fdd-4954-9f92-03ff547d9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
index 219175dd2b..e68203872e 100644
--- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
+++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
@@ -68,7 +68,7 @@
       <Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
       <Name>osu.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
index 89c8978bbf..22b16c6a9a 100644
--- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
+++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
@@ -61,7 +61,7 @@
       <Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
       <Name>osu.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
diff --git a/osu.Game.Mode.Osu/Objects/BezierApproximator.cs b/osu.Game.Modes.Osu/Objects/BezierApproximator.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/BezierApproximator.cs
rename to osu.Game.Modes.Osu/Objects/BezierApproximator.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/DrawableHitCircle.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/DrawableOsuHitObject.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/DrawableSlider.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/HitExplosion.cs b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/HitExplosion.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/ApproachCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/CirclePiece.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/ExplodePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/FlashPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/FlashPiece.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/GlowPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/GlowPiece.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/NumberPiece.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/RingPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/RingPiece.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/SliderBall.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/SliderBody.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/SliderBody.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/SliderBouncer.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBouncer.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/SliderBouncer.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBouncer.cs
diff --git a/osu.Game.Mode.Osu/Objects/Drawables/Pieces/Triangles.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/Triangles.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Drawables/Pieces/Triangles.cs
rename to osu.Game.Modes.Osu/Objects/Drawables/Pieces/Triangles.cs
diff --git a/osu.Game.Mode.Osu/Objects/HitCircle.cs b/osu.Game.Modes.Osu/Objects/HitCircle.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/HitCircle.cs
rename to osu.Game.Modes.Osu/Objects/HitCircle.cs
diff --git a/osu.Game.Mode.Osu/Objects/OsuHitObject.cs b/osu.Game.Modes.Osu/Objects/OsuHitObject.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/OsuHitObject.cs
rename to osu.Game.Modes.Osu/Objects/OsuHitObject.cs
diff --git a/osu.Game.Mode.Osu/Objects/OsuHitObjectConverter.cs b/osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/OsuHitObjectConverter.cs
rename to osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs
diff --git a/osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs b/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/OsuHitObjectParser.cs
rename to osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
diff --git a/osu.Game.Mode.Osu/Objects/Slider.cs b/osu.Game.Modes.Osu/Objects/Slider.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Slider.cs
rename to osu.Game.Modes.Osu/Objects/Slider.cs
diff --git a/osu.Game.Mode.Osu/Objects/SliderCurve.cs b/osu.Game.Modes.Osu/Objects/SliderCurve.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/SliderCurve.cs
rename to osu.Game.Modes.Osu/Objects/SliderCurve.cs
diff --git a/osu.Game.Mode.Osu/Objects/Spinner.cs b/osu.Game.Modes.Osu/Objects/Spinner.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Objects/Spinner.cs
rename to osu.Game.Modes.Osu/Objects/Spinner.cs
diff --git a/osu.Game.Mode.Osu/OpenTK.dll.config b/osu.Game.Modes.Osu/OpenTK.dll.config
similarity index 100%
rename from osu.Game.Mode.Osu/OpenTK.dll.config
rename to osu.Game.Modes.Osu/OpenTK.dll.config
diff --git a/osu.Game.Mode.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs
similarity index 100%
rename from osu.Game.Mode.Osu/OsuRuleset.cs
rename to osu.Game.Modes.Osu/OsuRuleset.cs
diff --git a/osu.Game.Mode.Osu/OsuScore.cs b/osu.Game.Modes.Osu/OsuScore.cs
similarity index 100%
rename from osu.Game.Mode.Osu/OsuScore.cs
rename to osu.Game.Modes.Osu/OsuScore.cs
diff --git a/osu.Game.Mode.Osu/OsuScoreProcessor.cs b/osu.Game.Modes.Osu/OsuScoreProcessor.cs
similarity index 100%
rename from osu.Game.Mode.Osu/OsuScoreProcessor.cs
rename to osu.Game.Modes.Osu/OsuScoreProcessor.cs
diff --git a/osu.Game.Mode.Osu/Properties/AssemblyInfo.cs b/osu.Game.Modes.Osu/Properties/AssemblyInfo.cs
similarity index 100%
rename from osu.Game.Mode.Osu/Properties/AssemblyInfo.cs
rename to osu.Game.Modes.Osu/Properties/AssemblyInfo.cs
diff --git a/osu.Game.Mode.Osu/UI/OsuComboCounter.cs b/osu.Game.Modes.Osu/UI/OsuComboCounter.cs
similarity index 100%
rename from osu.Game.Mode.Osu/UI/OsuComboCounter.cs
rename to osu.Game.Modes.Osu/UI/OsuComboCounter.cs
diff --git a/osu.Game.Mode.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
similarity index 100%
rename from osu.Game.Mode.Osu/UI/OsuHitRenderer.cs
rename to osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
diff --git a/osu.Game.Mode.Osu/UI/OsuPlayfield.cs b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
similarity index 100%
rename from osu.Game.Mode.Osu/UI/OsuPlayfield.cs
rename to osu.Game.Modes.Osu/UI/OsuPlayfield.cs
diff --git a/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs b/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs
similarity index 100%
rename from osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
rename to osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs
diff --git a/osu.Game.Mode.Osu/app.config b/osu.Game.Modes.Osu/app.config
similarity index 100%
rename from osu.Game.Mode.Osu/app.config
rename to osu.Game.Modes.Osu/app.config
diff --git a/osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
similarity index 100%
rename from osu.Game.Mode.Osu/osu.Game.Modes.Osu.csproj
rename to osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
diff --git a/osu.Game.Mode.Osu/packages.config b/osu.Game.Modes.Osu/packages.config
similarity index 100%
rename from osu.Game.Mode.Osu/packages.config
rename to osu.Game.Modes.Osu/packages.config
diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
index ab8bc674d8..355f71d0df 100644
--- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
+++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
@@ -66,7 +66,7 @@
       <Project>{C76BF5B3-985E-4D39-95FE-97C9C879B83A}</Project>
       <Name>osu.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index d59e90c2f4..5e1ce553d8 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -66,7 +66,7 @@
       <Project>{c76bf5b3-985e-4d39-95fe-97c9c879b83a}</Project>
       <Name>osu.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj">
+    <ProjectReference Include="..\osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj">
       <Project>{c92a607b-1fdd-4954-9f92-03ff547d9080}</Project>
       <Name>osu.Game.Modes.Osu</Name>
     </ProjectReference>
diff --git a/osu.sln b/osu.sln
index 9677a752fb..f3736c16c0 100644
--- a/osu.sln
+++ b/osu.sln
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Desktop.VisualTests", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Tests", "osu.Game.Tests\osu.Game.Tests.csproj", "{54377672-20B1-40AF-8087-5CF73BF3953A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Modes.Osu", "osu.Game.Mode.Osu\osu.Game.Modes.Osu.csproj", "{C92A607B-1FDD-4954-9F92-03FF547D9080}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Modes.Osu", "osu.Game.Modes.Osu\osu.Game.Modes.Osu.csproj", "{C92A607B-1FDD-4954-9F92-03FF547D9080}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Modes.Catch", "osu.Game.Modes.Catch\osu.Game.Modes.Catch.csproj", "{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}"
 EndProject