diff --git a/src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj b/src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj
index f5e93e59e..0ed9f43e6 100644
--- a/src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj
+++ b/src/Discord.Net.Audio.Net5/Discord.Net.Audio.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,8 +10,9 @@
     <RootNamespace>Discord.Audio</RootNamespace>
     <AssemblyName>Discord.Net.Audio</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <UseMSBuildEngine>False</UseMSBuildEngine>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,12 +44,6 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Discord.Net.Audio\API\Messages\GatewaySocket.cs">
-      <Link>API\Messages\GatewaySocket.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net.Audio\API\Messages\VoiceSocket.cs">
-      <Link>API\Messages\VoiceSocket.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net.Audio\AudioExtensions.cs">
       <Link>AudioExtensions.cs</Link>
     </Compile>
diff --git a/src/Discord.Net.Audio.Net5/Properties/AssemblyInfo.cs b/src/Discord.Net.Audio.Net5/Properties/AssemblyInfo.cs
index 7efb4f703..c2c8aa3a7 100644
--- a/src/Discord.Net.Audio.Net5/Properties/AssemblyInfo.cs
+++ b/src/Discord.Net.Audio.Net5/Properties/AssemblyInfo.cs
@@ -13,6 +13,6 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 [assembly: Guid("76ea00e6-ea24-41e1-acb2-639c0313fa80")]
 
-[assembly: AssemblyVersion("0.8.1.0")]
-[assembly: AssemblyFileVersion("0.8.1.0")]
+[assembly: AssemblyVersion("0.9.0.0")]
+[assembly: AssemblyFileVersion("0.9.0.0")]
 
diff --git a/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj b/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj
index 544538dce..d8c6226f0 100644
--- a/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj
+++ b/src/Discord.Net.Commands.Net45/Discord.Net.Commands.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,8 +10,9 @@
     <RootNamespace>Discord.Commands</RootNamespace>
     <AssemblyName>Discord.Net.Commands</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <UseMSBuildEngine>False</UseMSBuildEngine>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -77,25 +78,25 @@
       <Link>Permissions\Levels\PermissionLevelService.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Commands\Permissions\Userlist\BlacklistChecker.cs">
-      <Link>Permissions\Userlist\BlacklistChecker.cs</Link>
+      <Link>Permissions\Users\BlacklistChecker.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Commands\Permissions\Userlist\BlacklistExtensions.cs">
-      <Link>Permissions\Userlist\BlacklistExtensions.cs</Link>
+      <Link>Permissions\Users\BlacklistExtensions.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Commands\Permissions\Userlist\BlacklistService.cs">
-      <Link>Permissions\Userlist\BlacklistService.cs</Link>
+      <Link>Permissions\Users\BlacklistService.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Commands\Permissions\Userlist\UserlistService.cs">
-      <Link>Permissions\Userlist\UserlistService.cs</Link>
+      <Link>Permissions\Users\UserlistService.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Commands\Permissions\Userlist\WhitelistChecker.cs">
-      <Link>Permissions\Userlist\WhitelistChecker.cs</Link>
+      <Link>Permissions\Users\WhitelistChecker.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Commands\Permissions\Userlist\WhitelistExtensions.cs">
-      <Link>Permissions\Userlist\WhitelistExtensions.cs</Link>
+      <Link>Permissions\Users\WhitelistExtensions.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Commands\Permissions\Userlist\WhitelistService.cs">
-      <Link>Permissions\Userlist\WhitelistService.cs</Link>
+      <Link>Permissions\Users\WhitelistService.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net.Commands\Permissions\Visibility\PrivateChecker.cs">
       <Link>Permissions\Visibility\PrivateChecker.cs</Link>
diff --git a/src/Discord.Net.Commands.Net45/Properties/AssemblyInfo.cs b/src/Discord.Net.Commands.Net45/Properties/AssemblyInfo.cs
index c9652a642..1959b2cf3 100644
--- a/src/Discord.Net.Commands.Net45/Properties/AssemblyInfo.cs
+++ b/src/Discord.Net.Commands.Net45/Properties/AssemblyInfo.cs
@@ -13,6 +13,6 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 [assembly: Guid("76ea00e6-ea24-41e1-acb2-639c0313fa80")]
 
