Rename IpcServices -> Services

ChocolArm64/Translation/ILGeneratorEx.cs

@@ -3,7 +3,7 @@ using System;
 namespace ChocolArm64
 {
     using System.Reflection.Emit;
-    
+
     static class ILGeneratorEx
     {
         public static void EmitLdc_I4(this ILGenerator Generator,int Value)

Ryujinx.Core/OsHle/AppletStateMgr.cs

@@ -1,5 +1,5 @@
-using Ryujinx.Core.OsHle.IpcServices.Am;
 using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.Core.OsHle.Services.Am;
 using System;
 using System.Collections.Concurrent;
 

Ryujinx.Core/OsHle/Handles/KSession.cs

@@ -1,4 +1,4 @@
-using Ryujinx.Core.OsHle.IpcServices;
+using Ryujinx.Core.OsHle.Services;
 using System;
 
 namespace Ryujinx.Core.OsHle.Handles

Ryujinx.Core/OsHle/Process.cs

@@ -5,7 +5,7 @@ using Ryujinx.Core.Loaders;
 using Ryujinx.Core.Loaders.Executables;
 using Ryujinx.Core.OsHle.Exceptions;
 using Ryujinx.Core.OsHle.Handles;
-using Ryujinx.Core.OsHle.IpcServices.NvServices;
+using Ryujinx.Core.OsHle.Services.Nv;
 using Ryujinx.Core.OsHle.Svc;
 using System;
 using System.Collections.Concurrent;

Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Acc
+namespace Ryujinx.Core.OsHle.Services.Acc
 {
     class IManagerForApplication : IpcService
     {

Ryujinx.Core/OsHle/Services/Acc/IProfile.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Acc
+namespace Ryujinx.Core.OsHle.Services.Acc
 {
     class IProfile : IpcService
     {

Ryujinx.Core/OsHle/Services/Acc/ServiceAcc.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Acc
+namespace Ryujinx.Core.OsHle.Services.Acc
 {
     class ServiceAcc : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/AmErr.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     static class AmErr
     {

Ryujinx.Core/OsHle/Services/Am/FocusState.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     enum FocusState
     {

Ryujinx.Core/OsHle/Services/Am/IApplicationFunctions.cs

@@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class IApplicationFunctions : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/IApplicationProxy.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class IApplicationProxy : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/IAudioController.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class IAudioController : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/ICommonStateGetter.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 using static Ryujinx.Core.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class ICommonStateGetter : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/IDebugFunctions.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class IDebugFunctions : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/IDisplayController.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class IDisplayController : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/ILibraryAppletCreator.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class ILibraryAppletCreator : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/ISelfController.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class ISelfController : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/IStorage.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class IStorage : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/IStorageAccessor.cs

@@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class IStorageAccessor : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/IWindowController.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class IWindowController : IpcService
     {

Ryujinx.Core/OsHle/Services/Am/MessageInfo.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     enum MessageInfo
     {

Ryujinx.Core/OsHle/Services/Am/OperationMode.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     enum OperationMode
     {

Ryujinx.Core/OsHle/Services/Am/ServiceAppletOE.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Am
+namespace Ryujinx.Core.OsHle.Services.Am
 {
     class ServiceAppletOE : IpcService
     {

Ryujinx.Core/OsHle/Services/Apm/ISession.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Apm
+namespace Ryujinx.Core.OsHle.Services.Apm
 {
     class ISession : IpcService
     {

Ryujinx.Core/OsHle/Services/Apm/ServiceApm.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Apm
+namespace Ryujinx.Core.OsHle.Services.Apm
 {
     class ServiceApm : IpcService
     {

Ryujinx.Core/OsHle/Services/Aud/AudioOutData.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Aud
+namespace Ryujinx.Core.OsHle.Services.Aud
 {
     [StructLayout(LayoutKind.Sequential)]
     struct AudioOutData

Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs

@@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Aud
+namespace Ryujinx.Core.OsHle.Services.Aud
 {
     class IAudioDevice : IpcService
     {

Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs

@@ -5,7 +5,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Aud
+namespace Ryujinx.Core.OsHle.Services.Aud
 {
     class IAudioOut : IpcService, IDisposable
     {

Ryujinx.Core/OsHle/Services/Aud/IAudioRenderer.cs

@@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Aud
+namespace Ryujinx.Core.OsHle.Services.Aud
 {
     class IAudioRenderer : IpcService, IDisposable
     {

Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs

@@ -5,7 +5,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Aud
+namespace Ryujinx.Core.OsHle.Services.Aud
 {
     class ServiceAudOut : IpcService
     {

Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Aud
+namespace Ryujinx.Core.OsHle.Services.Aud
 {
     class ServiceAudRen : IpcService
     {

Ryujinx.Core/OsHle/Services/Bsd/ServiceBsd.cs

@@ -8,7 +8,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Bsd
+namespace Ryujinx.Core.OsHle.Services.Bsd
 {
 
     //bsd_errno == (SocketException.ErrorCode - 10000)

Ryujinx.Core/OsHle/Services/Friend/IFriendService.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Friend
+namespace Ryujinx.Core.OsHle.Services.Friend
 {
     class IFriendService : IpcService
     {

Ryujinx.Core/OsHle/Services/Friend/ServiceFriend.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Friend
+namespace Ryujinx.Core.OsHle.Services.Friend
 {
     class ServiceFriend : IpcService
     {

Ryujinx.Core/OsHle/Services/FspSrv/FsErr.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.FspSrv
+namespace Ryujinx.Core.OsHle.Services.FspSrv
 {
     static class FsErr
     {

Ryujinx.Core/OsHle/Services/FspSrv/IDirectory.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace Ryujinx.Core.OsHle.IpcServices.FspSrv
+namespace Ryujinx.Core.OsHle.Services.FspSrv
 {
     class IDirectory : IpcService, IDisposable
     {

Ryujinx.Core/OsHle/Services/FspSrv/IFile.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.IpcServices.FspSrv
+namespace Ryujinx.Core.OsHle.Services.FspSrv
 {
     class IFile : IpcService, IDisposable
     {

Ryujinx.Core/OsHle/Services/FspSrv/IFileSystem.cs

@@ -6,7 +6,7 @@ using System.Text;
 
 using static Ryujinx.Core.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.IpcServices.FspSrv
+namespace Ryujinx.Core.OsHle.Services.FspSrv
 {
     class IFileSystem : IpcService
     {

Ryujinx.Core/OsHle/Services/FspSrv/IStorage.cs

@@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.IpcServices.FspSrv
+namespace Ryujinx.Core.OsHle.Services.FspSrv
 {
     class IStorage : IpcService
     {

Ryujinx.Core/OsHle/Services/FspSrv/ServiceFspSrv.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.FspSrv
+namespace Ryujinx.Core.OsHle.Services.FspSrv
 {
     class ServiceFspSrv : IpcService
     {

Ryujinx.Core/OsHle/Services/Hid/IActiveVibrationDeviceList.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Hid
+namespace Ryujinx.Core.OsHle.Services.Hid
 {
     class IActiveApplicationDeviceList : IpcService
     {

Ryujinx.Core/OsHle/Services/Hid/IAppletResource.cs

@@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Handles;
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Hid
+namespace Ryujinx.Core.OsHle.Services.Hid
 {
     class IAppletResource : IpcService
     {

Ryujinx.Core/OsHle/Services/Hid/ServiceHid.cs

@@ -1,8 +1,8 @@
+using Ryujinx.Core.Input;
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
-using Ryujinx.Core.Input;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Hid
+namespace Ryujinx.Core.OsHle.Services.Hid
 {
     class ServiceHid : IpcService
     {

Ryujinx.Core/OsHle/Services/IIpcService.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices
+namespace Ryujinx.Core.OsHle.Services
 {
     interface IIpcService
     {

Ryujinx.Core/OsHle/Services/IpcService.cs

@@ -1,10 +1,10 @@
-using Ryujinx.Core.OsHle.Ipc;
 using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.Core.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.IpcServices
+namespace Ryujinx.Core.OsHle.Services
 {
     abstract class IpcService : IIpcService
     {

Ryujinx.Core/OsHle/Services/Lm/ILogger.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Lm
+namespace Ryujinx.Core.OsHle.Services.Lm
 {
     class ILogger : IpcService
     {

Ryujinx.Core/OsHle/Services/Lm/ServiceLm.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Lm
+namespace Ryujinx.Core.OsHle.Services.Lm
 {
     class ServiceLm : IpcService
     {

Ryujinx.Core/OsHle/Services/Nifm/IGeneralService.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Nifm
+namespace Ryujinx.Core.OsHle.Services.Nifm
 {
     class IGeneralService : IpcService
     {

Ryujinx.Core/OsHle/Services/Nifm/IRequest.cs

@@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Nifm
+namespace Ryujinx.Core.OsHle.Services.Nifm
 {
     class IRequest : IpcService, IDisposable
     {

Ryujinx.Core/OsHle/Services/Nifm/ServiceNifm.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Nifm
+namespace Ryujinx.Core.OsHle.Services.Nifm
 {
     class ServiceNifm : IpcService
     {

Ryujinx.Core/OsHle/Services/Ns/ServiceNs.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Ns
+namespace Ryujinx.Core.OsHle.Services.Ns
 {
     class ServiceNs : IpcService
     {

Ryujinx.Core/OsHle/Services/Nv/NvFd.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.NvServices
+namespace Ryujinx.Core.OsHle.Services.Nv
 {
     class NvFd
     {

Ryujinx.Core/OsHle/Services/Nv/NvMap.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.NvServices
+namespace Ryujinx.Core.OsHle.Services.Nv
 {
     class NvMap
     {

Ryujinx.Core/OsHle/Services/Nv/NvMapFb.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.NvServices
+namespace Ryujinx.Core.OsHle.Services.Nv
 {
     class NvMapFb
     {

Ryujinx.Core/OsHle/Services/Nv/ServiceNvDrv.cs

@@ -6,7 +6,7 @@ using Ryujinx.Graphics.Gpu;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.NvServices
+namespace Ryujinx.Core.OsHle.Services.Nv
 {
     class ServiceNvDrv : IpcService, IDisposable
     {

Ryujinx.Core/OsHle/Services/Pctl/IParentalControlService.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Pctl
+namespace Ryujinx.Core.OsHle.Services.Pctl
 {
     class IParentalControlService : IpcService
     {

Ryujinx.Core/OsHle/Services/Pctl/ServicePctl.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Pctl
+namespace Ryujinx.Core.OsHle.Services.Pctl
 {
     class ServicePctl : IpcService
     {

Ryujinx.Core/OsHle/Services/Pl/ServicePl.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Pl
+namespace Ryujinx.Core.OsHle.Services.Pl
 {
     class ServicePl : IpcService
     {

Ryujinx.Core/OsHle/Services/Pl/SharedFontType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.Pl
+namespace Ryujinx.Core.OsHle.Services.Pl
 {
     enum SharedFontType
     {

Ryujinx.Core/OsHle/Services/ServiceFactory.cs

@@ -1,26 +1,26 @@
-using Ryujinx.Core.OsHle.IpcServices.Acc;
-using Ryujinx.Core.OsHle.IpcServices.Am;
-using Ryujinx.Core.OsHle.IpcServices.Apm;
-using Ryujinx.Core.OsHle.IpcServices.Aud;
-using Ryujinx.Core.OsHle.IpcServices.Bsd;
-using Ryujinx.Core.OsHle.IpcServices.Friend;
-using Ryujinx.Core.OsHle.IpcServices.FspSrv;
-using Ryujinx.Core.OsHle.IpcServices.Hid;
-using Ryujinx.Core.OsHle.IpcServices.Lm;
-using Ryujinx.Core.OsHle.IpcServices.Nifm;
-using Ryujinx.Core.OsHle.IpcServices.Ns;
-using Ryujinx.Core.OsHle.IpcServices.NvServices;
-using Ryujinx.Core.OsHle.IpcServices.Pctl;
-using Ryujinx.Core.OsHle.IpcServices.Pl;
-using Ryujinx.Core.OsHle.IpcServices.Set;
-using Ryujinx.Core.OsHle.IpcServices.Sfdnsres;
-using Ryujinx.Core.OsHle.IpcServices.Sm;
-using Ryujinx.Core.OsHle.IpcServices.Ssl;
-using Ryujinx.Core.OsHle.IpcServices.Time;
-using Ryujinx.Core.OsHle.IpcServices.Vi;
+using Ryujinx.Core.OsHle.Services.Acc;
+using Ryujinx.Core.OsHle.Services.Am;
+using Ryujinx.Core.OsHle.Services.Apm;
+using Ryujinx.Core.OsHle.Services.Aud;
+using Ryujinx.Core.OsHle.Services.Bsd;
+using Ryujinx.Core.OsHle.Services.Friend;
+using Ryujinx.Core.OsHle.Services.FspSrv;
+using Ryujinx.Core.OsHle.Services.Hid;
+using Ryujinx.Core.OsHle.Services.Lm;
+using Ryujinx.Core.OsHle.Services.Nifm;
+using Ryujinx.Core.OsHle.Services.Ns;
+using Ryujinx.Core.OsHle.Services.Nv;
+using Ryujinx.Core.OsHle.Services.Pctl;
+using Ryujinx.Core.OsHle.Services.Pl;
+using Ryujinx.Core.OsHle.Services.Set;
+using Ryujinx.Core.OsHle.Services.Sfdnsres;
+using Ryujinx.Core.OsHle.Services.Sm;
+using Ryujinx.Core.OsHle.Services.Ssl;
+using Ryujinx.Core.OsHle.Services.Time;
+using Ryujinx.Core.OsHle.Services.Vi;
 using System;
 
-namespace Ryujinx.Core.OsHle.IpcServices
+namespace Ryujinx.Core.OsHle.Services
 {
     static class ServiceFactory
     {

Ryujinx.Core/OsHle/Services/Set/ServiceSet.cs

@@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Set
+namespace Ryujinx.Core.OsHle.Services.Set
 {
     class ServiceSet : IpcService
     {

Ryujinx.Core/OsHle/Services/Set/ServiceSetSys.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Set
+namespace Ryujinx.Core.OsHle.Services.Set
 {
     class ServiceSetSys : IpcService
     {

Ryujinx.Core/OsHle/Services/Sfdnsres/ServiceSfdnsres.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Sfdnsres
+namespace Ryujinx.Core.OsHle.Services.Sfdnsres
 {
     class ServiceSfdnsres : IpcService
     {

Ryujinx.Core/OsHle/Services/Sm/ServiceSm.cs

@@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Handles;
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Sm
+namespace Ryujinx.Core.OsHle.Services.Sm
 {
     class ServiceSm : IpcService
     {

Ryujinx.Core/OsHle/Services/Ssl/ServiceSsl.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Ssl
+namespace Ryujinx.Core.OsHle.Services.Ssl
 {
     class ServiceSsl : IpcService
     {

Ryujinx.Core/OsHle/Services/Time/ISteadyClock.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Time
+namespace Ryujinx.Core.OsHle.Services.Time
 {
     class ISteadyClock : IpcService
     {

Ryujinx.Core/OsHle/Services/Time/ISystemClock.cs

@@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Time
+namespace Ryujinx.Core.OsHle.Services.Time
 {
     class ISystemClock : IpcService
     {

Ryujinx.Core/OsHle/Services/Time/ITimeZoneService.cs

@@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Time
+namespace Ryujinx.Core.OsHle.Services.Time
 {
     class ITimeZoneService : IpcService
     {

Ryujinx.Core/OsHle/Services/Time/ServiceTime.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Time
+namespace Ryujinx.Core.OsHle.Services.Time
 {
     class ServiceTime : IpcService
     {

Ryujinx.Core/OsHle/Services/Time/SystemClockType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.Time
+namespace Ryujinx.Core.OsHle.Services.Time
 {
     enum SystemClockType
     {

Ryujinx.Core/OsHle/Services/Vi/Display.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.IpcServices.Vi
+namespace Ryujinx.Core.OsHle.Services.Vi
 {
     class Display
     {

Ryujinx.Core/OsHle/Services/Vi/GbpBuffer.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Android
+namespace Ryujinx.Core.OsHle.Services.Android
 {
     struct GbpBuffer
     {

Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs

@@ -3,9 +3,9 @@ using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 using System.IO;
 
-using static Ryujinx.Core.OsHle.IpcServices.Android.Parcel;
+using static Ryujinx.Core.OsHle.Services.Android.Parcel;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Vi
+namespace Ryujinx.Core.OsHle.Services.Vi
 {
     class IApplicationDisplayService : IpcService
     {

Ryujinx.Core/OsHle/Services/Vi/IHOSBinderDriver.cs

@@ -1,12 +1,12 @@
 using ChocolArm64.Memory;
 using Ryujinx.Core.OsHle.Handles;
 using Ryujinx.Core.OsHle.Ipc;
-using Ryujinx.Core.OsHle.IpcServices.Android;
+using Ryujinx.Core.OsHle.Services.Android;
 using Ryujinx.Graphics.Gal;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Vi
+namespace Ryujinx.Core.OsHle.Services.Vi
 {
     class IHOSBinderDriver : IpcService, IDisposable
     {

Ryujinx.Core/OsHle/Services/Vi/IManagerDisplayService.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Vi
+namespace Ryujinx.Core.OsHle.Services.Vi
 {
     class IManagerDisplayService : IpcService
     {

Ryujinx.Core/OsHle/Services/Vi/ISystemDisplayService.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Vi
+namespace Ryujinx.Core.OsHle.Services.Vi
 {
     class ISystemDisplayService : IpcService
     {

Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs

@@ -1,16 +1,15 @@
 using ChocolArm64.Memory;
 using Ryujinx.Core.OsHle.Handles;
-using Ryujinx.Core.OsHle.IpcServices.NvServices;
+using Ryujinx.Core.OsHle.Services.Nv;
 using Ryujinx.Graphics.Gal;
 using System;
-using System.IO;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 using System.Threading;
+using static Ryujinx.Core.OsHle.Services.Android.Parcel;
 
-using static Ryujinx.Core.OsHle.IpcServices.Android.Parcel;
-
-namespace Ryujinx.Core.OsHle.IpcServices.Android
+namespace Ryujinx.Core.OsHle.Services.Android
 {
     class NvFlinger : IDisposable
     {

Ryujinx.Core/OsHle/Services/Vi/Parcel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Android
+namespace Ryujinx.Core.OsHle.Services.Android
 {
     static class Parcel
     {

Ryujinx.Core/OsHle/Services/Vi/ServiceVi.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Core.OsHle.Ipc;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.IpcServices.Vi
+namespace Ryujinx.Core.OsHle.Services.Vi
 {
     class ServiceVi : IpcService
     {

Ryujinx.Core/OsHle/Svc/SvcSystem.cs

@@ -3,7 +3,7 @@ using ChocolArm64.State;
 using Ryujinx.Core.OsHle.Exceptions;
 using Ryujinx.Core.OsHle.Handles;
 using Ryujinx.Core.OsHle.Ipc;
-using Ryujinx.Core.OsHle.IpcServices;
+using Ryujinx.Core.OsHle.Services;
 using System;
 using System.Threading;
 

Ryujinx.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "Ryujinx\Ryujinx.csproj", "{074045D4-3ED2-4711-9169-E385F2BFB5A0}"
 EndProject
@@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "Ryujinx.Te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Core", "Ryujinx.Core\Ryujinx.Core.csproj", "{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChocolArm64", "ChocolArm64\ChocolArm64.csproj", "{2345A1A7-8DEF-419B-9AFB-4DFD41D20D05}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChocolArm64", "ChocolArm64\ChocolArm64.csproj", "{2345A1A7-8DEF-419B-9AFB-4DFD41D20D05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics", "Ryujinx.Graphics\Ryujinx.Graphics.csproj", "{EAAE36AF-7781-4578-A7E0-F0EFD2025569}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics", "Ryujinx.Graphics\Ryujinx.Graphics.csproj", "{EAAE36AF-7781-4578-A7E0-F0EFD2025569}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio", "Ryujinx.Audio\Ryujinx.Audio.csproj", "{5C1D818E-682A-46A5-9D54-30006E26C270}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
 		{EAAE36AF-7781-4578-A7E0-F0EFD2025569}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EAAE36AF-7781-4578-A7E0-F0EFD2025569}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAAE36AF-7781-4578-A7E0-F0EFD2025569}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C1D818E-682A-46A5-9D54-30006E26C270}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C1D818E-682A-46A5-9D54-30006E26C270}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C1D818E-682A-46A5-9D54-30006E26C270}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C1D818E-682A-46A5-9D54-30006E26C270}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE