diff --git a/Discord.Net.sln b/Discord.Net.sln
index 58bfcad86..cac6c9064 100644
--- a/Discord.Net.sln
+++ b/Discord.Net.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+VisualStudioVersion = 15.0.27004.2009
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Core", "src\Discord.Net.Core\Discord.Net.Core.csproj", "{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}"
EndProject
@@ -8,8 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Impls", "Impls", "{288C363D
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Rest", "src\Discord.Net.Rest\Discord.Net.Rest.csproj", "{BFC6DC28-0351-4573-926A-D4124244C04F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Rpc", "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj", "{5688A353-121E-40A1-8BFA-B17B91FB48FB}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Commands", "src\Discord.Net.Commands\Discord.Net.Commands.csproj", "{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.WebSocket", "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj", "{688FD1D8-7F01-4539-B2E9-F473C5D699C7}"
@@ -58,18 +56,6 @@ Global
{BFC6DC28-0351-4573-926A-D4124244C04F}.Release|x64.Build.0 = Debug|Any CPU
{BFC6DC28-0351-4573-926A-D4124244C04F}.Release|x86.ActiveCfg = Debug|Any CPU
{BFC6DC28-0351-4573-926A-D4124244C04F}.Release|x86.Build.0 = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Debug|x64.ActiveCfg = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Debug|x64.Build.0 = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Debug|x86.ActiveCfg = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Debug|x86.Build.0 = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|Any CPU.Build.0 = Release|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|x64.ActiveCfg = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|x64.Build.0 = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|x86.ActiveCfg = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|x86.Build.0 = Debug|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -136,7 +122,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BFC6DC28-0351-4573-926A-D4124244C04F} = {288C363D-A636-4EAE-9AC1-4698B641B26E}
- {5688A353-121E-40A1-8BFA-B17B91FB48FB} = {288C363D-A636-4EAE-9AC1-4698B641B26E}
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C} = {CC3D4B1C-9DE0-448B-8AE7-F3F1F3EC5C3A}
{688FD1D8-7F01-4539-B2E9-F473C5D699C7} = {288C363D-A636-4EAE-9AC1-4698B641B26E}
{6BDEEC08-417B-459F-9CA3-FF8BAB18CAC7} = {B0657AAE-DCC5-4FBF-8E5D-1FB578CF3012}
diff --git a/appveyor.yml b/appveyor.yml
index 3bf70c09c..393485fee 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,7 +26,6 @@ after_build:
- ps: dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
- ps: dotnet pack "src\Discord.Net.Rest\Discord.Net.Rest.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
- ps: dotnet pack "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
-- ps: dotnet pack "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
- ps: dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
- ps: dotnet pack "src\Discord.Net.Webhook\Discord.Net.Webhook.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
- ps: dotnet pack "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
diff --git a/src/Discord.Net.Rpc/API/Rpc/AuthenticateParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/AuthenticateParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/AuthenticateParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/AuthenticateParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/AuthenticateResponse.cs b/experiment/Discord.Net.Rpc/API/Rpc/AuthenticateResponse.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/AuthenticateResponse.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/AuthenticateResponse.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/AuthorizeParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/AuthorizeParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/AuthorizeParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/AuthorizeParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs b/experiment/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/Channel.cs b/experiment/Discord.Net.Rpc/API/Rpc/Channel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/Channel.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/Channel.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/ChannelSubscriptionParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/ChannelSubscriptionParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/ChannelSubscriptionParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/ChannelSubscriptionParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/ChannelSummary.cs b/experiment/Discord.Net.Rpc/API/Rpc/ChannelSummary.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/ChannelSummary.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/ChannelSummary.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/ErrorEvent.cs b/experiment/Discord.Net.Rpc/API/Rpc/ErrorEvent.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/ErrorEvent.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/ErrorEvent.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/ExtendedVoiceState.cs b/experiment/Discord.Net.Rpc/API/Rpc/ExtendedVoiceState.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/ExtendedVoiceState.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/ExtendedVoiceState.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GetChannelParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/GetChannelParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GetChannelParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GetChannelParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GetChannelsParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/GetChannelsParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GetChannelsParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GetChannelsParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GetChannelsResponse.cs b/experiment/Discord.Net.Rpc/API/Rpc/GetChannelsResponse.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GetChannelsResponse.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GetChannelsResponse.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GetGuildParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/GetGuildParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GetGuildParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GetGuildParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GetGuildsParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/GetGuildsParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GetGuildsParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GetGuildsParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GetGuildsResponse.cs b/experiment/Discord.Net.Rpc/API/Rpc/GetGuildsResponse.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GetGuildsResponse.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GetGuildsResponse.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/Guild.cs b/experiment/Discord.Net.Rpc/API/Rpc/Guild.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/Guild.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/Guild.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GuildMember.cs b/experiment/Discord.Net.Rpc/API/Rpc/GuildMember.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GuildMember.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GuildMember.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GuildStatusEvent.cs b/experiment/Discord.Net.Rpc/API/Rpc/GuildStatusEvent.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GuildStatusEvent.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GuildStatusEvent.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GuildSubscriptionParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/GuildSubscriptionParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GuildSubscriptionParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GuildSubscriptionParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/GuildSummary.cs b/experiment/Discord.Net.Rpc/API/Rpc/GuildSummary.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/GuildSummary.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/GuildSummary.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/Message.cs b/experiment/Discord.Net.Rpc/API/Rpc/Message.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/Message.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/Message.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/MessageEvent.cs b/experiment/Discord.Net.Rpc/API/Rpc/MessageEvent.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/MessageEvent.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/MessageEvent.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/Pan.cs b/experiment/Discord.Net.Rpc/API/Rpc/Pan.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/Pan.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/Pan.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/ReadyEvent.cs b/experiment/Discord.Net.Rpc/API/Rpc/ReadyEvent.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/ReadyEvent.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/ReadyEvent.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/RpcConfig.cs b/experiment/Discord.Net.Rpc/API/Rpc/RpcConfig.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/RpcConfig.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/RpcConfig.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/SelectChannelParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/SelectChannelParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/SelectChannelParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/SelectChannelParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/SetLocalVolumeParams.cs b/experiment/Discord.Net.Rpc/API/Rpc/SetLocalVolumeParams.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/SetLocalVolumeParams.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/SetLocalVolumeParams.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/SetLocalVolumeResponse.cs b/experiment/Discord.Net.Rpc/API/Rpc/SetLocalVolumeResponse.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/SetLocalVolumeResponse.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/SetLocalVolumeResponse.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/SpeakingEvent.cs b/experiment/Discord.Net.Rpc/API/Rpc/SpeakingEvent.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/SpeakingEvent.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/SpeakingEvent.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/SubscriptionResponse.cs b/experiment/Discord.Net.Rpc/API/Rpc/SubscriptionResponse.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/SubscriptionResponse.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/SubscriptionResponse.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/UserVoiceSettings.cs b/experiment/Discord.Net.Rpc/API/Rpc/UserVoiceSettings.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/UserVoiceSettings.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/UserVoiceSettings.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/VoiceDevice.cs b/experiment/Discord.Net.Rpc/API/Rpc/VoiceDevice.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/VoiceDevice.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/VoiceDevice.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/VoiceDeviceSettings.cs b/experiment/Discord.Net.Rpc/API/Rpc/VoiceDeviceSettings.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/VoiceDeviceSettings.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/VoiceDeviceSettings.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/VoiceMode.cs b/experiment/Discord.Net.Rpc/API/Rpc/VoiceMode.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/VoiceMode.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/VoiceMode.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/VoiceSettings.cs b/experiment/Discord.Net.Rpc/API/Rpc/VoiceSettings.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/VoiceSettings.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/VoiceSettings.cs
diff --git a/src/Discord.Net.Rpc/API/Rpc/VoiceShortcut.cs b/experiment/Discord.Net.Rpc/API/Rpc/VoiceShortcut.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/Rpc/VoiceShortcut.cs
rename to experiment/Discord.Net.Rpc/API/Rpc/VoiceShortcut.cs
diff --git a/src/Discord.Net.Rpc/API/RpcFrame.cs b/experiment/Discord.Net.Rpc/API/RpcFrame.cs
similarity index 100%
rename from src/Discord.Net.Rpc/API/RpcFrame.cs
rename to experiment/Discord.Net.Rpc/API/RpcFrame.cs
diff --git a/src/Discord.Net.Rpc/AssemblyInfo.cs b/experiment/Discord.Net.Rpc/AssemblyInfo.cs
similarity index 100%
rename from src/Discord.Net.Rpc/AssemblyInfo.cs
rename to experiment/Discord.Net.Rpc/AssemblyInfo.cs
diff --git a/src/Discord.Net.Rpc/Commands/RpcCommandContext.cs b/experiment/Discord.Net.Rpc/Commands/RpcCommandContext.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Commands/RpcCommandContext.cs
rename to experiment/Discord.Net.Rpc/Commands/RpcCommandContext.cs
diff --git a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj b/experiment/Discord.Net.Rpc/Discord.Net.Rpc.csproj
similarity index 100%
rename from src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
rename to experiment/Discord.Net.Rpc/Discord.Net.Rpc.csproj
diff --git a/src/Discord.Net.Rpc/DiscordRpcApiClient.cs b/experiment/Discord.Net.Rpc/DiscordRpcApiClient.cs
similarity index 100%
rename from src/Discord.Net.Rpc/DiscordRpcApiClient.cs
rename to experiment/Discord.Net.Rpc/DiscordRpcApiClient.cs
diff --git a/src/Discord.Net.Rpc/DiscordRpcClient.Events.cs b/experiment/Discord.Net.Rpc/DiscordRpcClient.Events.cs
similarity index 100%
rename from src/Discord.Net.Rpc/DiscordRpcClient.Events.cs
rename to experiment/Discord.Net.Rpc/DiscordRpcClient.Events.cs
diff --git a/src/Discord.Net.Rpc/DiscordRpcClient.cs b/experiment/Discord.Net.Rpc/DiscordRpcClient.cs
similarity index 100%
rename from src/Discord.Net.Rpc/DiscordRpcClient.cs
rename to experiment/Discord.Net.Rpc/DiscordRpcClient.cs
diff --git a/src/Discord.Net.Rpc/DiscordRpcConfig.cs b/experiment/Discord.Net.Rpc/DiscordRpcConfig.cs
similarity index 100%
rename from src/Discord.Net.Rpc/DiscordRpcConfig.cs
rename to experiment/Discord.Net.Rpc/DiscordRpcConfig.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/IRpcAudioChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/IRpcAudioChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/IRpcAudioChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/IRpcAudioChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/IRpcMessageChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/IRpcMessageChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/IRpcMessageChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/IRpcMessageChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/IRpcPrivateChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/IRpcPrivateChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/IRpcPrivateChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/IRpcPrivateChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/RpcChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/RpcChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/RpcChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcChannelSummary.cs b/experiment/Discord.Net.Rpc/Entities/Channels/RpcChannelSummary.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/RpcChannelSummary.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/RpcChannelSummary.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcDMChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/RpcDMChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/RpcDMChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/RpcDMChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcGroupChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/RpcGroupChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/RpcGroupChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/RpcGroupChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcGuildChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/RpcGuildChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/RpcGuildChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/RpcGuildChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcVoiceChannel.cs b/experiment/Discord.Net.Rpc/Entities/Channels/RpcVoiceChannel.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Channels/RpcVoiceChannel.cs
rename to experiment/Discord.Net.Rpc/Entities/Channels/RpcVoiceChannel.cs
diff --git a/src/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs b/experiment/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs
rename to experiment/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs
diff --git a/src/Discord.Net.Rpc/Entities/Guilds/RpcGuildStatus.cs b/experiment/Discord.Net.Rpc/Entities/Guilds/RpcGuildStatus.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Guilds/RpcGuildStatus.cs
rename to experiment/Discord.Net.Rpc/Entities/Guilds/RpcGuildStatus.cs
diff --git a/src/Discord.Net.Rpc/Entities/Guilds/RpcGuildSummary.cs b/experiment/Discord.Net.Rpc/Entities/Guilds/RpcGuildSummary.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Guilds/RpcGuildSummary.cs
rename to experiment/Discord.Net.Rpc/Entities/Guilds/RpcGuildSummary.cs
diff --git a/src/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs b/experiment/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs
rename to experiment/Discord.Net.Rpc/Entities/Messages/RpcMessage.cs
diff --git a/src/Discord.Net.Rpc/Entities/Messages/RpcSystemMessage.cs b/experiment/Discord.Net.Rpc/Entities/Messages/RpcSystemMessage.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Messages/RpcSystemMessage.cs
rename to experiment/Discord.Net.Rpc/Entities/Messages/RpcSystemMessage.cs
diff --git a/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs b/experiment/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs
rename to experiment/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs
diff --git a/src/Discord.Net.Rpc/Entities/RpcEntity.cs b/experiment/Discord.Net.Rpc/Entities/RpcEntity.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/RpcEntity.cs
rename to experiment/Discord.Net.Rpc/Entities/RpcEntity.cs
diff --git a/src/Discord.Net.Rpc/Entities/UserVoiceProperties.cs b/experiment/Discord.Net.Rpc/Entities/UserVoiceProperties.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/UserVoiceProperties.cs
rename to experiment/Discord.Net.Rpc/Entities/UserVoiceProperties.cs
diff --git a/src/Discord.Net.Rpc/Entities/Users/Pan.cs b/experiment/Discord.Net.Rpc/Entities/Users/Pan.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Users/Pan.cs
rename to experiment/Discord.Net.Rpc/Entities/Users/Pan.cs
diff --git a/src/Discord.Net.Rpc/Entities/Users/RpcGuildUser.cs b/experiment/Discord.Net.Rpc/Entities/Users/RpcGuildUser.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Users/RpcGuildUser.cs
rename to experiment/Discord.Net.Rpc/Entities/Users/RpcGuildUser.cs
diff --git a/src/Discord.Net.Rpc/Entities/Users/RpcUser.cs b/experiment/Discord.Net.Rpc/Entities/Users/RpcUser.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Users/RpcUser.cs
rename to experiment/Discord.Net.Rpc/Entities/Users/RpcUser.cs
diff --git a/src/Discord.Net.Rpc/Entities/Users/RpcVoiceState.cs b/experiment/Discord.Net.Rpc/Entities/Users/RpcVoiceState.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Users/RpcVoiceState.cs
rename to experiment/Discord.Net.Rpc/Entities/Users/RpcVoiceState.cs
diff --git a/src/Discord.Net.Rpc/Entities/Users/RpcWebhookUser.cs b/experiment/Discord.Net.Rpc/Entities/Users/RpcWebhookUser.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/Users/RpcWebhookUser.cs
rename to experiment/Discord.Net.Rpc/Entities/Users/RpcWebhookUser.cs
diff --git a/src/Discord.Net.Rpc/Entities/VoiceDevice.cs b/experiment/Discord.Net.Rpc/Entities/VoiceDevice.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/VoiceDevice.cs
rename to experiment/Discord.Net.Rpc/Entities/VoiceDevice.cs
diff --git a/src/Discord.Net.Rpc/Entities/VoiceDeviceProperties.cs b/experiment/Discord.Net.Rpc/Entities/VoiceDeviceProperties.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/VoiceDeviceProperties.cs
rename to experiment/Discord.Net.Rpc/Entities/VoiceDeviceProperties.cs
diff --git a/src/Discord.Net.Rpc/Entities/VoiceModeProperties.cs b/experiment/Discord.Net.Rpc/Entities/VoiceModeProperties.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/VoiceModeProperties.cs
rename to experiment/Discord.Net.Rpc/Entities/VoiceModeProperties.cs
diff --git a/src/Discord.Net.Rpc/Entities/VoiceProperties.cs b/experiment/Discord.Net.Rpc/Entities/VoiceProperties.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/VoiceProperties.cs
rename to experiment/Discord.Net.Rpc/Entities/VoiceProperties.cs
diff --git a/src/Discord.Net.Rpc/Entities/VoiceSettings.cs b/experiment/Discord.Net.Rpc/Entities/VoiceSettings.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/VoiceSettings.cs
rename to experiment/Discord.Net.Rpc/Entities/VoiceSettings.cs
diff --git a/src/Discord.Net.Rpc/Entities/VoiceShortcut.cs b/experiment/Discord.Net.Rpc/Entities/VoiceShortcut.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/VoiceShortcut.cs
rename to experiment/Discord.Net.Rpc/Entities/VoiceShortcut.cs
diff --git a/src/Discord.Net.Rpc/Entities/VoiceShortcutType.cs b/experiment/Discord.Net.Rpc/Entities/VoiceShortcutType.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Entities/VoiceShortcutType.cs
rename to experiment/Discord.Net.Rpc/Entities/VoiceShortcutType.cs
diff --git a/src/Discord.Net.Rpc/Extensions/EntityExtensions.cs b/experiment/Discord.Net.Rpc/Extensions/EntityExtensions.cs
similarity index 100%
rename from src/Discord.Net.Rpc/Extensions/EntityExtensions.cs
rename to experiment/Discord.Net.Rpc/Extensions/EntityExtensions.cs
diff --git a/src/Discord.Net.Rpc/RpcChannelEvent.cs b/experiment/Discord.Net.Rpc/RpcChannelEvent.cs
similarity index 100%
rename from src/Discord.Net.Rpc/RpcChannelEvent.cs
rename to experiment/Discord.Net.Rpc/RpcChannelEvent.cs
diff --git a/src/Discord.Net.Rpc/RpcGlobalEvent.cs b/experiment/Discord.Net.Rpc/RpcGlobalEvent.cs
similarity index 100%
rename from src/Discord.Net.Rpc/RpcGlobalEvent.cs
rename to experiment/Discord.Net.Rpc/RpcGlobalEvent.cs
diff --git a/src/Discord.Net.Rpc/RpcGuildEvent.cs b/experiment/Discord.Net.Rpc/RpcGuildEvent.cs
similarity index 100%
rename from src/Discord.Net.Rpc/RpcGuildEvent.cs
rename to experiment/Discord.Net.Rpc/RpcGuildEvent.cs
diff --git a/src/Discord.Net/Discord.Net.nuspec b/src/Discord.Net/Discord.Net.nuspec
index f904f4126..cd57d2fcf 100644
--- a/src/Discord.Net/Discord.Net.nuspec
+++ b/src/Discord.Net/Discord.Net.nuspec
@@ -16,7 +16,6 @@
-
@@ -24,7 +23,6 @@
-
@@ -32,7 +30,6 @@
-