diff --git a/Osu.Patcher.Hook/Patches/BeatmapMirror/EnableOsuDirect.cs b/Osu.Patcher.Hook/Patches/BeatmapMirror/EnableOsuDirect.cs
index 6bc73a2..c9ced19 100644
--- a/Osu.Patcher.Hook/Patches/BeatmapMirror/EnableOsuDirect.cs
+++ b/Osu.Patcher.Hook/Patches/BeatmapMirror/EnableOsuDirect.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Other;
+using Osu.Stubs.Online;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 
diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/AddPerformanceToUi.cs b/Osu.Patcher.Hook/Patches/LivePerformance/AddPerformanceToUi.cs
index 478a0e7..7fd7a15 100644
--- a/Osu.Patcher.Hook/Patches/LivePerformance/AddPerformanceToUi.cs
+++ b/Osu.Patcher.Hook/Patches/LivePerformance/AddPerformanceToUi.cs
@@ -4,10 +4,12 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Framework;
-using Osu.Stubs.GameModes;
+using Osu.Stubs.GameModes.Play;
 using Osu.Stubs.Graphics;
+using Osu.Stubs.Graphics.Skinning;
+using Osu.Stubs.Graphics.Sprites;
 using Osu.Stubs.Wrappers;
+using Osu.Stubs.XNA;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 
diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceCalculator.cs b/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceCalculator.cs
index 97d1c61..d3470b5 100644
--- a/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceCalculator.cs
+++ b/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceCalculator.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics;
 using Osu.Performance;
-using Osu.Stubs.GameModes;
-using Osu.Stubs.Other;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameModes.Play;
+using Osu.Stubs.GameplayElements.Beatmaps;
+using Osu.Stubs.GameplayElements.Scoring;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 
diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceDisplay.cs b/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceDisplay.cs
index 0306061..ca8ce0e 100644
--- a/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceDisplay.cs
+++ b/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceDisplay.cs
@@ -1,5 +1,5 @@
 using System;
-using Osu.Stubs.Framework;
+using Osu.Stubs.Graphics.Sprites;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 
diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/TrackOnScoreHit.cs b/Osu.Patcher.Hook/Patches/LivePerformance/TrackOnScoreHit.cs
index eed9ded..be60d0e 100644
--- a/Osu.Patcher.Hook/Patches/LivePerformance/TrackOnScoreHit.cs
+++ b/Osu.Patcher.Hook/Patches/LivePerformance/TrackOnScoreHit.cs
@@ -5,8 +5,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using Osu.Performance;
-using Osu.Stubs.Rulesets;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameModes.Play.Rulesets;
+using Osu.Stubs.GameplayElements.Scoring;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 
diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/TrackResetScore.cs b/Osu.Patcher.Hook/Patches/LivePerformance/TrackResetScore.cs
index 97543f1..99ce404 100644
--- a/Osu.Patcher.Hook/Patches/LivePerformance/TrackResetScore.cs
+++ b/Osu.Patcher.Hook/Patches/LivePerformance/TrackResetScore.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Rulesets;
+using Osu.Stubs.GameModes.Play.Rulesets;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 
diff --git a/Osu.Patcher.Hook/Patches/Misc/AllowPlayModeReload.cs b/Osu.Patcher.Hook/Patches/Misc/AllowPlayModeReload.cs
index cf632ff..7858984 100644
--- a/Osu.Patcher.Hook/Patches/Misc/AllowPlayModeReload.cs
+++ b/Osu.Patcher.Hook/Patches/Misc/AllowPlayModeReload.cs
@@ -3,7 +3,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using Osu.Patcher.Hook.Patches.UI;
-using Osu.Stubs.Other;
+using Osu.Stubs.Root;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 
diff --git a/Osu.Patcher.Hook/Patches/Misc/FixDoubleSkipping.cs b/Osu.Patcher.Hook/Patches/Misc/FixDoubleSkipping.cs
index 312a6c9..3928b19 100644
--- a/Osu.Patcher.Hook/Patches/Misc/FixDoubleSkipping.cs
+++ b/Osu.Patcher.Hook/Patches/Misc/FixDoubleSkipping.cs
@@ -3,8 +3,8 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.GameModes;
-using Osu.Stubs.Other;
+using Osu.Stubs.GameModes.Play;
+using Osu.Stubs.GameplayElements.Events;
 
 namespace Osu.Patcher.Hook.Patches.Misc;
 
