diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj
index 1d54ee4b..adf26293 100644
--- a/src/Discord.Net.Net45/Discord.Net.csproj
+++ b/src/Discord.Net.Net45/Discord.Net.csproj
@@ -127,6 +127,27 @@
     <Compile Include="..\Discord.Net\API\WebSockets.cs">
       <Link>API\WebSockets.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\Audio\IDiscordVoiceBuffer.cs">
+      <Link>Audio\IDiscordVoiceBuffer.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Audio\IDiscordVoiceClient.cs">
+      <Link>Audio\IDiscordVoiceClient.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Audio\Opus.cs">
+      <Link>Audio\Opus.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Audio\OpusDecoder.cs">
+      <Link>Audio\OpusDecoder.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Audio\OpusEncoder.cs">
+      <Link>Audio\OpusEncoder.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Audio\Sodium.cs">
+      <Link>Audio\Sodium.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Audio\VoiceBuffer.cs">
+      <Link>Audio\VoiceBuffer.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\Collections\AsyncCollection.cs">
       <Link>Collections\AsyncCollection.cs</Link>
     </Compile>
@@ -223,17 +244,8 @@
     <Compile Include="..\Discord.Net\Helpers\TimeoutException.cs">
       <Link>Helpers\TimeoutException.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Interop\Opus.cs">
-      <Link>Interop\Opus.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\Interop\OpusDecoder.cs">
-      <Link>Interop\OpusDecoder.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\Interop\OpusEncoder.cs">
-      <Link>Interop\OpusEncoder.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\Interop\Sodium.cs">
-      <Link>Interop\Sodium.cs</Link>
+    <Compile Include="..\Discord.Net\HttpException.cs">
+      <Link>HttpException.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net\Models\Channel.cs">
       <Link>Models\Channel.cs</Link>
@@ -262,9 +274,6 @@
     <Compile Include="..\Discord.Net\Models\User.cs">
       <Link>Models\User.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Net\HttpException.cs">
-      <Link>Net\HttpException.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\Net\Rest\IRestEngine.cs">
       <Link>Net\Rest\IRestEngine.cs</Link>
     </Compile>
@@ -277,15 +286,6 @@
     <Compile Include="..\Discord.Net\Net\Rest\SharpRestEngine.cs">
       <Link>Net\Rest\SharpRestEngine.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Net\Voice\IDiscordVoiceBuffer.cs">
-      <Link>Net\Voice\IDiscordVoiceBuffer.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\Net\Voice\IDiscordVoiceClient.cs">
-      <Link>Net\Voice\IDiscordVoiceClient.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\Net\Voice\VoiceBuffer.cs">
-      <Link>Net\Voice\VoiceBuffer.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\Net\WebSockets\DataWebSocket.cs">
       <Link>Net\WebSockets\DataWebSocket.cs</Link>
     </Compile>
