From b29950dbd6657f6f6511bc2df2efc4b0ff40e8b9 Mon Sep 17 00:00:00 2001
From: Thomas Guillemard <me@thog.eu>
Date: Sun, 3 Nov 2019 18:26:29 +0100
Subject: [PATCH] hle: Fix some inconsistencies in namespace naming in Services
 (#808)

Also fix IShopServiceAccessSystemInterface being in the wrong namespace.
---
 .../{Btm => BluetoothManager}/BtmUser/IBtmUserCore.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/{Btm => BluetoothManager}/IBtm.cs    | 2 +-
 .../HOS/Services/{Btm => BluetoothManager}/IBtmDebug.cs       | 2 +-
 .../HOS/Services/{Btm => BluetoothManager}/IBtmSystem.cs      | 2 +-
 .../HOS/Services/{Btm => BluetoothManager}/IBtmUser.cs        | 4 ++--
 .../HOS/Services/{Btm => BluetoothManager}/ResultCode.cs      | 2 +-
 .../HOS/Services/{Ldr => Loader}/IDebugMonitorInterface.cs    | 2 +-
 .../HOS/Services/{Ldr => Loader}/IProcessManagerInterface.cs  | 2 +-
 Ryujinx.HLE/HOS/Services/{Ldr => Loader}/IRoInterface.cs      | 2 +-
 Ryujinx.HLE/HOS/Services/{Ldr => Loader}/IShellInterface.cs   | 2 +-
 Ryujinx.HLE/HOS/Services/{Ldr => Loader}/ResultCode.cs        | 2 +-
 Ryujinx.HLE/HOS/Services/{Ldr => Loader}/Types/NroInfo.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/{Ldr => Loader}/Types/NrrHeader.cs   | 2 +-
 Ryujinx.HLE/HOS/Services/{Ldr => Loader}/Types/NrrInfo.cs     | 2 +-
 .../HOS/Services/Nim/IShopServiceAccessSystemInterface.cs     | 2 +-
 .../HOS/Services/{Android => SurfaceFlinger}/NvFlinger.cs     | 4 ++--
 .../HOS/Services/{Android => SurfaceFlinger}/Parcel.cs        | 2 +-
 .../Services/{Android => SurfaceFlinger}/Types/BufferEntry.cs | 2 +-
 .../Services/{Android => SurfaceFlinger}/Types/BufferState.cs | 2 +-
 .../Types/Color/ColorBytePerPixel.cs                          | 2 +-
 .../{Android => SurfaceFlinger}/Types/Color/ColorComponent.cs | 2 +-
 .../{Android => SurfaceFlinger}/Types/Color/ColorDataType.cs  | 2 +-
 .../{Android => SurfaceFlinger}/Types/Color/ColorFormat.cs    | 2 +-
 .../{Android => SurfaceFlinger}/Types/Color/ColorShift.cs     | 2 +-
 .../{Android => SurfaceFlinger}/Types/Color/ColorSpace.cs     | 2 +-
 .../{Android => SurfaceFlinger}/Types/Color/ColorSwizzle.cs   | 2 +-
 .../HOS/Services/{Android => SurfaceFlinger}/Types/Fence.cs   | 2 +-
 .../Services/{Android => SurfaceFlinger}/Types/GbpBuffer.cs   | 2 +-
 .../{Android => SurfaceFlinger}/Types/GraphicBufferHeader.cs  | 2 +-
 .../{Android => SurfaceFlinger}/Types/HalTransform.cs         | 2 +-
 .../Services/{Android => SurfaceFlinger}/Types/MultiFence.cs  | 2 +-
 .../{Android => SurfaceFlinger}/Types/NvGraphicBuffer.cs      | 2 +-
 .../Types/NvGraphicBufferSurface.cs                           | 2 +-
 .../Types/NvGraphicBufferSurfaceArray.cs                      | 2 +-
 .../{Android => SurfaceFlinger}/Types/QueueBufferObject.cs    | 2 +-
 .../HOS/Services/{Android => SurfaceFlinger}/Types/Rect.cs    | 2 +-
 .../RootService/ApplicationDisplayService/IHOSBinderDriver.cs | 2 +-
 .../HOS/Services/Vi/RootService/IApplicationDisplayService.cs | 2 +-
 38 files changed, 40 insertions(+), 40 deletions(-)
 rename Ryujinx.HLE/HOS/Services/{Btm => BluetoothManager}/BtmUser/IBtmUserCore.cs (98%)
 rename Ryujinx.HLE/HOS/Services/{Btm => BluetoothManager}/IBtm.cs (66%)
 rename Ryujinx.HLE/HOS/Services/{Btm => BluetoothManager}/IBtmDebug.cs (68%)
 rename Ryujinx.HLE/HOS/Services/{Btm => BluetoothManager}/IBtmSystem.cs (69%)
 rename Ryujinx.HLE/HOS/Services/{Btm => BluetoothManager}/IBtmUser.cs (77%)
 rename Ryujinx.HLE/HOS/Services/{Btm => BluetoothManager}/ResultCode.cs (67%)
 rename Ryujinx.HLE/HOS/Services/{Ldr => Loader}/IDebugMonitorInterface.cs (76%)
 rename Ryujinx.HLE/HOS/Services/{Ldr => Loader}/IProcessManagerInterface.cs (77%)
 rename Ryujinx.HLE/HOS/Services/{Ldr => Loader}/IRoInterface.cs (99%)
 rename Ryujinx.HLE/HOS/Services/{Ldr => Loader}/IShellInterface.cs (75%)
 rename Ryujinx.HLE/HOS/Services/{Ldr => Loader}/ResultCode.cs (95%)
 rename Ryujinx.HLE/HOS/Services/{Ldr => Loader}/Types/NroInfo.cs (96%)
 rename Ryujinx.HLE/HOS/Services/{Ldr => Loader}/Types/NrrHeader.cs (94%)
 rename Ryujinx.HLE/HOS/Services/{Ldr => Loader}/Types/NrrInfo.cs (91%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/NvFlinger.cs (99%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Parcel.cs (96%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/BufferEntry.cs (76%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/BufferState.cs (65%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Color/ColorBytePerPixel.cs (83%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Color/ColorComponent.cs (98%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Color/ColorDataType.cs (76%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Color/ColorFormat.cs (99%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Color/ColorShift.cs (78%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Color/ColorSpace.cs (95%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Color/ColorSwizzle.cs (95%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Fence.cs (77%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/GbpBuffer.cs (95%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/GraphicBufferHeader.cs (89%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/HalTransform.cs (81%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/MultiFence.cs (89%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/NvGraphicBuffer.cs (94%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/NvGraphicBufferSurface.cs (94%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/NvGraphicBufferSurfaceArray.cs (94%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/QueueBufferObject.cs (93%)
 rename Ryujinx.HLE/HOS/Services/{Android => SurfaceFlinger}/Types/Rect.cs (82%)

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 0ab9a3ef1..47fdb88f7 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 947fee14c..48a273a09 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 a55b7da87..259698af5 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 9120762ca..c4210b782 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 68694187b..b704b51ca 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 b222fdc88..0ad2c4855 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 d87234da5..82b24a35c 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 9f5b5e357..2ecde2ade 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 b5ef0f07e..3d58594b0 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 856aec521..362f82f03 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 8bef26b59..4746ecc59 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 c65d54134..a71d4c082 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 a0764d1fd..152171966 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 3636ce339..2c60360a1 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 ab7bcaca9..bf201b988 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 63df78e5e..e3e4a1a45 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 63c5a82ff..f5d934232 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 91744859b..cc4e07d9b 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 e79d5d8f7..673da8601 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 a937f15fc..b47d35b47 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 7ea20df71..e9669f129 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 c380cb1b7..cfa3b018c 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 1aed4d582..227d648ac 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 827e04453..3ad216a8e 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 6ee6f428b..9003a00ba 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 f82d5a565..4c1370c71 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 a09b7948a..356a12322 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 766806f03..b93947fde 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 d82523dbc..fae0002f5 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 fd2710635..a1efed0bc 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 a50eea892..97ad3e20d 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 90c449975..9a52245cf 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 d5dd682c8..e084bc73e 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 be2855ffc..7327b5598 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 4112da075..684f856a9 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 abe81abd3..c2f51eeaf 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 3ac1c2705..3364ce704 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 fba250544..a2b57e748 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
 {