diff --git a/Osu.Patcher.Hook/Patches/Misc/LogSoftErrors.cs b/Osu.Patcher.Hook/Patches/Misc/LogSoftErrors.cs
index 918f8ec..d56a9a0 100644
--- a/Osu.Patcher.Hook/Patches/Misc/LogSoftErrors.cs
+++ b/Osu.Patcher.Hook/Patches/Misc/LogSoftErrors.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Other;
+using Osu.Stubs.Root;
 
 namespace Osu.Patcher.Hook.Patches.Misc;
 
diff --git a/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModAudioEffects.cs b/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModAudioEffects.cs
index 2e92487..98c5bd2 100644
--- a/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModAudioEffects.cs
+++ b/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModAudioEffects.cs
@@ -1,7 +1,7 @@
 using System;
 using Osu.Stubs.Audio;
-using Osu.Stubs.Scoring;
-using static Osu.Stubs.Other.Mods;
+using Osu.Stubs.GameplayElements.Scoring;
+using static Osu.Stubs.Root.Mods;
 
 namespace Osu.Patcher.Hook.Patches.Mods.AudioPreview;
 
diff --git a/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModSelectAudioPreview.cs b/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModSelectAudioPreview.cs
index d021185..0057419 100644
--- a/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModSelectAudioPreview.cs
+++ b/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModSelectAudioPreview.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.SongSelect;
+using Osu.Stubs.GameModes.Select;
 
 namespace Osu.Patcher.Hook.Patches.Mods.AudioPreview;
 
diff --git a/Osu.Patcher.Hook/Patches/Mods/SuddenDeathAutoRetry.cs b/Osu.Patcher.Hook/Patches/Mods/SuddenDeathAutoRetry.cs
index 306e55c..54a7671 100644
--- a/Osu.Patcher.Hook/Patches/Mods/SuddenDeathAutoRetry.cs
+++ b/Osu.Patcher.Hook/Patches/Mods/SuddenDeathAutoRetry.cs
@@ -2,9 +2,9 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Rulesets;
+using Osu.Stubs.GameModes.Play.Rulesets;
 using static System.Reflection.Emit.OpCodes;
-using static Osu.Stubs.Other.Mods;
+using static Osu.Stubs.Root.Mods;
 
 namespace Osu.Patcher.Hook.Patches.Mods;
 
diff --git a/Osu.Patcher.Hook/Patches/UI/AllowOpenOptionsInGameplay.cs b/Osu.Patcher.Hook/Patches/UI/AllowOpenOptionsInGameplay.cs
index 124b814..ca5853b 100644
--- a/Osu.Patcher.Hook/Patches/UI/AllowOpenOptionsInGameplay.cs
+++ b/Osu.Patcher.Hook/Patches/UI/AllowOpenOptionsInGameplay.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Other;
+using Osu.Stubs.GameModes.Options;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 
diff --git a/Osu.Patcher.Hook/Patches/UI/CustomSongSelectThumbnailAlpha.cs b/Osu.Patcher.Hook/Patches/UI/CustomSongSelectThumbnailAlpha.cs
index 70e0d1e..c4e98a3 100644
--- a/Osu.Patcher.Hook/Patches/UI/CustomSongSelectThumbnailAlpha.cs
+++ b/Osu.Patcher.Hook/Patches/UI/CustomSongSelectThumbnailAlpha.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.SongSelect;
+using Osu.Stubs.GameplayElements.Beatmaps;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 
diff --git a/Osu.Patcher.Hook/Patches/UI/RevertSortWhenNoGroup.cs b/Osu.Patcher.Hook/Patches/UI/RevertSortWhenNoGroup.cs
index 4cc34de..037e64f 100644
--- a/Osu.Patcher.Hook/Patches/UI/RevertSortWhenNoGroup.cs
+++ b/Osu.Patcher.Hook/Patches/UI/RevertSortWhenNoGroup.cs
@@ -3,8 +3,9 @@
 using System.Reflection.Emit;
 using HarmonyLib;
 using JetBrains.Annotations;
+using Osu.Stubs.GameModes.Select;
+using Osu.Stubs.GameplayElements.Beatmaps;
 using Osu.Stubs.Helpers;