-[assembly: AssemblyVersion("0.8.1.0")]
-[assembly: AssemblyFileVersion("0.8.1.0")]
+[assembly: AssemblyVersion("0.9.0.0")]
+[assembly: AssemblyFileVersion("0.9.0.0")]
 
diff --git a/src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj b/src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj
index 193e52fb5..37eb97f17 100644
--- a/src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj
+++ b/src/Discord.Net.Modules.Net45/Discord.Net.Modules.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,8 +10,9 @@
     <RootNamespace>Discord.Modules</RootNamespace>
     <AssemblyName>Discord.Net.Modules</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <UseMSBuildEngine>False</UseMSBuildEngine>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Discord.Net.Modules.Net45/Properties/AssemblyInfo.cs b/src/Discord.Net.Modules.Net45/Properties/AssemblyInfo.cs
index f61c1c991..04eda1587 100644
--- a/src/Discord.Net.Modules.Net45/Properties/AssemblyInfo.cs
+++ b/src/Discord.Net.Modules.Net45/Properties/AssemblyInfo.cs
@@ -13,6 +13,6 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 [assembly: Guid("76ea00e6-ea24-41e1-acb2-639c0313fa80")]
 
-[assembly: AssemblyVersion("0.8.1.0")]
-[assembly: AssemblyFileVersion("0.8.1.0")]
+[assembly: AssemblyVersion("0.9.0.0")]
+[assembly: AssemblyFileVersion("0.9.0.0")]
 
diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj
index de69c937a..dd4cbf3b8 100644
--- a/src/Discord.Net.Net45/Discord.Net.csproj
+++ b/src/Discord.Net.Net45/Discord.Net.csproj
@@ -10,7 +10,7 @@
     <RootNamespace>Discord</RootNamespace>
     <AssemblyName>Discord.Net</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <UseMSBuildEngine>False</UseMSBuildEngine>
