diff --git a/Ryujinx.Audio/AudioFormat.cs b/Ryujinx.Audio/AudioFormat.cs
deleted file mode 100644
index 8250d1368e..0000000000
--- a/Ryujinx.Audio/AudioFormat.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Ryujinx.Audio
-{
-    public enum AudioFormat
-    {
-        Invalid  = 0,
-        PcmInt8  = 1,
-        PcmInt16 = 2,
-        PcmImt24 = 3,
-        PcmImt32 = 4,
-        PcmFloat = 5,
-        Adpcm    = 6
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Audio/IAalOutput.cs b/Ryujinx.Audio/IAalOutput.cs
index 7632fa9822..e903c5c5cc 100644
--- a/Ryujinx.Audio/IAalOutput.cs
+++ b/Ryujinx.Audio/IAalOutput.cs
@@ -2,11 +2,7 @@ namespace Ryujinx.Audio
 {
     public interface IAalOutput
     {
-        int OpenTrack(
-            int             SampleRate,
-            int             Channels,
-            ReleaseCallback Callback,
-            out AudioFormat Format);
+        int OpenTrack(int SampleRate, int Channels, ReleaseCallback Callback);
 
         void CloseTrack(int Track);
 
diff --git a/Ryujinx.Audio/OpenAL/OpenALAudioOut.cs b/Ryujinx.Audio/OpenAL/OpenALAudioOut.cs
index 1a443cbba8..1dd63202ba 100644
--- a/Ryujinx.Audio/OpenAL/OpenALAudioOut.cs
+++ b/Ryujinx.Audio/OpenAL/OpenALAudioOut.cs
@@ -227,15 +227,9 @@ namespace Ryujinx.Audio.OpenAL
             while (KeepPolling);
         }
 
-        public int OpenTrack(
-            int             SampleRate,
-            int             Channels,
-            ReleaseCallback Callback,
-            out AudioFormat Format)
+        public int OpenTrack(int SampleRate, int Channels, ReleaseCallback Callback)
         {
-            Format = AudioFormat.PcmInt16;
-
-            Track Td = new Track(SampleRate, GetALFormat(Channels, Format), Callback);
+            Track Td = new Track(SampleRate, GetALFormat(Channels), Callback);
 
             for (int Id = 0; Id < MaxTracks; Id++)
             {
@@ -248,38 +242,16 @@ namespace Ryujinx.Audio.OpenAL
             return -1;
         }
 
-        private ALFormat GetALFormat(int Channels, AudioFormat Format)
+        private ALFormat GetALFormat(int Channels)
         {
-            if (Channels == 1)
+            switch (Channels)
             {
-                switch (Format)
-                {
-                    case AudioFormat.PcmInt8:  return ALFormat.Mono8;
-                    case AudioFormat.PcmInt16: return ALFormat.Mono16;
-                }
-            }
-            else if (Channels == 2)
-            {
-                switch (Format)
-                {
-                    case AudioFormat.PcmInt8:  return ALFormat.Stereo8;
-                    case AudioFormat.PcmInt16: return ALFormat.Stereo16;
-                }
-            }
-            else if (Channels == 6)
-            {
-                switch (Format)
-                {
-                    case AudioFormat.PcmInt8:  return ALFormat.Multi51Chn8Ext;
-                    case AudioFormat.PcmInt16: return ALFormat.Multi51Chn16Ext;
-                }
-            }
-            else
-            {
-                throw new ArgumentOutOfRangeException(nameof(Channels));
+                case 1: return ALFormat.Mono16;
+                case 2: return ALFormat.Stereo16;
+                case 6: return ALFormat.Multi51Chn16Ext;
             }
 
-            throw new ArgumentException(nameof(Format));
+            throw new ArgumentOutOfRangeException(nameof(Channels));
         }
 
         public void CloseTrack(int Track)
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/AudioOutData.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioOut/AudioOutData.cs
similarity index 86%
rename from Ryujinx.HLE/OsHle/Services/Aud/AudioOutData.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioOut/AudioOutData.cs
index 9d68c24ab2..6887a38bed 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/AudioOutData.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioOut/AudioOutData.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioOut
 {
     [StructLayout(LayoutKind.Sequential)]
     struct AudioOutData
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/IAudioOut.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioOut/IAudioOut.cs
similarity index 98%
rename from Ryujinx.HLE/OsHle/Services/Aud/IAudioOut.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioOut/IAudioOut.cs
index 49c87a5616..900187ba89 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/IAudioOut.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioOut/IAudioOut.cs
@@ -6,7 +6,7 @@ using Ryujinx.HLE.OsHle.Ipc;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioOut
 {
     class IAudioOut : IpcService, IDisposable
     {
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/AudioConsts.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/AudioConsts.cs
similarity index 72%
rename from Ryujinx.HLE/OsHle/Services/Aud/AudioConsts.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/AudioConsts.cs
index 51305208d7..fed41959d7 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/AudioConsts.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/AudioConsts.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     static class AudioConsts
     {
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/BehaviorIn.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/BehaviorIn.cs
similarity index 78%
rename from Ryujinx.HLE/OsHle/Services/Aud/BehaviorIn.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/BehaviorIn.cs
index cf6871d58d..4e33de6214 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/BehaviorIn.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/BehaviorIn.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10, Pack = 4)]
     struct BehaviorIn
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/BiquadFilter.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/BiquadFilter.cs
similarity index 85%
rename from Ryujinx.HLE/OsHle/Services/Aud/BiquadFilter.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/BiquadFilter.cs
index 6d7f1df92a..9fa4cd3303 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/BiquadFilter.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/BiquadFilter.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0xc, Pack = 1)]
     struct BiquadFilter
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/IAudioRenderer.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/IAudioRenderer.cs
similarity index 99%
rename from Ryujinx.HLE/OsHle/Services/Aud/IAudioRenderer.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/IAudioRenderer.cs
index 650dee81b8..3c531ec313 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/IAudioRenderer.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/IAudioRenderer.cs
@@ -9,7 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     class IAudioRenderer : IpcService, IDisposable
     {
@@ -57,7 +57,7 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
             Track = AudioOut.OpenTrack(
                 AudioConsts.HostSampleRate,
                 AudioConsts.HostChannelsCount,
-                AudioCallback, out _);
+                AudioCallback);
 
             MemoryPools = CreateArray<MemoryPoolContext>(Params.EffectCount + Params.VoiceCount * 4);
 
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolContext.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolContext.cs
similarity index 78%
rename from Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolContext.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolContext.cs
index eed248bfed..b7af1d3f82 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolContext.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolContext.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     class MemoryPoolContext
     {
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolIn.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolIn.cs
similarity index 86%
rename from Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolIn.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolIn.cs
index 1dba97b95b..c852b5198a 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolIn.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolIn.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x20, Pack = 4)]
     struct MemoryPoolIn
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolOut.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolOut.cs
similarity index 82%
rename from Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolOut.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolOut.cs
index a3c268339e..dd65df8641 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolOut.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolOut.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10, Pack = 4)]
     struct MemoryPoolOut
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolState.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolState.cs
similarity index 80%
rename from Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolState.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolState.cs
index 892cde49e3..f96a0c09d7 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/MemoryPoolState.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/MemoryPoolState.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     enum MemoryPoolState : int
     {
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/PlayState.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/PlayState.cs
similarity index 65%
rename from Ryujinx.HLE/OsHle/Services/Aud/PlayState.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/PlayState.cs
index bae86abd16..e8bcf64f3f 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/PlayState.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/PlayState.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     enum PlayState : byte
     {
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/Resampler.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/Resampler.cs
similarity index 99%
rename from Ryujinx.HLE/OsHle/Services/Aud/Resampler.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/Resampler.cs
index 5e98faae8d..31e0ebecd9 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/Resampler.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/Resampler.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     static class Resampler
     {
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/UpdateDataHeader.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/UpdateDataHeader.cs
similarity index 90%
rename from Ryujinx.HLE/OsHle/Services/Aud/UpdateDataHeader.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/UpdateDataHeader.cs
index f944b302e0..8442e99144 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/UpdateDataHeader.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/UpdateDataHeader.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     struct UpdateDataHeader
     {
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/VoiceChannelResourceIn.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceChannelResourceIn.cs
similarity index 75%
rename from Ryujinx.HLE/OsHle/Services/Aud/VoiceChannelResourceIn.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceChannelResourceIn.cs
index 5005b8596b..0916b03e2e 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/VoiceChannelResourceIn.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceChannelResourceIn.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x70, Pack = 1)]
     struct VoiceChannelResourceIn
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/VoiceContext.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceContext.cs
similarity index 98%
rename from Ryujinx.HLE/OsHle/Services/Aud/VoiceContext.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceContext.cs
index 170c094ac5..7fbe46eafa 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/VoiceContext.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceContext.cs
@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Audio.Adpcm;
 using System;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     class VoiceContext
     {
@@ -51,6 +51,8 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
 
         private void Reset()
         {
+            BufferReload = true;
+
             BufferIndex = 0;
             Offset      = 0;
 
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/VoiceIn.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceIn.cs
similarity index 94%
rename from Ryujinx.HLE/OsHle/Services/Aud/VoiceIn.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceIn.cs
index 285148f8de..790affb20e 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/VoiceIn.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceIn.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x170, Pack = 1)]
     struct VoiceIn
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/VoiceOut.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceOut.cs
similarity index 82%
rename from Ryujinx.HLE/OsHle/Services/Aud/VoiceOut.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceOut.cs
index 86e8d24cba..1fcf929f27 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/VoiceOut.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/VoiceOut.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10, Pack = 4)]
     struct VoiceOut
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/WaveBuffer.cs b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/WaveBuffer.cs
similarity index 90%
rename from Ryujinx.HLE/OsHle/Services/Aud/WaveBuffer.cs
rename to Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/WaveBuffer.cs
index 222249987e..6b56b9081a 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/WaveBuffer.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/AudioRenderer/WaveBuffer.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.HLE.OsHle.Services.Aud
+namespace Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x38, Pack = 1)]
     struct WaveBuffer
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/IAudioOutManager.cs b/Ryujinx.HLE/OsHle/Services/Aud/IAudioOutManager.cs
index 8c78d1d493..7a3bc4d4fa 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/IAudioOutManager.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/IAudioOutManager.cs
@@ -3,6 +3,7 @@ using Ryujinx.Audio;
 using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.OsHle.Handles;
 using Ryujinx.HLE.OsHle.Ipc;