-using Osu.Stubs.SongSelect;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 
diff --git a/Osu.Patcher.Hook/Patches/UI/ShowModsInGameplay.cs b/Osu.Patcher.Hook/Patches/UI/ShowModsInGameplay.cs
index ecd48b7..9b01d76 100644
--- a/Osu.Patcher.Hook/Patches/UI/ShowModsInGameplay.cs
+++ b/Osu.Patcher.Hook/Patches/UI/ShowModsInGameplay.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.GameModes;
+using Osu.Stubs.GameModes.Play;
 using static System.Reflection.Emit.OpCodes;
 
 namespace Osu.Patcher.Hook.Patches.UI;
diff --git a/Osu.Stubs/Other/Options.cs b/Osu.Stubs/GameModes/Options/Options.cs
similarity index 95%
rename from Osu.Stubs/Other/Options.cs
rename to Osu.Stubs/GameModes/Options/Options.cs
index fc65ebf..66f7f78 100644
--- a/Osu.Stubs/Other/Options.cs
+++ b/Osu.Stubs/GameModes/Options/Options.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.GameModes.Options;
 
 /// <summary>
 ///     Original: <c>osu.GameModes.Options.Options</c>
diff --git a/Osu.Stubs/GameModes/Player.cs b/Osu.Stubs/GameModes/Play/Player.cs
similarity index 96%
rename from Osu.Stubs/GameModes/Player.cs
rename to Osu.Stubs/GameModes/Play/Player.cs
index b66b984..6e811b7 100644
--- a/Osu.Stubs/GameModes/Player.cs
+++ b/Osu.Stubs/GameModes/Play/Player.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameplayElements.Scoring;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.GameModes;
+namespace Osu.Stubs.GameModes.Play;
 
 [PublicAPI]
 public static class Player
diff --git a/Osu.Stubs/Rulesets/IncreaseScoreType.cs b/Osu.Stubs/GameModes/Play/Rulesets/IncreaseScoreType.cs
similarity index 95%
rename from Osu.Stubs/Rulesets/IncreaseScoreType.cs
rename to Osu.Stubs/GameModes/Play/Rulesets/IncreaseScoreType.cs
index 1e387f7..baa5412 100644
--- a/Osu.Stubs/Rulesets/IncreaseScoreType.cs
+++ b/Osu.Stubs/GameModes/Play/Rulesets/IncreaseScoreType.cs
@@ -1,8 +1,8 @@
 using JetBrains.Annotations;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameplayElements.Scoring.Processors;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.Rulesets;
+namespace Osu.Stubs.GameModes.Play.Rulesets;
 
 [PublicAPI]
 public class IncreaseScoreType
diff --git a/Osu.Stubs/Rulesets/Ruleset.cs b/Osu.Stubs/GameModes/Play/Rulesets/Ruleset.cs
similarity index 95%
rename from Osu.Stubs/Rulesets/Ruleset.cs
rename to Osu.Stubs/GameModes/Play/Rulesets/Ruleset.cs
index 6fd0cc8..0bd669d 100644
--- a/Osu.Stubs/Rulesets/Ruleset.cs
+++ b/Osu.Stubs/GameModes/Play/Rulesets/Ruleset.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameplayElements.Scoring;
 using Osu.Utils.Extensions;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Rulesets;
+namespace Osu.Stubs.GameModes.Play.Rulesets;
 
 [PublicAPI]
 public static class Ruleset
@@ -128,6 +128,6 @@ public static class Ruleset
     public static readonly LazyField<object?> ScoreDisplay = new(
         "osu.GameModes.Play.Rulesets.Ruleset::ScoreDisplay",
         () => Class.Reference.GetRuntimeFields()
-            .Single(field => field.FieldType == GameModes.ScoreDisplay.Class.Reference)
+            .Single(field => field.FieldType == Play.ScoreDisplay.Class.Reference)
     );
 }
\ No newline at end of file
diff --git a/Osu.Stubs/GameModes/ScoreDisplay.cs b/Osu.Stubs/GameModes/Play/ScoreDisplay.cs
similarity index 94%
rename from Osu.Stubs/GameModes/ScoreDisplay.cs
rename to Osu.Stubs/GameModes/Play/ScoreDisplay.cs
index 42f2ff3..230fbc3 100644
--- a/Osu.Stubs/GameModes/ScoreDisplay.cs
+++ b/Osu.Stubs/GameModes/Play/ScoreDisplay.cs
@@ -4,7 +4,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.GameModes;
+namespace Osu.Stubs.GameModes.Play;
 
 [PublicAPI]
 public static class ScoreDisplay