@@ -68,116 +68,398 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Discord.Net\API\Converters\LongStringCollectionConverter.cs">
-      <Link>API\Converters\LongStringCollectionConverter.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\Channel.cs">
+      <Link>API\Client\Common\Channel.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Converters\LongStringConverter.cs">
-      <Link>API\Converters\LongStringConverter.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\ChannelReference.cs">
+      <Link>API\Client\Common\ChannelReference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Endpoints.cs">
-      <Link>API\Endpoints.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\ExtendedGuild.cs">
+      <Link>API\Client\Common\ExtendedGuild.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Enums\ChannelType.cs">
-      <Link>API\Enums\ChannelType.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\Guild.cs">
+      <Link>API\Client\Common\Guild.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Enums\ImageType.cs">
-      <Link>API\Enums\ImageType.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\GuildReference.cs">
+      <Link>API\Client\Common\GuildReference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Enums\PermissionTarget.cs">
-      <Link>API\Enums\PermissionTarget.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\Invite.cs">
+      <Link>API\Client\Common\Invite.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Enums\StringEnum.cs">
-      <Link>API\Enums\StringEnum.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\InviteReference.cs">
+      <Link>API\Client\Common\InviteReference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Enums\UserStatus.cs">
-      <Link>API\Enums\UserStatus.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\Member.cs">
+      <Link>API\Client\Common\Member.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Auth.cs">
-      <Link>API\Messages\Auth.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\MemberPresence.cs">
+      <Link>API\Client\Common\MemberPresence.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Channels.cs">
-      <Link>API\Messages\Channels.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\MemberReference.cs">
+      <Link>API\Client\Common\MemberReference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\GatewaySocket.cs">
-      <Link>API\Messages\GatewaySocket.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\MemberVoiceState.cs">
+      <Link>API\Client\Common\MemberVoiceState.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Invites.cs">
-      <Link>API\Messages\Invites.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\Message.cs">
+      <Link>API\Client\Common\Message.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Maintenance.cs">
-      <Link>API\Messages\Maintenance.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\MessageReference.cs">
+      <Link>API\Client\Common\MessageReference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Members.cs">
-      <Link>API\Messages\Members.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\Role.cs">
+      <Link>API\Client\Common\Role.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Messages.cs">
-      <Link>API\Messages\Messages.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\RoleReference.cs">
+      <Link>API\Client\Common\RoleReference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Permissions.cs">
-      <Link>API\Messages\Permissions.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\User.cs">
+      <Link>API\Client\Common\User.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Roles.cs">
-      <Link>API\Messages\Roles.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Common\UserReference.cs">
+      <Link>API\Client\Common\UserReference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Servers.cs">
-      <Link>API\Messages\Servers.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Commands\Heartbeat.cs">
+      <Link>API\Client\GatewaySocket\Commands\Heartbeat.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\API\Messages\Users.cs">
-      <Link>API\Messages\Users.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Commands\Identify.cs">
+      <Link>API\Client\GatewaySocket\Commands\Identify.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordAPIClient.cs">
-      <Link>DiscordAPIClient.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Commands\RequestMembers.cs">
+      <Link>API\Client\GatewaySocket\Commands\RequestMembers.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClient.Channels.cs">
-      <Link>DiscordClient.Channels.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Commands\Resume.cs">
+      <Link>API\Client\GatewaySocket\Commands\Resume.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClient.cs">
-      <Link>DiscordClient.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Commands\UpdateStatus.cs">
+      <Link>API\Client\GatewaySocket\Commands\UpdateStatus.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Commands\UpdateVoice.cs">
+      <Link>API\Client\GatewaySocket\Commands\UpdateVoice.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\ChannelCreate.cs">
+      <Link>API\Client\GatewaySocket\Events\ChannelCreate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\ChannelDelete.cs">
+      <Link>API\Client\GatewaySocket\Events\ChannelDelete.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\ChannelUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\ChannelUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildBanAdd.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildBanAdd.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildBanRemove.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildBanRemove.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildCreate.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildCreate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildDelete.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildDelete.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildIntegrationsUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildIntegrationsUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildMemberAdd.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildMemberAdd.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildMemberRemove.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildMemberRemove.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildMembersChunk.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildMembersChunk.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildMemberUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildMemberUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildRoleCreate.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildRoleCreate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildRoleDelete.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildRoleDelete.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildRoleUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildRoleUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\GuildUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\GuildUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\MessageAck.cs">
+      <Link>API\Client\GatewaySocket\Events\MessageAck.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\MessageCreate.cs">
+      <Link>API\Client\GatewaySocket\Events\MessageCreate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\MessageDelete.cs">
+      <Link>API\Client\GatewaySocket\Events\MessageDelete.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\MessageUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\MessageUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\PresenceUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\PresenceUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\Ready.cs">
+      <Link>API\Client\GatewaySocket\Events\Ready.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\Redirect.cs">
+      <Link>API\Client\GatewaySocket\Events\Redirect.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\Resumed.cs">
+      <Link>API\Client\GatewaySocket\Events\Resumed.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\TypingStart.cs">
+      <Link>API\Client\GatewaySocket\Events\TypingStart.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\UserSettingsUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\UserSettingsUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\UserUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\UserUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\VoiceServerUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\VoiceServerUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\Events\VoiceStateUpdate.cs">
+      <Link>API\Client\GatewaySocket\Events\VoiceStateUpdate.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\GatewaySocket\OpCodes.cs">
+      <Link>API\Client\GatewaySocket\OpCodes.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\IWebSocketMessage.cs">
+      <Link>API\Client\IWebSocketMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\AcceptInvite.cs">
+      <Link>API\Client\Rest\AcceptInvite.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\AckMessage.cs">
+      <Link>API\Client\Rest\AckMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\AddChannelPermission.cs">
+      <Link>API\Client\Rest\AddChannelPermission.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\AddGuildBan.cs">
+      <Link>API\Client\Rest\AddGuildBan.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\BroadcastTyping.cs">
+      <Link>API\Client\Rest\BroadcastTyping.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\CreateChannel.cs">
+      <Link>API\Client\Rest\CreateChannel.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\CreateGuild.cs">
+      <Link>API\Client\Rest\CreateGuild.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\CreateInvite.cs">
+      <Link>API\Client\Rest\CreateInvite.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\CreatePrivateChannel.cs">
+      <Link>API\Client\Rest\CreatePrivateChannel.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\CreateRole.cs">
+      <Link>API\Client\Rest\CreateRole.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\DeleteChannel.cs">
+      <Link>API\Client\Rest\DeleteChannel.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\DeleteInvite.cs">
+      <Link>API\Client\Rest\DeleteInvite.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\DeleteMessage.cs">
+      <Link>API\Client\Rest\DeleteMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\DeleteRole.cs">
+      <Link>API\Client\Rest\DeleteRole.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\Gateway.cs">
+      <Link>API\Client\Rest\Gateway.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\GetInvite.cs">
+      <Link>API\Client\Rest\GetInvite.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\GetInvites.cs">
+      <Link>API\Client\Rest\GetInvites.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\GetMessages.cs">
+      <Link>API\Client\Rest\GetMessages.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\GetVoiceRegions.cs">
+      <Link>API\Client\Rest\GetVoiceRegions.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClient.Invites.cs">
-      <Link>DiscordClient.Invites.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Rest\GetWidget.cs">
+      <Link>API\Client\Rest\GetWidget.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClient.Messages.cs">
-      <Link>DiscordClient.Messages.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Rest\KickMember.cs">
+      <Link>API\Client\Rest\KickMember.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClient.Permissions.cs">
-      <Link>DiscordClient.Permissions.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Rest\LeaveGuild.cs">
+      <Link>API\Client\Rest\LeaveGuild.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClient.Roles.cs">
-      <Link>DiscordClient.Roles.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Rest\Login.cs">
+      <Link>API\Client\Rest\Login.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClient.Servers.cs">
-      <Link>DiscordClient.Servers.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Rest\Logout.cs">
+      <Link>API\Client\Rest\Logout.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\DiscordClient.Users.cs">
-      <Link>DiscordClient.Users.cs</Link>
+    <Compile Include="..\Discord.Net\API\Client\Rest\PruneMembers.cs">
+      <Link>API\Client\Rest\PruneMembers.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\RemoveChannelPermission.cs">
+      <Link>API\Client\Rest\RemoveChannelPermission.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\RemoveGuildBan.cs">
+      <Link>API\Client\Rest\RemoveGuildBan.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\ReorderChannels.cs">
+      <Link>API\Client\Rest\ReorderChannels.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\ReorderRoles.cs">
+      <Link>API\Client\Rest\ReorderRoles.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\SendFile.cs">
+      <Link>API\Client\Rest\SendFile.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\SendMessage.cs">
+      <Link>API\Client\Rest\SendMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\UpdateChannel.cs">
+      <Link>API\Client\Rest\UpdateChannel.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\UpdateGuild.cs">
+      <Link>API\Client\Rest\UpdateGuild.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\UpdateMember.cs">
+      <Link>API\Client\Rest\UpdateMember.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\UpdateMessage.cs">
+      <Link>API\Client\Rest\UpdateMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\UpdateProfile.cs">
+      <Link>API\Client\Rest\UpdateProfile.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\Rest\UpdateRole.cs">
+      <Link>API\Client\Rest\UpdateRole.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\VoiceSocket\Commands\Heartbeat.cs">
+      <Link>API\Client\VoiceSocket\Commands\Heartbeat.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\VoiceSocket\Commands\Identify.cs">
+      <Link>API\Client\VoiceSocket\Commands\Identify.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\VoiceSocket\Commands\SelectProtocol.cs">
+      <Link>API\Client\VoiceSocket\Commands\SelectProtocol.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\VoiceSocket\Commands\SetSpeaking.cs">
+      <Link>API\Client\VoiceSocket\Commands\SetSpeaking.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\VoiceSocket\Events\Ready.cs">
+      <Link>API\Client\VoiceSocket\Events\Ready.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\VoiceSocket\Events\SessionDescription.cs">
+      <Link>API\Client\VoiceSocket\Events\SessionDescription.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\VoiceSocket\Events\Speaking.cs">
+      <Link>API\Client\VoiceSocket\Events\Speaking.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Client\VoiceSocket\OpCodes.cs">
+      <Link>API\Client\VoiceSocket\OpCodes.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Converters.cs">
+      <Link>API\Converters.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Extensions.cs">
+      <Link>API\Extensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\IRestRequest.cs">
+      <Link>API\IRestRequest.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Status\Common\Incident.cs">
+      <Link>API\Status\Common\Incident.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Status\Rest\Active.cs">
+      <Link>API\Status\Rest\Active.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\API\Status\Rest\Upcoming.cs">
+      <Link>API\Status\Rest\Upcoming.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\DiscordClient.cs">
+      <Link>DiscordClient.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\DiscordClient.Events.cs">
+      <Link>DiscordClient.Events.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\DiscordClient.Obsolete.cs">
+      <Link>DiscordClient.Obsolete.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net\DiscordConfig.cs">
       <Link>DiscordConfig.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\AsyncCollection.cs">
-      <Link>Helpers\AsyncCollection.cs</Link>
+    <Compile Include="..\Discord.Net\Enums\ChannelType.cs">
+      <Link>Enums\ChannelType.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Enums\ConnectionState.cs">
+      <Link>Enums\ConnectionState.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Enums\ImageType.cs">
+      <Link>Enums\ImageType.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Enums\PermissionTarget.cs">
+      <Link>Enums\PermissionTarget.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Enums\StringEnum.cs">
+      <Link>Enums\StringEnum.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Enums\UserStatus.cs">
+      <Link>Enums\UserStatus.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Events\BanEventArgs.cs">
+      <Link>Events\BanEventArgs.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Events\ChannelEventArgs.cs">
+      <Link>Events\ChannelEventArgs.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Events\ChannelUserEventArgs.cs">
+      <Link>Events\ChannelUserEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\BitHelper.cs">
-      <Link>Helpers\BitHelper.cs</Link>
+    <Compile Include="..\Discord.Net\Events\DisconnectedEventArgs.cs">
+      <Link>Events\DisconnectedEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\CachedObject.cs">
-      <Link>Helpers\CachedObject.cs</Link>
+    <Compile Include="..\Discord.Net\Events\LogMessageEventArgs.cs">
+      <Link>Events\LogMessageEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\CollectionExtensions.cs">
-      <Link>Helpers\CollectionExtensions.cs</Link>
+    <Compile Include="..\Discord.Net\Events\MessageEventArgs.cs">
+      <Link>Events\MessageEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\Format.cs">
-      <Link>Helpers\Format.cs</Link>
+    <Compile Include="..\Discord.Net\Events\ProfileEventArgs.cs">
+      <Link>Events\ProfileEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\Mention.cs">
-      <Link>Helpers\Mention.cs</Link>
+    <Compile Include="..\Discord.Net\Events\RoleEventArgs.cs">
+      <Link>Events\RoleEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\Reference.cs">
-      <Link>Helpers\Reference.cs</Link>
+    <Compile Include="..\Discord.Net\Events\ServerEventArgs.cs">
+      <Link>Events\ServerEventArgs.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Helpers\TaskManager.cs">
-      <Link>Helpers\TaskManager.cs</Link>
+    <Compile Include="..\Discord.Net\Events\UserEventArgs.cs">
+      <Link>Events\UserEventArgs.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Extensions.cs">
+      <Link>Extensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Format.cs">
+      <Link>Format.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\IService.cs">
+      <Link>IService.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Logging\Logger.cs">
+      <Link>Logging\Logger.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Logging\LogManager.cs">
+      <Link>Logging\LogManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\MessageQueue.cs">
+      <Link>MessageQueue.cs</Link>
     </Compile>
     <Compile Include="..\Discord.Net\Models\Channel.cs">
       <Link>Models\Channel.cs</Link>
