diff --git a/Ryujinx.HLE/HOS/Services/Btm/BtmUser/IBtmUserCore.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs
similarity index 98%
rename from Ryujinx.HLE/HOS/Services/Btm/BtmUser/IBtmUserCore.cs
rename to Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs
index 0ab9a3ef1c..47fdb88f7b 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/BtmUser/IBtmUserCore.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs
@@ -3,7 +3,7 @@ using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Threading;
-namespace Ryujinx.HLE.HOS.Services.Btm.BtmUser
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser
{
class IBtmUserCore : IpcService
{
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtm.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtm.cs
similarity index 66%
rename from Ryujinx.HLE/HOS/Services/Btm/IBtm.cs
rename to Ryujinx.HLE/HOS/Services/BluetoothManager/IBtm.cs
index 947fee14ca..48a273a099 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtm.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtm.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{
[Service("btm")]
class IBtm : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmDebug.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmDebug.cs
similarity index 68%
rename from Ryujinx.HLE/HOS/Services/Btm/IBtmDebug.cs
rename to Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmDebug.cs
index a55b7da875..259698af57 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmDebug.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmDebug.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{
[Service("btm:dbg")]
class IBtmDebug : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmSystem.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmSystem.cs
similarity index 69%
rename from Ryujinx.HLE/HOS/Services/Btm/IBtmSystem.cs
rename to Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmSystem.cs
index 9120762caf..c4210b7826 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmSystem.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmSystem.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{
[Service("btm:sys")]
class IBtmSystem : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmUser.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs
similarity index 77%
rename from Ryujinx.HLE/HOS/Services/Btm/IBtmUser.cs
rename to Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs
index 68694187bc..b704b51ca2 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmUser.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs
@@ -1,6 +1,6 @@
-using Ryujinx.HLE.HOS.Services.Btm.BtmUser;
+using Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser;
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{
[Service("btm:u")] // 5.0.0+
class IBtmUser : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Btm/ResultCode.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/ResultCode.cs
similarity index 67%
rename from Ryujinx.HLE/HOS/Services/Btm/ResultCode.cs
rename to Ryujinx.HLE/HOS/Services/BluetoothManager/ResultCode.cs
index b222fdc88b..0ad2c48553 100644
--- a/Ryujinx.HLE/HOS/Services/Btm/ResultCode.cs
+++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/ResultCode.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
+namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{
enum ResultCode
{
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IDebugMonitorInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IDebugMonitorInterface.cs
similarity index 76%
rename from Ryujinx.HLE/HOS/Services/Ldr/IDebugMonitorInterface.cs
rename to Ryujinx.HLE/HOS/Services/Loader/IDebugMonitorInterface.cs
index d87234da5e..82b24a35cd 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IDebugMonitorInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/IDebugMonitorInterface.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
{
[Service("ldr:dmnt")]
class IDebugMonitorInterface : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IProcessManagerInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IProcessManagerInterface.cs
similarity index 77%
rename from Ryujinx.HLE/HOS/Services/Ldr/IProcessManagerInterface.cs
rename to Ryujinx.HLE/HOS/Services/Loader/IProcessManagerInterface.cs
index 9f5b5e357c..2ecde2ade4 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IProcessManagerInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/IProcessManagerInterface.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
{
[Service("ldr:pm")]
class IProcessManagerInterface : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs
similarity index 99%
rename from Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs
rename to Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs
index b5ef0f07e6..3d58594b05 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs
@@ -10,7 +10,7 @@ using System.IO;
using System.Linq;
using System.Security.Cryptography;
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
{
[Service("ldr:ro")]
[Service("ro:1")] // 7.0.0+
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IShellInterface.cs b/Ryujinx.HLE/HOS/Services/Loader/IShellInterface.cs
similarity index 75%
rename from Ryujinx.HLE/HOS/Services/Ldr/IShellInterface.cs
rename to Ryujinx.HLE/HOS/Services/Loader/IShellInterface.cs
index 856aec5216..362f82f030 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IShellInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/IShellInterface.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
{
[Service("ldr:shel")]
class IShellInterface : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/ResultCode.cs b/Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs
similarity index 95%
rename from Ryujinx.HLE/HOS/Services/Ldr/ResultCode.cs
rename to Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs
index 8bef26b59e..4746ecc596 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/ResultCode.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
{
enum ResultCode
{
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/Types/NroInfo.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs
similarity index 96%
rename from Ryujinx.HLE/HOS/Services/Ldr/Types/NroInfo.cs
rename to Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs
index c65d54134e..a71d4c0829 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/Types/NroInfo.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs
@@ -1,6 +1,6 @@
using Ryujinx.HLE.Loaders.Executables;
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
{
class NroInfo
{
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/Types/NrrHeader.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs
similarity index 94%
rename from Ryujinx.HLE/HOS/Services/Ldr/Types/NrrHeader.cs
rename to Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs
index a0764d1fd5..1521719666 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/Types/NrrHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
{
[StructLayout(LayoutKind.Explicit, Size = 0x350)]
unsafe struct NrrHeader
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/Types/NrrInfo.cs b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs
similarity index 91%
rename from Ryujinx.HLE/HOS/Services/Ldr/Types/NrrInfo.cs
rename to Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs
index 3636ce3397..2c60360a1f 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/Types/NrrInfo.cs
+++ b/Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Loader
{
class NrrInfo
{
diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs
index ab7bcaca96..bf201b988f 100644
--- a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Ldr
+namespace Ryujinx.HLE.HOS.Services.Nim
{
[Service("nim:ecas")] // 7.0.0+
class IShopServiceAccessSystemInterface : IpcService
diff --git a/Ryujinx.HLE/HOS/Services/Android/NvFlinger.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/NvFlinger.cs
similarity index 99%
rename from Ryujinx.HLE/HOS/Services/Android/NvFlinger.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/NvFlinger.cs
index 63df78e5e5..e3e4a1a453 100644
--- a/Ryujinx.HLE/HOS/Services/Android/NvFlinger.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/NvFlinger.cs
@@ -11,9 +11,9 @@ using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
-using static Ryujinx.HLE.HOS.Services.Android.Parcel;
+using static Ryujinx.HLE.HOS.Services.SurfaceFlinger.Parcel;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
class NvFlinger : IDisposable
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Parcel.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Parcel.cs
similarity index 96%
rename from Ryujinx.HLE/HOS/Services/Android/Parcel.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Parcel.cs
index 63c5a82ff3..f5d934232e 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Parcel.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Parcel.cs
@@ -1,7 +1,7 @@
using System;
using System.IO;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
static class Parcel
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/BufferEntry.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferEntry.cs
similarity index 76%
rename from Ryujinx.HLE/HOS/Services/Android/Types/BufferEntry.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferEntry.cs
index 91744859b1..cc4e07d9be 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/BufferEntry.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferEntry.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
struct BufferEntry
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/BufferState.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferState.cs
similarity index 65%
rename from Ryujinx.HLE/HOS/Services/Android/Types/BufferState.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferState.cs
index e79d5d8f77..673da86013 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/BufferState.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferState.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
enum BufferState
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorBytePerPixel.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorBytePerPixel.cs
similarity index 83%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorBytePerPixel.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorBytePerPixel.cs
index a937f15fc9..b47d35b47c 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorBytePerPixel.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorBytePerPixel.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
enum ColorBytePerPixel
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorComponent.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorComponent.cs
similarity index 98%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorComponent.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorComponent.cs
index 7ea20df719..e9669f1299 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorComponent.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorComponent.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
enum ColorComponent : uint
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorDataType.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorDataType.cs
similarity index 76%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorDataType.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorDataType.cs
index c380cb1b72..cfa3b018cf 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorDataType.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorDataType.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
enum ColorDataType
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorFormat.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorFormat.cs
similarity index 99%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorFormat.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorFormat.cs
index 1aed4d5827..227d648ac7 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorFormat.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorFormat.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
enum ColorFormat : ulong
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorShift.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorShift.cs
similarity index 78%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorShift.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorShift.cs
index 827e044538..3ad216a8eb 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorShift.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorShift.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
class ColorShift
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSpace.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSpace.cs
similarity index 95%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSpace.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSpace.cs
index 6ee6f428b1..9003a00ba3 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSpace.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSpace.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
enum ColorSpace : ulong
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSwizzle.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSwizzle.cs
similarity index 95%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSwizzle.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSwizzle.cs
index f82d5a565d..4c1370c713 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Color/ColorSwizzle.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSwizzle.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
enum ColorSwizzle
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Fence.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs
similarity index 77%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Fence.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs
index a09b7948a3..356a123227 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Fence.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[StructLayout(LayoutKind.Sequential, Size = 0x8)]
struct Fence
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/GbpBuffer.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GbpBuffer.cs
similarity index 95%
rename from Ryujinx.HLE/HOS/Services/Android/Types/GbpBuffer.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GbpBuffer.cs
index 766806f039..b93947fdec 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/GbpBuffer.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GbpBuffer.cs
@@ -3,7 +3,7 @@ using System;
using System.IO;
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
struct GbpBuffer
{
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/GraphicBufferHeader.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GraphicBufferHeader.cs
similarity index 89%
rename from Ryujinx.HLE/HOS/Services/Android/Types/GraphicBufferHeader.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GraphicBufferHeader.cs
index d82523dbcb..fae0002f5b 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/GraphicBufferHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GraphicBufferHeader.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[StructLayout(LayoutKind.Sequential, Size = 0x28)]
struct GraphicBufferHeader
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/HalTransform.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/HalTransform.cs
similarity index 81%
rename from Ryujinx.HLE/HOS/Services/Android/Types/HalTransform.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/HalTransform.cs
index fd2710635d..a1efed0bc3 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/HalTransform.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/HalTransform.cs
@@ -1,6 +1,6 @@
using System;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[Flags]
enum HalTransform
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/MultiFence.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs
similarity index 89%
rename from Ryujinx.HLE/HOS/Services/Android/Types/MultiFence.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs
index a50eea892b..97ad3e20d3 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/MultiFence.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[StructLayout(LayoutKind.Explicit, Size = 0x24)]
struct MultiFence
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBuffer.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBuffer.cs
similarity index 94%
rename from Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBuffer.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBuffer.cs
index 90c449975e..9a52245cf4 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBuffer.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBuffer.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[StructLayout(LayoutKind.Explicit, Size = 0x144)]
struct NvGraphicBuffer
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurface.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurface.cs
similarity index 94%
rename from Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurface.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurface.cs
index d5dd682c80..e084bc73ef 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurface.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurface.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[StructLayout(LayoutKind.Explicit, Size = 0x58)]
struct NvGraphicBufferSurface
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurfaceArray.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurfaceArray.cs
similarity index 94%
rename from Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurfaceArray.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurfaceArray.cs
index be2855ffcb..7327b5598c 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/NvGraphicBufferSurfaceArray.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurfaceArray.cs
@@ -1,7 +1,7 @@
using System;
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[StructLayout(LayoutKind.Explicit)]
struct NvGraphicBufferSurfaceArray
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/QueueBufferObject.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/QueueBufferObject.cs
similarity index 93%
rename from Ryujinx.HLE/HOS/Services/Android/Types/QueueBufferObject.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/QueueBufferObject.cs
index 4112da0753..684f856a91 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/QueueBufferObject.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/QueueBufferObject.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[StructLayout(LayoutKind.Explicit)]
struct QueueBufferObject
diff --git a/Ryujinx.HLE/HOS/Services/Android/Types/Rect.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Rect.cs
similarity index 82%
rename from Ryujinx.HLE/HOS/Services/Android/Types/Rect.cs
rename to Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Rect.cs
index abe81abd3a..c2f51eeaf8 100644
--- a/Ryujinx.HLE/HOS/Services/Android/Types/Rect.cs
+++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Rect.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Ryujinx.HLE.HOS.Services.Android
+namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{
[StructLayout(LayoutKind.Sequential, Size = 0x10)]
struct Rect
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs
index 3ac1c27052..3364ce7045 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs
@@ -2,7 +2,7 @@ using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.HLE.HOS.Services.Android;
+using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
using System;
namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
index fba250544d..a2b57e7487 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
@@ -6,7 +6,7 @@ using System;
using System.IO;
using System.Text;
-using static Ryujinx.HLE.HOS.Services.Android.Parcel;
+using static Ryujinx.HLE.HOS.Services.SurfaceFlinger.Parcel;
namespace Ryujinx.HLE.HOS.Services.Vi.RootService
{