@@ -81,6 +81,6 @@ public static class ScoreDisplay
     public static readonly LazyField<object> SpriteManager = new(
         "osu.GameModes.Play.Components.ScoreDisplay::spriteManager",
         () => Class.Reference.GetDeclaredFields()
-            .Single(field => field.FieldType == Graphics.SpriteManager.Class.Reference)
+            .Single(field => field.FieldType == Graphics.Sprites.SpriteManager.Class.Reference)
     );
 }
\ No newline at end of file
diff --git a/Osu.Stubs/SongSelect/ModSelection.cs b/Osu.Stubs/GameModes/Select/ModSelection.cs
similarity index 94%
rename from Osu.Stubs/SongSelect/ModSelection.cs
rename to Osu.Stubs/GameModes/Select/ModSelection.cs
index f38f886..53e0d9b 100644
--- a/Osu.Stubs/SongSelect/ModSelection.cs
+++ b/Osu.Stubs/GameModes/Select/ModSelection.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.SongSelect;
+namespace Osu.Stubs.GameModes.Select;
 
 /// <summary>
 ///     Original: <c>osu.GameModes.Select.ModSelection</c>
diff --git a/Osu.Stubs/SongSelect/SongSelection.cs b/Osu.Stubs/GameModes/Select/SongSelection.cs
similarity index 97%
rename from Osu.Stubs/SongSelect/SongSelection.cs
rename to Osu.Stubs/GameModes/Select/SongSelection.cs
index f9b29cc..a90febe 100644
--- a/Osu.Stubs/SongSelect/SongSelection.cs
+++ b/Osu.Stubs/GameModes/Select/SongSelection.cs
@@ -6,7 +6,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.SongSelect;
+namespace Osu.Stubs.GameModes.Select;
 
 /// <summary>
 ///     Original: <c>osu.GameModes.Select.SongSelection</c>
@@ -57,7 +57,7 @@ public static class SongSelection
     );
 
     /// <summary>
-    ///     Original: <c>beatmapTreeManager</c> of type <see cref="SongSelect.BeatmapTreeManager" />
+    ///     Original: <c>beatmapTreeManager</c> of type <see cref="GameplayElements.Beatmaps.BeatmapTreeManager" />
     ///     b20240102.2: <c>#=zj0IgvXxTqseooUEFmQ==</c>
     /// </summary>
     [Stub]
diff --git a/Osu.Stubs/Other/Beatmap.cs b/Osu.Stubs/GameplayElements/Beatmaps/Beatmap.cs
similarity index 97%
rename from Osu.Stubs/Other/Beatmap.cs
rename to Osu.Stubs/GameplayElements/Beatmaps/Beatmap.cs
index c8ec5b5..5cd57fc 100644
--- a/Osu.Stubs/Other/Beatmap.cs
+++ b/Osu.Stubs/GameplayElements/Beatmaps/Beatmap.cs
@@ -3,13 +3,13 @@
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameplayElements.Scoring;
 using Osu.Utils;
 using Osu.Utils.IL;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.GameplayElements.Beatmaps;
 
 [PublicAPI]
 public static class Beatmap
diff --git a/Osu.Stubs/SongSelect/BeatmapTreeItem.cs b/Osu.Stubs/GameplayElements/Beatmaps/BeatmapTreeItem.cs
similarity index 97%
rename from Osu.Stubs/SongSelect/BeatmapTreeItem.cs
rename to Osu.Stubs/GameplayElements/Beatmaps/BeatmapTreeItem.cs
index 02b4941..7a75d9a 100644
--- a/Osu.Stubs/SongSelect/BeatmapTreeItem.cs
+++ b/Osu.Stubs/GameplayElements/Beatmaps/BeatmapTreeItem.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.SongSelect;
+namespace Osu.Stubs.GameplayElements.Beatmaps;
 
 /// <summary>
 ///     Original: <c>osu.GameplayElements.Beatmaps.BeatmapTreeItem</c>
diff --git a/Osu.Stubs/SongSelect/BeatmapTreeManager.cs b/Osu.Stubs/GameplayElements/Beatmaps/BeatmapTreeManager.cs
similarity index 89%
rename from Osu.Stubs/SongSelect/BeatmapTreeManager.cs
rename to Osu.Stubs/GameplayElements/Beatmaps/BeatmapTreeManager.cs
index 4dac912..a12eb29 100644
--- a/Osu.Stubs/SongSelect/BeatmapTreeManager.cs
+++ b/Osu.Stubs/GameplayElements/Beatmaps/BeatmapTreeManager.cs
@@ -1,7 +1,8 @@
 using JetBrains.Annotations;
+using Osu.Stubs.GameModes.Select;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.SongSelect;
+namespace Osu.Stubs.GameplayElements.Beatmaps;
 
 /// <summary>
 ///     Original: <c>osu.GameplayElements.Beatmaps.BeatmapTreeManager</c>
diff --git a/Osu.Stubs/Other/EventManager.cs b/Osu.Stubs/GameplayElements/Events/EventManager.cs
similarity index 97%
rename from Osu.Stubs/Other/EventManager.cs
rename to Osu.Stubs/GameplayElements/Events/EventManager.cs
index e89011c..57864ad 100644
--- a/Osu.Stubs/Other/EventManager.cs
+++ b/Osu.Stubs/GameplayElements/Events/EventManager.cs
@@ -5,7 +5,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.GameplayElements.Events;
 
 /// <summary>
 ///     Original: <c>osu.GameplayElements.Events.EventManager</c>
diff --git a/Osu.Stubs/Scoring/ModManager.cs b/Osu.Stubs/GameplayElements/Scoring/ModManager.cs
similarity index 95%
rename from Osu.Stubs/Scoring/ModManager.cs
rename to Osu.Stubs/GameplayElements/Scoring/ModManager.cs
index a18e6bc..1eeada9 100644
--- a/Osu.Stubs/Scoring/ModManager.cs
+++ b/Osu.Stubs/GameplayElements/Scoring/ModManager.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Other;
+using Osu.Stubs.Root;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Scoring;
+namespace Osu.Stubs.GameplayElements.Scoring;
 
 [PublicAPI]
 public class ModManager
diff --git a/Osu.Stubs/Scoring/ScoreChange.cs b/Osu.Stubs/GameplayElements/Scoring/Processors/ScoreChange.cs
similarity index 93%
rename from Osu.Stubs/Scoring/ScoreChange.cs
rename to Osu.Stubs/GameplayElements/Scoring/Processors/ScoreChange.cs
index 8c5d381..66cfca1 100644
--- a/Osu.Stubs/Scoring/ScoreChange.cs
+++ b/Osu.Stubs/GameplayElements/Scoring/Processors/ScoreChange.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using JetBrains.Annotations;
-using Osu.Stubs.Rulesets;
+using Osu.Stubs.GameModes.Play.Rulesets;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.Scoring;
+namespace Osu.Stubs.GameplayElements.Scoring.Processors;
 
 [PublicAPI]
 public static class ScoreChange
diff --git a/Osu.Stubs/Scoring/ScoreProcessor.cs b/Osu.Stubs/GameplayElements/Scoring/Processors/ScoreProcessor.cs
similarity index 97%
rename from Osu.Stubs/Scoring/ScoreProcessor.cs
rename to Osu.Stubs/GameplayElements/Scoring/Processors/ScoreProcessor.cs
index dc01baf..f7005b9 100644
--- a/Osu.Stubs/Scoring/ScoreProcessor.cs
+++ b/Osu.Stubs/GameplayElements/Scoring/Processors/ScoreProcessor.cs
@@ -4,7 +4,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Scoring;
+namespace Osu.Stubs.GameplayElements.Scoring.Processors;
 
 /// <summary>
 ///     Original: <c>osu.GameplayElements.Scoring.Processors.ScoreProcessor</c>
diff --git a/Osu.Stubs/Scoring/Score.cs b/Osu.Stubs/GameplayElements/Scoring/Score.cs
similarity index 96%
rename from Osu.Stubs/Scoring/Score.cs
rename to Osu.Stubs/GameplayElements/Scoring/Score.cs
index d243140..6abcad9 100644
--- a/Osu.Stubs/Scoring/Score.cs
+++ b/Osu.Stubs/GameplayElements/Scoring/Score.cs
@@ -10,7 +10,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Scoring;
+namespace Osu.Stubs.GameplayElements.Scoring;
 
 [PublicAPI]
 public static class Score
@@ -70,7 +70,7 @@ public static class Score
         "osu.GameplayElements.Scoring.Score::Beatmap",
         () => Class.Reference
             .GetRuntimeFields()