+using Ryujinx.HLE.OsHle.Services.Aud.AudioOut;
 using System.Collections.Generic;
 using System.Text;
 
@@ -154,13 +155,13 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
 
             IAalOutput AudioOut = Context.Ns.AudioOut;
 
-            int Track = AudioOut.OpenTrack(SampleRate, Channels, Callback, out AudioFormat Format);
+            int Track = AudioOut.OpenTrack(SampleRate, Channels, Callback);
 
             MakeObject(Context, new IAudioOut(AudioOut, ReleaseEvent, Track));
 
             Context.ResponseData.Write(SampleRate);
             Context.ResponseData.Write(Channels);
-            Context.ResponseData.Write((int)Format);
+            Context.ResponseData.Write((int)SampleFormat.PcmInt16);
             Context.ResponseData.Write((int)PlaybackState.Stopped);
 
             return 0;
diff --git a/Ryujinx.HLE/OsHle/Services/Aud/IAudioRendererManager.cs b/Ryujinx.HLE/OsHle/Services/Aud/IAudioRendererManager.cs
index 43c20277c9..f2086e15b8 100644
--- a/Ryujinx.HLE/OsHle/Services/Aud/IAudioRendererManager.cs
+++ b/Ryujinx.HLE/OsHle/Services/Aud/IAudioRendererManager.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Audio;
 using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.OsHle.Ipc;
+using Ryujinx.HLE.OsHle.Services.Aud.AudioRenderer;
 using System.Collections.Generic;
 
 namespace Ryujinx.HLE.OsHle.Services.Aud