diff --git a/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs b/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs
index 2d2a34df5..a3160d137 100644
--- a/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs
+++ b/Dalamud.Test/Game/Text/Sanitizer/SanitizerTests.cs
@@ -1,5 +1,8 @@
using System.Collections.Generic;
using System.Linq;
+
+using Dalamud.Game;
+
using Xunit;
// ReSharper disable StringLiteralTypo
diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs
index 0a344945e..58eb930a0 100644
--- a/Dalamud/Data/DataManager.cs
+++ b/Dalamud/Data/DataManager.cs
@@ -1,6 +1,7 @@
using System.IO;
using System.Threading;
+using Dalamud.Game;
using Dalamud.IoC;
using Dalamud.IoC.Internal;
using Dalamud.Plugin.Services;
diff --git a/Dalamud/ClientLanguage.cs b/Dalamud/Game/ClientLanguage.cs
similarity index 78%
rename from Dalamud/ClientLanguage.cs
rename to Dalamud/Game/ClientLanguage.cs
index 1bf1c884a..7ce914c3f 100644
--- a/Dalamud/ClientLanguage.cs
+++ b/Dalamud/Game/ClientLanguage.cs
@@ -1,11 +1,8 @@
-using Dalamud.Utility;
-
-namespace Dalamud;
+namespace Dalamud.Game;
///
/// Enum describing the language the game loads in.
///
-[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")]
public enum ClientLanguage
{
///
diff --git a/Dalamud/Interface/Textures/GameIconLookup.cs b/Dalamud/Interface/Textures/GameIconLookup.cs
index db26b3142..7f78e47de 100644
--- a/Dalamud/Interface/Textures/GameIconLookup.cs
+++ b/Dalamud/Interface/Textures/GameIconLookup.cs
@@ -1,5 +1,7 @@
using System.Text;
+using Dalamud.Game;
+
namespace Dalamud.Interface.Textures;
/// Represents a lookup for a game icon.
diff --git a/Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs b/Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs
index 455b6f504..0796ad6cc 100644
--- a/Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs
+++ b/Dalamud/Interface/Textures/Internal/TextureManager.GamePath.cs
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.IO;
+using Dalamud.Game;
using Dalamud.Plugin.Services;
namespace Dalamud.Interface.Textures.Internal;
diff --git a/Dalamud/Plugin/Services/IClientState.cs b/Dalamud/Plugin/Services/IClientState.cs
index 9f256b3eb..db4903178 100644
--- a/Dalamud/Plugin/Services/IClientState.cs
+++ b/Dalamud/Plugin/Services/IClientState.cs
@@ -1,3 +1,4 @@
+using Dalamud.Game;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Objects.SubKinds;
diff --git a/Dalamud/Plugin/Services/IDataManager.cs b/Dalamud/Plugin/Services/IDataManager.cs
index e4b249319..dd649bd57 100644
--- a/Dalamud/Plugin/Services/IDataManager.cs
+++ b/Dalamud/Plugin/Services/IDataManager.cs
@@ -1,3 +1,5 @@
+using Dalamud.Game;
+
using Lumina;
using Lumina.Data;
using Lumina.Excel;
diff --git a/Dalamud/ClientLanguageExtensions.cs b/Dalamud/Utility/ClientLanguageExtensions.cs
similarity index 86%
rename from Dalamud/ClientLanguageExtensions.cs
rename to Dalamud/Utility/ClientLanguageExtensions.cs
index 40ff65867..69c39c9b8 100644
--- a/Dalamud/ClientLanguageExtensions.cs
+++ b/Dalamud/Utility/ClientLanguageExtensions.cs
@@ -1,11 +1,10 @@
-using Dalamud.Utility;
+using Dalamud.Game;
-namespace Dalamud;
+namespace Dalamud.Utility;
///
/// Extension methods for the class.
///
-[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")]
public static class ClientLanguageExtensions
{
///