-            .Single(inst => inst.FieldType == Other.Beatmap.Class.Reference)
+            .Single(inst => inst.FieldType == Beatmaps.Beatmap.Class.Reference)
     );
 
     /// <summary>
diff --git a/Osu.Stubs/Graphics/NotificationManager.cs b/Osu.Stubs/Graphics/Notifications/NotificationManager.cs
similarity index 96%
rename from Osu.Stubs/Graphics/NotificationManager.cs
rename to Osu.Stubs/Graphics/Notifications/NotificationManager.cs
index c48e8b9..393ab98 100644
--- a/Osu.Stubs/Graphics/NotificationManager.cs
+++ b/Osu.Stubs/Graphics/Notifications/NotificationManager.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Graphics;
+namespace Osu.Stubs.Graphics.Notifications;
 
 /// <summary>
 ///     Original: <c>osu.Graphics.Notifications.NotificationManager</c>
diff --git a/Osu.Stubs/Graphics/SkinManager.cs b/Osu.Stubs/Graphics/Skinning/SkinManager.cs
similarity index 97%
rename from Osu.Stubs/Graphics/SkinManager.cs
rename to Osu.Stubs/Graphics/Skinning/SkinManager.cs
index a7964db..287edf7 100644
--- a/Osu.Stubs/Graphics/SkinManager.cs
+++ b/Osu.Stubs/Graphics/Skinning/SkinManager.cs
@@ -4,7 +4,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Graphics;
+namespace Osu.Stubs.Graphics.Skinning;
 
 [PublicAPI]
 public static class SkinManager
diff --git a/Osu.Stubs/Graphics/SkinOsu.cs b/Osu.Stubs/Graphics/Skinning/SkinOsu.cs
similarity index 96%
rename from Osu.Stubs/Graphics/SkinOsu.cs
rename to Osu.Stubs/Graphics/Skinning/SkinOsu.cs
index aa961fc..7d64e4f 100644
--- a/Osu.Stubs/Graphics/SkinOsu.cs
+++ b/Osu.Stubs/Graphics/Skinning/SkinOsu.cs
@@ -2,7 +2,7 @@
 using JetBrains.Annotations;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.Graphics;
+namespace Osu.Stubs.Graphics.Skinning;
 
 /// <summary>
 ///     Most names are present because this class is <c>[Serializable]</c>.
diff --git a/Osu.Stubs/Graphics/SpriteManager.cs b/Osu.Stubs/Graphics/Sprites/SpriteManager.cs
similarity index 96%
rename from Osu.Stubs/Graphics/SpriteManager.cs
rename to Osu.Stubs/Graphics/Sprites/SpriteManager.cs
index 5c1e216..d8a3499 100644
--- a/Osu.Stubs/Graphics/SpriteManager.cs
+++ b/Osu.Stubs/Graphics/Sprites/SpriteManager.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Graphics;
+namespace Osu.Stubs.Graphics.Sprites;
 
 [PublicAPI]
 public static class SpriteManager
diff --git a/Osu.Stubs/Framework/pSpriteText.cs b/Osu.Stubs/Graphics/Sprites/pSpriteText.cs
similarity index 98%
rename from Osu.Stubs/Framework/pSpriteText.cs
rename to Osu.Stubs/Graphics/Sprites/pSpriteText.cs
index 53f8298..dc9a287 100644
--- a/Osu.Stubs/Framework/pSpriteText.cs
+++ b/Osu.Stubs/Graphics/Sprites/pSpriteText.cs
@@ -5,7 +5,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Framework;
+namespace Osu.Stubs.Graphics.Sprites;
 
 [PublicAPI]
 [SuppressMessage("ReSharper", "InconsistentNaming")]
diff --git a/Osu.Stubs/Framework/pText.cs b/Osu.Stubs/Graphics/Sprites/pText.cs
similarity index 96%
rename from Osu.Stubs/Framework/pText.cs
rename to Osu.Stubs/Graphics/Sprites/pText.cs
index c8deb59..5fb4d9a 100644
--- a/Osu.Stubs/Framework/pText.cs
+++ b/Osu.Stubs/Graphics/Sprites/pText.cs
@@ -3,7 +3,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Framework;
+namespace Osu.Stubs.Graphics.Sprites;
 
 /// <summary>
 ///     Sprite that handles text. This is the base class of <c>pSpriteText</c>.