@@ -185,9 +467,6 @@
     <Compile Include="..\Discord.Net\Models\Color.cs">
       <Link>Models\Color.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Models\GlobalUser.cs">
-      <Link>Models\GlobalUser.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\Models\Invite.cs">
       <Link>Models\Invite.cs</Link>
     </Compile>
@@ -197,6 +476,9 @@
     <Compile Include="..\Discord.Net\Models\Permissions.cs">
       <Link>Models\Permissions.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\Models\Profile.cs">
+      <Link>Models\Profile.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\Models\Region.cs">
       <Link>Models\Region.cs</Link>
     </Compile>
@@ -218,9 +500,6 @@
     <Compile Include="..\Discord.Net\Net\Rest\RestClient.cs">
       <Link>Net\Rest\RestClient.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Net\Rest\RestClient.Events.cs">
-      <Link>Net\Rest\RestClient.Events.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\Net\Rest\SharpRestEngine.cs">
       <Link>Net\Rest\SharpRestEngine.cs</Link>
     </Compile>
@@ -236,6 +515,9 @@
     <Compile Include="..\Discord.Net\Net\WebSockets\IWebSocketEngine.cs">
       <Link>Net\WebSockets\IWebSocketEngine.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\Net\WebSockets\WebSocket.BuiltIn.cs">
