From 80574ce8b98447869a4eebb74171e491b8ac41c7 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Sat, 21 Oct 2023 10:31:20 -0400
Subject: [PATCH] Adjust namespaces

---
 src/Ryujinx.Horizon/Am/Ipc/Controllers/AudioController.cs      | 1 +
 src/Ryujinx.Horizon/Am/Ipc/Controllers/CommonStateGetter.cs    | 1 +
 src/Ryujinx.Horizon/Am/Ipc/Controllers/SelfController.cs       | 1 +
 src/Ryujinx.Horizon/Am/Ipc/Controllers/WindowController.cs     | 1 +
 src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs         | 2 ++
 src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs       | 2 ++
 src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs       | 2 ++
 src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs        | 2 ++
 src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs                   | 2 ++
 .../Sdk/Am/{ => Controllers}/IAllSystemAppletProxiesService.cs | 3 ++-
 .../Sdk/Am/{ => Controllers}/IAudioController.cs               | 2 +-
 .../Sdk/Am/{ => Controllers}/ICommonStateGetter.cs             | 2 +-
 .../Sdk/Am/{ => Controllers}/ISelfController.cs                | 2 +-
 .../Sdk/Am/{ => Controllers}/IWindowController.cs              | 2 +-
 src/Ryujinx.Horizon/Sdk/Am/{ => Proxies}/IApplicationProxy.cs  | 3 ++-
 .../Sdk/Am/{ => Proxies}/ILibraryAppletProxy.cs                | 3 ++-
 .../Sdk/Am/{ => Proxies}/IOverlayAppletProxy.cs                | 3 ++-
 src/Ryujinx.Horizon/Sdk/Am/{ => Proxies}/ISystemAppletProxy.cs | 3 ++-
 18 files changed, 28 insertions(+), 9 deletions(-)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Controllers}/IAllSystemAppletProxiesService.cs (89%)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Controllers}/IAudioController.cs (91%)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Controllers}/ICommonStateGetter.cs (98%)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Controllers}/ISelfController.cs (98%)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Controllers}/IWindowController.cs (91%)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Proxies}/IApplicationProxy.cs (87%)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Proxies}/ILibraryAppletProxy.cs (89%)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Proxies}/IOverlayAppletProxy.cs (89%)
 rename src/Ryujinx.Horizon/Sdk/Am/{ => Proxies}/ISystemAppletProxy.cs (89%)

diff --git a/src/Ryujinx.Horizon/Am/Ipc/Controllers/AudioController.cs b/src/Ryujinx.Horizon/Am/Ipc/Controllers/AudioController.cs
index ab4f6c6302..e95a85b544 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Controllers/AudioController.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Controllers/AudioController.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc.Controllers
diff --git a/src/Ryujinx.Horizon/Am/Ipc/Controllers/CommonStateGetter.cs b/src/Ryujinx.Horizon/Am/Ipc/Controllers/CommonStateGetter.cs
index cb8d784a27..ec34a355bb 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Controllers/CommonStateGetter.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Controllers/CommonStateGetter.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc.Controllers
diff --git a/src/Ryujinx.Horizon/Am/Ipc/Controllers/SelfController.cs b/src/Ryujinx.Horizon/Am/Ipc/Controllers/SelfController.cs
index d830b980e2..dd1b9314f2 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Controllers/SelfController.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Controllers/SelfController.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc.Controllers
diff --git a/src/Ryujinx.Horizon/Am/Ipc/Controllers/WindowController.cs b/src/Ryujinx.Horizon/Am/Ipc/Controllers/WindowController.cs
index 193ed75e48..6bc436e709 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Controllers/WindowController.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Controllers/WindowController.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc.Controllers
diff --git a/src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs b/src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs
index e05229517f..9f56243e6a 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Proxies/ApplicationProxy.cs
@@ -1,6 +1,8 @@
 using Ryujinx.Horizon.Am.Ipc.Controllers;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Am.Proxies;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc.Proxies
diff --git a/src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs b/src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs
index 2cc7434c8e..239b71e298 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Proxies/LibraryAppletProxy.cs
@@ -1,6 +1,8 @@
 using Ryujinx.Horizon.Am.Ipc.Controllers;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Am.Proxies;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc.Proxies
diff --git a/src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs b/src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs
index 1622d93ea6..50ade98d06 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Proxies/OverlayAppletProxy.cs
@@ -1,6 +1,8 @@
 using Ryujinx.Horizon.Am.Ipc.Controllers;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Am.Proxies;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc.Proxies
diff --git a/src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs b/src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs
index d031568252..7e2ecc73a4 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Proxies/SystemAppletProxy.cs
@@ -1,6 +1,8 @@
 using Ryujinx.Horizon.Am.Ipc.Controllers;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Am.Proxies;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc.Proxies
diff --git a/src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs b/src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs
index 2fdb7dd872..3264d77da1 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/ProxiesService.cs
@@ -3,6 +3,8 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Horizon.Am.Ipc.Proxies;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Am.Proxies;
 using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Am.Ipc