diff --git a/Osu.Stubs/Framework/pDrawable.cs b/Osu.Stubs/Graphics/pDrawable.cs
similarity index 98%
rename from Osu.Stubs/Framework/pDrawable.cs
rename to Osu.Stubs/Graphics/pDrawable.cs
index d6bc1f7..4ed9668 100644
--- a/Osu.Stubs/Framework/pDrawable.cs
+++ b/Osu.Stubs/Graphics/pDrawable.cs
@@ -3,11 +3,12 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
+using Osu.Stubs.XNA;
 using Osu.Utils.IL;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Framework;
+namespace Osu.Stubs.Graphics;
 
 [PublicAPI]
 [SuppressMessage("ReSharper", "InconsistentNaming")]
diff --git a/Osu.Stubs/Helpers/Bindable.cs b/Osu.Stubs/Helpers/Bindable.cs
index bf943dd..d2c6034 100644
--- a/Osu.Stubs/Helpers/Bindable.cs
+++ b/Osu.Stubs/Helpers/Bindable.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
-using Osu.Stubs.SongSelect;
+using Osu.Stubs.GameModes.Select;
 using Osu.Utils.IL;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
diff --git a/Osu.Stubs/Other/OsuDirect.cs b/Osu.Stubs/Online/OsuDirect.cs
similarity index 96%
rename from Osu.Stubs/Other/OsuDirect.cs
rename to Osu.Stubs/Online/OsuDirect.cs
index 966da49..bfed9f7 100644
--- a/Osu.Stubs/Other/OsuDirect.cs
+++ b/Osu.Stubs/Online/OsuDirect.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.Online;
 
 /// <summary>
 ///     Original: <c>osu.Online.OsuDirect</c>
diff --git a/Osu.Stubs/Other/GameBase.cs b/Osu.Stubs/Root/GameBase.cs
similarity index 97%
rename from Osu.Stubs/Other/GameBase.cs
rename to Osu.Stubs/Root/GameBase.cs
index b298720..80f1390 100644
--- a/Osu.Stubs/Other/GameBase.cs
+++ b/Osu.Stubs/Root/GameBase.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.Root;
 
 /// <summary>
 ///     Original: <c>osu.GameBase</c>
diff --git a/Osu.Stubs/Other/Mods.cs b/Osu.Stubs/Root/Mods.cs
similarity index 98%
rename from Osu.Stubs/Other/Mods.cs
rename to Osu.Stubs/Root/Mods.cs
index 046c37e..6fc962f 100644
--- a/Osu.Stubs/Other/Mods.cs
+++ b/Osu.Stubs/Root/Mods.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.Root;
 
 [PublicAPI]
 public class Mods
diff --git a/Osu.Stubs/Wrappers/Notifications.cs b/Osu.Stubs/Wrappers/Notifications.cs
index 652626b..ab5c0a4 100644
--- a/Osu.Stubs/Wrappers/Notifications.cs
+++ b/Osu.Stubs/Wrappers/Notifications.cs
@@ -1,6 +1,6 @@
 using System;
 using JetBrains.Annotations;
-using Osu.Stubs.Graphics;
+using Osu.Stubs.Graphics.Notifications;
 
 namespace Osu.Stubs.Wrappers;
 
diff --git a/Osu.Stubs/Wrappers/VoidDelegate.cs b/Osu.Stubs/Wrappers/VoidDelegate.cs
index 779adbf..e871f04 100644
--- a/Osu.Stubs/Wrappers/VoidDelegate.cs
+++ b/Osu.Stubs/Wrappers/VoidDelegate.cs
@@ -1,6 +1,6 @@
 using System;
 using JetBrains.Annotations;
-using Osu.Stubs.Graphics;
+using Osu.Stubs.Graphics.Notifications;
 
 namespace Osu.Stubs.Wrappers;
 
diff --git a/Osu.Stubs/Framework/Vector2.cs b/Osu.Stubs/XNA/Vector2.cs
similarity index 97%
rename from Osu.Stubs/Framework/Vector2.cs
rename to Osu.Stubs/XNA/Vector2.cs
index b0049a2..15682ff 100644
--- a/Osu.Stubs/Framework/Vector2.cs
+++ b/Osu.Stubs/XNA/Vector2.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.Framework;
+namespace Osu.Stubs.XNA;
 
 /// <summary>
 ///     Most names are present because this class is <c>[Serializable]</c>.