+      <Link>Net\WebSockets\WebSocket.BuiltIn.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\Net\WebSockets\WebSocket.cs">
       <Link>Net\WebSockets\WebSocket.cs</Link>
     </Compile>
@@ -245,20 +527,26 @@
     <Compile Include="..\Discord.Net\Net\WebSockets\WS4NetEngine.cs">
       <Link>Net\WebSockets\WS4NetEngine.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Services\IService.cs">
-      <Link>Services\IService.cs</Link>
+    <Compile Include="..\Discord.Net\Reference.cs">
+      <Link>Reference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Services\LogExtensions.cs">
-      <Link>Services\LogExtensions.cs</Link>
+    <Compile Include="..\Discord.Net\RelativeDirection.cs">
+      <Link>RelativeDirection.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\Services\LogService.cs">
-      <Link>Services\LogService.cs</Link>
+    <Compile Include="..\Discord.Net\ServiceManager.cs">
+      <Link>ServiceManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\TaskManager.cs">
+      <Link>TaskManager.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="API\Bot\" />
+  </ItemGroup>
   <Import Project="..\Discord.Net.Shared\Discord.Net.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Discord.Net.Net45/Properties/AssemblyInfo.cs b/src/Discord.Net.Net45/Properties/AssemblyInfo.cs
index 2825ff2a9..64a8616f5 100644
--- a/src/Discord.Net.Net45/Properties/AssemblyInfo.cs
+++ b/src/Discord.Net.Net45/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 [assembly: Guid("76ea00e6-ea24-41e1-acb2-639c0313fa80")]
 
-[assembly: AssemblyVersion("0.8.1.0")]
-[assembly: AssemblyFileVersion("0.8.1.0")]
+[assembly: AssemblyVersion("0.9.0.0")]
+[assembly: AssemblyFileVersion("0.9.0.0")]
diff --git a/src/Discord.Net.Net45/packages.config b/src/Discord.Net.Net45/packages.config
index b267bb536..a80cad623 100644
--- a/src/Discord.Net.Net45/packages.config
+++ b/src/Discord.Net.Net45/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="RestSharp" version="105.2.3" targetFramework="net45" />
+  <package id="RestSharp" version="105.2.3" targetFramework="net45" requireReinstallation="true" />
   <package id="WebSocket4Net" version="0.14.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Discord.Net/Logging/Logger.cs b/src/Discord.Net/Logging/Logger.cs
index 671afa141..8a925d260 100644
--- a/src/Discord.Net/Logging/Logger.cs
+++ b/src/Discord.Net/Logging/Logger.cs
@@ -1,5 +1,4 @@
-using Discord.Net.WebSockets;
-using System;
+using System;
 
 namespace Discord.Logging
 {