@@ -326,6 +326,7 @@
       <Link>lib\opus.dll</Link>
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Discord.Net/Net/Voice/IDiscordVoiceBuffer.cs b/src/Discord.Net/Audio/IDiscordVoiceBuffer.cs
similarity index 83%
rename from src/Discord.Net/Net/Voice/IDiscordVoiceBuffer.cs
rename to src/Discord.Net/Audio/IDiscordVoiceBuffer.cs
index cf301bef..c9f87a81 100644
--- a/src/Discord.Net/Net/Voice/IDiscordVoiceBuffer.cs
+++ b/src/Discord.Net/Audio/IDiscordVoiceBuffer.cs
@@ -1,4 +1,4 @@
-namespace Discord.Net.Voice
+namespace Discord.Audio
 {
 	public interface IDiscordVoiceBuffer
 	{
diff --git a/src/Discord.Net/Net/Voice/IDiscordVoiceClient.cs b/src/Discord.Net/Audio/IDiscordVoiceClient.cs
similarity index 90%
rename from src/Discord.Net/Net/Voice/IDiscordVoiceClient.cs
rename to src/Discord.Net/Audio/IDiscordVoiceClient.cs
index 5cbf0a4f..a6984242 100644
--- a/src/Discord.Net/Net/Voice/IDiscordVoiceClient.cs
+++ b/src/Discord.Net/Audio/IDiscordVoiceClient.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Discord.Net.Voice
+namespace Discord.Audio
 {
 	public interface IDiscordVoiceClient
 	{
diff --git a/src/Discord.Net/Interop/Opus.cs b/src/Discord.Net/Audio/Opus.cs
similarity index 99%
rename from src/Discord.Net/Interop/Opus.cs
rename to src/Discord.Net/Audio/Opus.cs
index 78c7b39d..20f65be0 100644
--- a/src/Discord.Net/Interop/Opus.cs
+++ b/src/Discord.Net/Audio/Opus.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Discord.Interop
+namespace Discord.Audio
 {
 	internal unsafe static class Opus
 	{
diff --git a/src/Discord.Net/Interop/OpusDecoder.cs b/src/Discord.Net/Audio/OpusDecoder.cs
similarity index 99%
rename from src/Discord.Net/Interop/OpusDecoder.cs
rename to src/Discord.Net/Audio/OpusDecoder.cs
index 0341a8ac..e6c9cd40 100644
--- a/src/Discord.Net/Interop/OpusDecoder.cs
+++ b/src/Discord.Net/Audio/OpusDecoder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Discord.Interop
+namespace Discord.Audio
 {
 	/// <summary> Opus codec wrapper. </summary>
 	internal class OpusDecoder : IDisposable
diff --git a/src/Discord.Net/Interop/OpusEncoder.cs b/src/Discord.Net/Audio/OpusEncoder.cs
similarity index 99%
rename from src/Discord.Net/Interop/OpusEncoder.cs
rename to src/Discord.Net/Audio/OpusEncoder.cs
index d6209927..c5e033a2 100644
--- a/src/Discord.Net/Interop/OpusEncoder.cs
+++ b/src/Discord.Net/Audio/OpusEncoder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Discord.Interop
+namespace Discord.Audio
 {
 	/// <summary> Opus codec wrapper. </summary>
 	internal class OpusEncoder : IDisposable
diff --git a/src/Discord.Net/Interop/Sodium.cs b/src/Discord.Net/Audio/Sodium.cs
similarity index 97%
rename from src/Discord.Net/Interop/Sodium.cs
rename to src/Discord.Net/Audio/Sodium.cs
index 8d5d7e3c..ec7dde61 100644
--- a/src/Discord.Net/Interop/Sodium.cs
+++ b/src/Discord.Net/Audio/Sodium.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Discord.Interop
+namespace Discord.Audio
 {
 	internal unsafe static class Sodium
 	{
diff --git a/src/Discord.Net/Net/Voice/VoiceBuffer.cs b/src/Discord.Net/Audio/VoiceBuffer.cs
similarity index 99%
rename from src/Discord.Net/Net/Voice/VoiceBuffer.cs
rename to src/Discord.Net/Audio/VoiceBuffer.cs
index bc31a8bd..eaff4e5f 100644
--- a/src/Discord.Net/Net/Voice/VoiceBuffer.cs
+++ b/src/Discord.Net/Audio/VoiceBuffer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Discord.Net.Voice
+namespace Discord.Audio
 {
     internal class VoiceBuffer : IDiscordVoiceBuffer
 	{
diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index a1fe7184..41417080 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -1,7 +1,7 @@
 using Discord.API;
+using Discord.Audio;
 using Discord.Collections;
 using Discord.Net;
-using Discord.Net.Voice;
 using Discord.Net.WebSockets;
 using Newtonsoft.Json;
 using System;
@@ -780,19 +780,19 @@ namespace Discord
 			=> LeaveVoiceServer(server?.Id);
         public async Task LeaveVoiceServer(string serverId)
 		{
-			CheckReady(); //checkVoice is done inside the voice client
+			CheckReady(checkVoice: true);
 			if (serverId == null) throw new ArgumentNullException(nameof(serverId));
 
 			if (Config.EnableVoiceMultiserver)
 			{
 				DiscordWSClient client;
 				if (_voiceClients.TryRemove(serverId, out client))
-					await client.Disconnect();
+					await client.Disconnect().ConfigureAwait(false);
 			}
 			else
 			{
+				await _voiceSocket.Disconnect().ConfigureAwait(false);
 				_dataSocket.SendLeaveVoice(serverId);
-				await _voiceSocket.Disconnect();
 			}
         }
 
diff --git a/src/Discord.Net/DiscordWSClient.Voice.cs b/src/Discord.Net/DiscordWSClient.Voice.cs
index f290809e..0d1a7ca4 100644
--- a/src/Discord.Net/DiscordWSClient.Voice.cs
+++ b/src/Discord.Net/DiscordWSClient.Voice.cs
@@ -1,4 +1,4 @@
-using Discord.Net.Voice;
+using Discord.Audio;
 using System;
 using System.Threading.Tasks;
 
@@ -20,20 +20,6 @@ namespace Discord
 			await _voiceSocket.WaitForConnection(_config.ConnectionTimeout);
 		}
 
-		/*async Task IDiscordVoiceClient.Disconnect()
-		{
-			CheckReady(checkVoice: true);
-
-			if (_voiceSocket.State != WebSocketState.Disconnected)
-			{
-				if (_voiceSocket.CurrentServerId != null)
-				{
-					await _voiceSocket.Disconnect().ConfigureAwait(false);
-					_dataSocket.SendLeaveVoice(_voiceSocket.CurrentServerId);
-				}
-			}
-		}*/
-
 		/// <summary> Sends a PCM frame to the voice server. Will block until space frees up in the outgoing buffer. </summary>
 		/// <param name="data">PCM frame to send. This must be a single or collection of uncompressed 48Kz monochannel 20ms PCM frames. </param>
 		/// <param name="count">Number of bytes in this frame. </param>
diff --git a/src/Discord.Net/Net/HttpException.cs b/src/Discord.Net/HttpException.cs
similarity index 93%
rename from src/Discord.Net/Net/HttpException.cs
rename to src/Discord.Net/HttpException.cs
index 84ae6653..420d885e 100644
--- a/src/Discord.Net/Net/HttpException.cs
+++ b/src/Discord.Net/HttpException.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net;
 
-namespace Discord.Net
+namespace Discord
 {
 	public class HttpException : Exception
 	{
diff --git a/src/Discord.Net/Net/WebSockets/VoiceWebSocket.cs b/src/Discord.Net/Net/WebSockets/VoiceWebSocket.cs
index aea264c6..22b5e725 100644
--- a/src/Discord.Net/Net/WebSockets/VoiceWebSocket.cs
+++ b/src/Discord.Net/Net/WebSockets/VoiceWebSocket.cs
@@ -1,7 +1,6 @@
 #define USE_THREAD
 using Discord.API;
-using Discord.Interop;
-using Discord.Net.Voice;
+using Discord.Audio;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
diff --git a/src/Discord.Net/Net/WebSockets/WebSocket.cs b/src/Discord.Net/Net/WebSockets/WebSocket.cs
index 7eeb9acf..c6b1a77f 100644
--- a/src/Discord.Net/Net/WebSockets/WebSocket.cs
+++ b/src/Discord.Net/Net/WebSockets/WebSocket.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Discord.Net.WebSockets
 {
-	public enum WebSocketState : byte
+	internal enum WebSocketState : byte
 	{
 		Disconnected,
 		Connecting,