diff --git a/src/Ryujinx.Horizon/Sdk/Am/IAllSystemAppletProxiesService.cs b/src/Ryujinx.Horizon/Sdk/Am/Controllers/IAllSystemAppletProxiesService.cs
similarity index 89%
rename from src/Ryujinx.Horizon/Sdk/Am/IAllSystemAppletProxiesService.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Controllers/IAllSystemAppletProxiesService.cs
index 2ce1c6b507..e9146dfce0 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/IAllSystemAppletProxiesService.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Controllers/IAllSystemAppletProxiesService.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Am.Proxies;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
     public interface IAllSystemAppletProxiesService
     {
diff --git a/src/Ryujinx.Horizon/Sdk/Am/IAudioController.cs b/src/Ryujinx.Horizon/Sdk/Am/Controllers/IAudioController.cs
similarity index 91%
rename from src/Ryujinx.Horizon/Sdk/Am/IAudioController.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Controllers/IAudioController.cs
index 1ef3f01114..a480e16b2f 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/IAudioController.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Controllers/IAudioController.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Horizon.Common;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
     public interface IAudioController
     {
diff --git a/src/Ryujinx.Horizon/Sdk/Am/ICommonStateGetter.cs b/src/Ryujinx.Horizon/Sdk/Am/Controllers/ICommonStateGetter.cs
similarity index 98%
rename from src/Ryujinx.Horizon/Sdk/Am/ICommonStateGetter.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Controllers/ICommonStateGetter.cs
index 914714f5fb..d24cc7efc7 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/ICommonStateGetter.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Controllers/ICommonStateGetter.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Horizon.Common;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
     public interface ICommonStateGetter
     {
diff --git a/src/Ryujinx.Horizon/Sdk/Am/ISelfController.cs b/src/Ryujinx.Horizon/Sdk/Am/Controllers/ISelfController.cs
similarity index 98%
rename from src/Ryujinx.Horizon/Sdk/Am/ISelfController.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Controllers/ISelfController.cs
index 18c84c0bad..83fa9299ca 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/ISelfController.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Controllers/ISelfController.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Horizon.Common;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
     public interface ISelfController
     {
diff --git a/src/Ryujinx.Horizon/Sdk/Am/IWindowController.cs b/src/Ryujinx.Horizon/Sdk/Am/Controllers/IWindowController.cs
similarity index 91%
rename from src/Ryujinx.Horizon/Sdk/Am/IWindowController.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Controllers/IWindowController.cs
index 82c7a2002e..8652d5c13d 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/IWindowController.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Controllers/IWindowController.cs
@@ -1,7 +1,7 @@
 using Ryujinx.Horizon.Common;
 using System;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
     public interface IWindowController
     {
diff --git a/src/Ryujinx.Horizon/Sdk/Am/IApplicationProxy.cs b/src/Ryujinx.Horizon/Sdk/Am/Proxies/IApplicationProxy.cs
similarity index 87%
rename from src/Ryujinx.Horizon/Sdk/Am/IApplicationProxy.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Proxies/IApplicationProxy.cs
index 10f9a79b30..bb93914202 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/IApplicationProxy.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Proxies/IApplicationProxy.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Proxies
 {
     public interface IApplicationProxy
     {
diff --git a/src/Ryujinx.Horizon/Sdk/Am/ILibraryAppletProxy.cs b/src/Ryujinx.Horizon/Sdk/Am/Proxies/ILibraryAppletProxy.cs
similarity index 89%
rename from src/Ryujinx.Horizon/Sdk/Am/ILibraryAppletProxy.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Proxies/ILibraryAppletProxy.cs
index 0efca6d2f2..b7a374f6af 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/ILibraryAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Proxies/ILibraryAppletProxy.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Proxies
 {
     public interface ILibraryAppletProxy
     {
diff --git a/src/Ryujinx.Horizon/Sdk/Am/IOverlayAppletProxy.cs b/src/Ryujinx.Horizon/Sdk/Am/Proxies/IOverlayAppletProxy.cs
similarity index 89%
rename from src/Ryujinx.Horizon/Sdk/Am/IOverlayAppletProxy.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Proxies/IOverlayAppletProxy.cs
index 7f06323212..b30eed42ad 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/IOverlayAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Proxies/IOverlayAppletProxy.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Proxies
 {
     public interface IOverlayAppletProxy
     {
diff --git a/src/Ryujinx.Horizon/Sdk/Am/ISystemAppletProxy.cs b/src/Ryujinx.Horizon/Sdk/Am/Proxies/ISystemAppletProxy.cs
similarity index 89%
rename from src/Ryujinx.Horizon/Sdk/Am/ISystemAppletProxy.cs
rename to src/Ryujinx.Horizon/Sdk/Am/Proxies/ISystemAppletProxy.cs
index a0d632c3bf..80c39ebed5 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/ISystemAppletProxy.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Proxies/ISystemAppletProxy.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Am.Controllers;
 
-namespace Ryujinx.Horizon.Sdk.Am
+namespace Ryujinx.Horizon.Sdk.Am.Proxies
 {
     public interface ISystemAppletProxy
     {