diff --git a/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
index 59991af3ce..e82b3f46ec 100644
--- a/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -6,6 +6,7 @@ using osu.Game.Modes.Catch.Objects;
 using System.Collections.Generic;
 using System;
 using osu.Game.Modes.Objects.Types;
+using osu.Game.Modes.Beatmaps;
 
 namespace osu.Game.Modes.Catch.Beatmaps
 {
diff --git a/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapProcessor.cs
index ef585e2675..83e179dfce 100644
--- a/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Catch.Objects;
 
 namespace osu.Game.Modes.Catch.Beatmaps
diff --git a/osu.Game.Modes.Catch/CatchDifficultyCalculator.cs b/osu.Game.Modes.Catch/CatchDifficultyCalculator.cs
index 53c6f5c2ce..46f89b5575 100644
--- a/osu.Game.Modes.Catch/CatchDifficultyCalculator.cs
+++ b/osu.Game.Modes.Catch/CatchDifficultyCalculator.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Catch.Beatmaps;
 using osu.Game.Modes.Catch.Objects;
 using System.Collections.Generic;
diff --git a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
index 90bd61a39f..5b5f7ff2eb 100644
--- a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
+++ b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Catch.Beatmaps;
 using osu.Game.Modes.Catch.Judgements;
 using osu.Game.Modes.Catch.Objects;
diff --git a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
index bbe39e6772..188679d47c 100644
--- a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -6,6 +6,7 @@ using osu.Game.Modes.Mania.Objects;
 using System.Collections.Generic;
 using System;
 using osu.Game.Modes.Objects.Types;
+using osu.Game.Modes.Beatmaps;
 
 namespace osu.Game.Modes.Mania.Beatmaps
 {
diff --git a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapProcessor.cs b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapProcessor.cs
index 5e85a8f864..a25f5652fc 100644
--- a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapProcessor.cs
+++ b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapProcessor.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Mania.Objects;
 
 namespace osu.Game.Modes.Mania.Beatmaps
diff --git a/osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs b/osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs
index 02a5a3acdc..629c5a3374 100644
--- a/osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Mania.Beatmaps;
 using osu.Game.Modes.Mania.Objects;
 using System.Collections.Generic;
diff --git a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
index 0415bc961a..9cee3bff87 100644
--- a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
+++ b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Mania.Beatmaps;
 using osu.Game.Modes.Mania.Judgements;
 using osu.Game.Modes.Mania.Objects;
diff --git a/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
index d5d02f9eda..abb18e8236 100644
--- a/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using osu.Game.Modes.Objects.Types;
 using System.Linq;
 using System;
+using osu.Game.Modes.Beatmaps;
 
 namespace osu.Game.Modes.Osu.Beatmaps
 {
diff --git a/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapProcessor.cs b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapProcessor.cs
index 08c9d94141..df8fb58f9e 100644
--- a/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapProcessor.cs
+++ b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapProcessor.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Osu.Objects;
 
 namespace osu.Game.Modes.Osu.Beatmaps
diff --git a/osu.Game.Modes.Osu/OsuDifficultyCalculator.cs b/osu.Game.Modes.Osu/OsuDifficultyCalculator.cs
index 7696638082..9b4c6875c8 100644
--- a/osu.Game.Modes.Osu/OsuDifficultyCalculator.cs
+++ b/osu.Game.Modes.Osu/OsuDifficultyCalculator.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Objects.Types;
 using osu.Game.Modes.Osu.Beatmaps;
 using osu.Game.Modes.Osu.Objects;
diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
index 7e314c5ba1..0e7772bc11 100644
--- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
+++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
@@ -3,6 +3,7 @@
 
 using OpenTK;
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Beatmaps;
 using osu.Game.Modes.Osu.Judgements;
diff --git a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index a56ca43805..25aa296eb7 100644
--- a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -11,6 +11,7 @@ using System.Linq;
 using osu.Game.Database;
 using osu.Game.IO.Serialization;
 using osu.Game.Audio;
+using osu.Game.Modes.Beatmaps;
 
 namespace osu.Game.Modes.Taiko.Beatmaps
 {
diff --git a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs
index 84bc470e55..6f162c2816 100644
--- a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs
+++ b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapProcessor.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Taiko.Objects;
 
 namespace osu.Game.Modes.Taiko.Beatmaps
diff --git a/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs b/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
index 93dfc3d651..3cc0536fd3 100644
--- a/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Beatmaps;
 using osu.Game.Modes.Taiko.Beatmaps;
 using osu.Game.Modes.Taiko.Objects;
 using System.Collections.Generic;
diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
index 32476dff7f..6ed43afe7d 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
@@ -18,6 +18,7 @@ using osu.Game.Modes.Taiko.Scoring;
 using osu.Game.Modes.UI;
 using osu.Game.Modes.Taiko.Replays;
 using OpenTK;
+using osu.Game.Modes.Beatmaps;
 
 namespace osu.Game.Modes.Taiko.UI
 {
diff --git a/osu.Game/Beatmaps/DifficultyCalculator.cs b/osu.Game/Beatmaps/DifficultyCalculator.cs
index a9da5c589c..48fdf250f0 100644
--- a/osu.Game/Beatmaps/DifficultyCalculator.cs
+++ b/osu.Game/Beatmaps/DifficultyCalculator.cs
@@ -1,6 +1,7 @@
 // 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.Beatmaps;
 using osu.Game.Modes.Objects;
 using System.Collections.Generic;
 
diff --git a/osu.Game/Beatmaps/IBeatmapConverter.cs b/osu.Game/Modes/Beatmaps/IBeatmapConverter.cs
similarity index 94%
rename from osu.Game/Beatmaps/IBeatmapConverter.cs
rename to osu.Game/Modes/Beatmaps/IBeatmapConverter.cs
index 948e55967e..cfc27c5bdb 100644
--- a/osu.Game/Beatmaps/IBeatmapConverter.cs
+++ b/osu.Game/Modes/Beatmaps/IBeatmapConverter.cs
@@ -5,8 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Modes.Objects;
+using osu.Game.Beatmaps;
 
-namespace osu.Game.Beatmaps
+namespace osu.Game.Modes.Beatmaps
 {
     /// <summary>
     /// Converts a Beatmap for another mode.
diff --git a/osu.Game/Beatmaps/IBeatmapProcessor.cs b/osu.Game/Modes/Beatmaps/IBeatmapProcessor.cs
similarity index 90%
rename from osu.Game/Beatmaps/IBeatmapProcessor.cs
rename to osu.Game/Modes/Beatmaps/IBeatmapProcessor.cs
index 9157a760b1..c40e7d1c41 100644
--- a/osu.Game/Beatmaps/IBeatmapProcessor.cs
+++ b/osu.Game/Modes/Beatmaps/IBeatmapProcessor.cs
@@ -1,9 +1,10 @@
 // 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.Objects;
 
-namespace osu.Game.Beatmaps
+namespace osu.Game.Modes.Beatmaps
 {
     /// <summary>
     /// Processes a post-converted Beatmap.
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index 98a6c35135..7ccd29a977 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -17,6 +17,7 @@ using System.Linq;
 using osu.Game.Modes.Replays;
 using osu.Game.Modes.Scoring;
 using OpenTK;
+using osu.Game.Modes.Beatmaps;
 
 namespace osu.Game.Modes.UI
 {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f259a37bb0..84589e53a1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -72,8 +72,8 @@
     <Compile Include="Audio\SampleInfo.cs" />
     <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
     <Compile Include="Beatmaps\DifficultyCalculator.cs" />
-    <Compile Include="Beatmaps\IBeatmapConverter.cs" />
-    <Compile Include="Beatmaps\IBeatmapProcessor.cs" />
+    <Compile Include="Modes\Beatmaps\IBeatmapConverter.cs" />
+    <Compile Include="Modes\Beatmaps\IBeatmapProcessor.cs" />
     <Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
     <Compile Include="Beatmaps\Timing\TimeSignatures.cs" />
     <Compile Include="Beatmaps\Timing\TimingInfo.cs" />