diff --git a/src/Discord.Net/API/DiscordSocketApiClient.cs b/src/Discord.Net/API/DiscordSocketApiClient.cs
index 558fe703c..83347607b 100644
--- a/src/Discord.Net/API/DiscordSocketApiClient.cs
+++ b/src/Discord.Net/API/DiscordSocketApiClient.cs
@@ -4,6 +4,7 @@ using Discord.API.Rest;
 using Discord.Net.Queue;
 using Discord.Net.Rest;
 using Discord.Net.WebSockets;
+using Discord.WebSocket;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
diff --git a/src/Discord.Net/Rest/Entities/Application.cs b/src/Discord.Net/Rest/Entities/Application.cs
index 98545679b..2e743daf4 100644
--- a/src/Discord.Net/Rest/Entities/Application.cs
+++ b/src/Discord.Net/Rest/Entities/Application.cs
@@ -3,7 +3,7 @@ using System;
 using System.Threading.Tasks;
 using Model = Discord.API.Application;
 
-namespace Discord
+namespace Discord.Rest
 {
     internal class Application : SnowflakeEntity, IApplication
     {
diff --git a/src/Discord.Net/Rest/Entities/Channels/DMChannel.cs b/src/Discord.Net/Rest/Entities/Channels/DMChannel.cs
index c9972f745..28ca95cc4 100644
--- a/src/Discord.Net/Rest/Entities/Channels/DMChannel.cs
+++ b/src/Discord.Net/Rest/Entities/Channels/DMChannel.cs
@@ -1,5 +1,4 @@
 using Discord.API.Rest;
-using Discord.Rest;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -9,7 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Model = Discord.API.Channel;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class DMChannel : SnowflakeEntity, IDMChannel
diff --git a/src/Discord.Net/Rest/Entities/Channels/GroupChannel.cs b/src/Discord.Net/Rest/Entities/Channels/GroupChannel.cs
index a2143c66e..664e04fba 100644
--- a/src/Discord.Net/Rest/Entities/Channels/GroupChannel.cs
+++ b/src/Discord.Net/Rest/Entities/Channels/GroupChannel.cs
@@ -1,5 +1,4 @@
 using Discord.API.Rest;
-using Discord.Rest;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -10,7 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Model = Discord.API.Channel;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class GroupChannel : SnowflakeEntity, IGroupChannel
diff --git a/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs b/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
index 4086e70be..3b159e134 100644
--- a/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
+++ b/src/Discord.Net/Rest/Entities/Channels/GuildChannel.cs
@@ -1,5 +1,4 @@
 using Discord.API.Rest;
-using Discord.Rest;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -8,7 +7,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Model = Discord.API.Channel;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal abstract class GuildChannel : SnowflakeEntity, IGuildChannel
diff --git a/src/Discord.Net/Rest/Entities/Channels/TextChannel.cs b/src/Discord.Net/Rest/Entities/Channels/TextChannel.cs
index 13acd0a22..36f1eae9e 100644
--- a/src/Discord.Net/Rest/Entities/Channels/TextChannel.cs
+++ b/src/Discord.Net/Rest/Entities/Channels/TextChannel.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Model = Discord.API.Channel;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class TextChannel : GuildChannel, ITextChannel
diff --git a/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs b/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs
index b0db27e4d..abe4fa56c 100644
--- a/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs
+++ b/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Model = Discord.API.Channel;
 using Discord.Audio;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class VoiceChannel : GuildChannel, IVoiceChannel
diff --git a/src/Discord.Net/Rest/Entities/Entity.cs b/src/Discord.Net/Rest/Entities/Entity.cs
index 6652fd208..6828e66b8 100644
--- a/src/Discord.Net/Rest/Entities/Entity.cs
+++ b/src/Discord.Net/Rest/Entities/Entity.cs
@@ -1,6 +1,6 @@
 using Discord.Rest;
 
-namespace Discord
+namespace Discord.Rest
 {
     internal abstract class Entity<T> : IEntity<T>
     {
diff --git a/src/Discord.Net/Rest/Entities/Guilds/Guild.cs b/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
index d70a31d21..abd15f448 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
@@ -12,7 +12,7 @@ using EmbedModel = Discord.API.GuildEmbed;
 using Model = Discord.API.Guild;
 using RoleModel = Discord.API.Role;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class Guild : SnowflakeEntity, IGuild
diff --git a/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs b/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
index eae31eabd..135c0f3f3 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/GuildIntegration.cs
@@ -5,7 +5,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using Model = Discord.API.Integration;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class GuildIntegration : Entity<ulong>, IGuildIntegration
diff --git a/src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs b/src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs
index 0803bdb33..3e8818a41 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs
@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using Model = Discord.API.UserGuild;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class UserGuild : SnowflakeEntity, IUserGuild
diff --git a/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs b/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
index bf61a33a6..8f8bbfc53 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/VoiceRegion.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using Model = Discord.API.VoiceRegion;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     internal class VoiceRegion : IVoiceRegion
diff --git a/src/Discord.Net/Rest/Entities/Invites/Invite.cs b/src/Discord.Net/Rest/Entities/Invites/Invite.cs
index 0bad27bf0..c69fcbad4 100644
--- a/src/Discord.Net/Rest/Entities/Invites/Invite.cs
+++ b/src/Discord.Net/Rest/Entities/Invites/Invite.cs
@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using Model = Discord.API.Invite;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class Invite : Entity<string>, IInvite
diff --git a/src/Discord.Net/Rest/Entities/Invites/InviteMetadata.cs b/src/Discord.Net/Rest/Entities/Invites/InviteMetadata.cs
index 8cd3051f2..05a10514c 100644
--- a/src/Discord.Net/Rest/Entities/Invites/InviteMetadata.cs
+++ b/src/Discord.Net/Rest/Entities/Invites/InviteMetadata.cs
@@ -2,7 +2,7 @@
 using System;
 using Model = Discord.API.InviteMetadata;
 
-namespace Discord
+namespace Discord.Rest
 {
     internal class InviteMetadata : Invite, IInviteMetadata
     {
diff --git a/src/Discord.Net/Rest/Entities/Messages/Attachment.cs b/src/Discord.Net/Rest/Entities/Messages/Attachment.cs
index 1cc24749e..b5a94689e 100644
--- a/src/Discord.Net/Rest/Entities/Messages/Attachment.cs
+++ b/src/Discord.Net/Rest/Entities/Messages/Attachment.cs
@@ -1,6 +1,6 @@
 using Model = Discord.API.Attachment;
 
-namespace Discord
+namespace Discord.Rest
 {
     internal class Attachment : IAttachment
     {
diff --git a/src/Discord.Net/Rest/Entities/Messages/Embed.cs b/src/Discord.Net/Rest/Entities/Messages/Embed.cs
index b27caeac2..77c8e28b7 100644
--- a/src/Discord.Net/Rest/Entities/Messages/Embed.cs
+++ b/src/Discord.Net/Rest/Entities/Messages/Embed.cs
@@ -1,6 +1,6 @@
 using Model = Discord.API.Embed;
 
-namespace Discord
+namespace Discord.Rest
 {
     internal class Embed : IEmbed
     {
diff --git a/src/Discord.Net/Rest/Entities/Messages/Message.cs b/src/Discord.Net/Rest/Entities/Messages/Message.cs
index ac06a61f8..11ab10b37 100644
--- a/src/Discord.Net/Rest/Entities/Messages/Message.cs
+++ b/src/Discord.Net/Rest/Entities/Messages/Message.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using Model = Discord.API.Message;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class Message : SnowflakeEntity, IMessage
diff --git a/src/Discord.Net/Rest/Entities/Roles/Role.cs b/src/Discord.Net/Rest/Entities/Roles/Role.cs
index cbcceb0cf..dcb198cd4 100644
--- a/src/Discord.Net/Rest/Entities/Roles/Role.cs
+++ b/src/Discord.Net/Rest/Entities/Roles/Role.cs
@@ -5,7 +5,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using Model = Discord.API.Role;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class Role : SnowflakeEntity, IRole, IMentionable
diff --git a/src/Discord.Net/Rest/Entities/SnowflakeEntity.cs b/src/Discord.Net/Rest/Entities/SnowflakeEntity.cs
index 36ed8714d..f126c8ff5 100644
--- a/src/Discord.Net/Rest/Entities/SnowflakeEntity.cs
+++ b/src/Discord.Net/Rest/Entities/SnowflakeEntity.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Discord
+namespace Discord.Rest
 {
     internal abstract class SnowflakeEntity : Entity<ulong>, ISnowflakeEntity
     {
diff --git a/src/Discord.Net/Rest/Entities/Users/Connection.cs b/src/Discord.Net/Rest/Entities/Users/Connection.cs
index 17507ee44..622bc8730 100644
--- a/src/Discord.Net/Rest/Entities/Users/Connection.cs
+++ b/src/Discord.Net/Rest/Entities/Users/Connection.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using Model = Discord.API.Connection;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class Connection : IConnection
diff --git a/src/Discord.Net/Rest/Entities/Users/GroupUser.cs b/src/Discord.Net/Rest/Entities/Users/GroupUser.cs
index 0d4bc444a..5a0df5cc2 100644
--- a/src/Discord.Net/Rest/Entities/Users/GroupUser.cs
+++ b/src/Discord.Net/Rest/Entities/Users/GroupUser.cs
@@ -3,7 +3,7 @@ using Discord.Rest;
 using System;
 using System.Threading.Tasks;
 
-namespace Discord
+namespace Discord.Rest
 {
     internal class GroupUser : IGroupUser
     {
diff --git a/src/Discord.Net/Rest/Entities/Users/GuildUser.cs b/src/Discord.Net/Rest/Entities/Users/GuildUser.cs
index 5e6d9174e..1c8b2cfc1 100644
--- a/src/Discord.Net/Rest/Entities/Users/GuildUser.cs
+++ b/src/Discord.Net/Rest/Entities/Users/GuildUser.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Model = Discord.API.GuildMember;
 using PresenceModel = Discord.API.Presence;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     internal class GuildUser : IGuildUser, ISnowflakeEntity
diff --git a/src/Discord.Net/Rest/Entities/Users/SelfUser.cs b/src/Discord.Net/Rest/Entities/Users/SelfUser.cs
index 838a45782..ee32fa243 100644
--- a/src/Discord.Net/Rest/Entities/Users/SelfUser.cs
+++ b/src/Discord.Net/Rest/Entities/Users/SelfUser.cs
@@ -4,7 +4,7 @@ using System;
 using System.Threading.Tasks;
 using Model = Discord.API.User;
 
-namespace Discord
+namespace Discord.Rest
 {
     internal class SelfUser : User, ISelfUser
     {
diff --git a/src/Discord.Net/Rest/Entities/Users/User.cs b/src/Discord.Net/Rest/Entities/Users/User.cs
index 8f6ac8259..8f0877b59 100644
--- a/src/Discord.Net/Rest/Entities/Users/User.cs
+++ b/src/Discord.Net/Rest/Entities/Users/User.cs
@@ -3,7 +3,7 @@ using System;
 using System.Diagnostics;
 using Model = Discord.API.User;
 
-namespace Discord
+namespace Discord.Rest
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     internal class User : SnowflakeEntity, IUser
diff --git a/src/Discord.Net/DataStore.cs b/src/Discord.Net/WebSocket/DataStore.cs
similarity index 99%
rename from src/Discord.Net/DataStore.cs
rename to src/Discord.Net/WebSocket/DataStore.cs
index b65bf07f5..9be13b9f0 100644
--- a/src/Discord.Net/DataStore.cs
+++ b/src/Discord.Net/WebSocket/DataStore.cs
@@ -3,7 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class DataStore
     {
diff --git a/src/Discord.Net/WebSocket/DiscordSocketConfig.cs b/src/Discord.Net/WebSocket/DiscordSocketConfig.cs
index b26fcb0da..f1f29b22b 100644
--- a/src/Discord.Net/WebSocket/DiscordSocketConfig.cs
+++ b/src/Discord.Net/WebSocket/DiscordSocketConfig.cs
@@ -2,7 +2,7 @@
 using Discord.Net.WebSockets;
 using Discord.Rest;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     public class DiscordSocketConfig : DiscordRestConfig
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/ISocketChannel.cs b/src/Discord.Net/WebSocket/Entities/Channels/ISocketChannel.cs
index 91535e7c9..d74f35faa 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/ISocketChannel.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/ISocketChannel.cs
@@ -1,6 +1,6 @@
 using Model = Discord.API.Channel;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal interface ISocketChannel : IChannel
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/ISocketGuildChannel.cs b/src/Discord.Net/WebSocket/Entities/Channels/ISocketGuildChannel.cs
index b9925582d..f70a56a53 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/ISocketGuildChannel.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/ISocketGuildChannel.cs
@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord.WebSocket
 {
     internal interface ISocketGuildChannel : ISocketChannel, IGuildChannel
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/ISocketMessageChannel.cs b/src/Discord.Net/WebSocket/Entities/Channels/ISocketMessageChannel.cs
index e1a538719..d576f0452 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/ISocketMessageChannel.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/ISocketMessageChannel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using MessageModel = Discord.API.Message;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal interface ISocketMessageChannel : ISocketChannel, IMessageChannel
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/ISocketPrivateChannel.cs b/src/Discord.Net/WebSocket/Entities/Channels/ISocketPrivateChannel.cs
index 609aea3b6..e38107da6 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/ISocketPrivateChannel.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/ISocketPrivateChannel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal interface ISocketPrivateChannel : ISocketChannel, IPrivateChannel
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/MessageCache.cs b/src/Discord.Net/WebSocket/Entities/Channels/MessageCache.cs
index de6d0544a..e48135b03 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/MessageCache.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/MessageCache.cs
@@ -1,13 +1,11 @@
-using Discord.Rest;
-using Discord.WebSocket;
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class MessageCache : MessageManager
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/MessageManager.cs b/src/Discord.Net/WebSocket/Entities/Channels/MessageManager.cs
index f44766b99..3eb253bea 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/MessageManager.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/MessageManager.cs
@@ -1,13 +1,12 @@
 using Discord.API.Rest;
 using Discord.Rest;
-using Discord.WebSocket;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class MessageManager
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/SocketDMChannel.cs b/src/Discord.Net/WebSocket/Entities/Channels/SocketDMChannel.cs
index 92e8661eb..6751f4899 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/SocketDMChannel.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/SocketDMChannel.cs
@@ -1,11 +1,11 @@
-using Discord.WebSocket;
+using Discord.Rest;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading.Tasks;
 using MessageModel = Discord.API.Message;
 using Model = Discord.API.Channel;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketDMChannel : DMChannel, IDMChannel, ISocketChannel, ISocketMessageChannel, ISocketPrivateChannel
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/SocketGroupChannel.cs b/src/Discord.Net/WebSocket/Entities/Channels/SocketGroupChannel.cs
index 368a19bfb..8751610cf 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/SocketGroupChannel.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/SocketGroupChannel.cs
@@ -1,4 +1,4 @@
-using Discord.WebSocket;
+using Discord.Rest;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -9,7 +9,7 @@ using Model = Discord.API.Channel;
 using UserModel = Discord.API.User;
 using VoiceStateModel = Discord.API.VoiceState;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketGroupChannel : GroupChannel, IGroupChannel, ISocketChannel, ISocketMessageChannel, ISocketPrivateChannel
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/SocketTextChannel.cs b/src/Discord.Net/WebSocket/Entities/Channels/SocketTextChannel.cs
index 0cbec16cd..6046453c7 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/SocketTextChannel.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/SocketTextChannel.cs
@@ -1,5 +1,4 @@
 using Discord.Rest;
-using Discord.WebSocket;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -7,7 +6,7 @@ using System.Threading.Tasks;
 using MessageModel = Discord.API.Message;
 using Model = Discord.API.Channel;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketTextChannel : TextChannel, ISocketGuildChannel, ISocketMessageChannel
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Channels/SocketVoiceChannel.cs b/src/Discord.Net/WebSocket/Entities/Channels/SocketVoiceChannel.cs
index fbd9d061e..4f6438254 100644
--- a/src/Discord.Net/WebSocket/Entities/Channels/SocketVoiceChannel.cs
+++ b/src/Discord.Net/WebSocket/Entities/Channels/SocketVoiceChannel.cs
@@ -1,5 +1,5 @@
 using Discord.Audio;
-using Discord.WebSocket;
+using Discord.Rest;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Model = Discord.API.Channel;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketVoiceChannel : VoiceChannel, ISocketGuildChannel
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs
index 4bf30a725..fd59bc3e7 100644
--- a/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net/WebSocket/Entities/Guilds/SocketGuild.cs
@@ -1,5 +1,5 @@
 using Discord.Audio;
-using Discord.WebSocket;
+using Discord.Rest;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -17,7 +17,7 @@ using PresenceModel = Discord.API.Presence;
 using RoleModel = Discord.API.Role;
 using VoiceStateModel = Discord.API.VoiceState;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketGuild : Guild, IGuild, IUserGuild
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Messages/SocketMessage.cs b/src/Discord.Net/WebSocket/Entities/Messages/SocketMessage.cs
index 8441e9143..51e02a30c 100644
--- a/src/Discord.Net/WebSocket/Entities/Messages/SocketMessage.cs
+++ b/src/Discord.Net/WebSocket/Entities/Messages/SocketMessage.cs
@@ -1,7 +1,7 @@
-using Discord.WebSocket;
+using Discord.Rest;
 using Model = Discord.API.Message;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketMessage : Message
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Users/ISocketUser.cs b/src/Discord.Net/WebSocket/Entities/Users/ISocketUser.cs
index 4b0b7bfdf..bf152eae2 100644
--- a/src/Discord.Net/WebSocket/Entities/Users/ISocketUser.cs
+++ b/src/Discord.Net/WebSocket/Entities/Users/ISocketUser.cs
@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord.WebSocket
 {
     internal interface ISocketUser : IUser, IEntity<ulong>
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Users/Presence.cs b/src/Discord.Net/WebSocket/Entities/Users/Presence.cs
index fa34251f8..dad784870 100644
--- a/src/Discord.Net/WebSocket/Entities/Users/Presence.cs
+++ b/src/Discord.Net/WebSocket/Entities/Users/Presence.cs
@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord.WebSocket
 {
     //TODO: C#7 Candidate for record type
     internal struct Presence : IPresence
diff --git a/src/Discord.Net/WebSocket/Entities/Users/SocketDMUser.cs b/src/Discord.Net/WebSocket/Entities/Users/SocketDMUser.cs
index da1cc009f..b996ce94c 100644
--- a/src/Discord.Net/WebSocket/Entities/Users/SocketDMUser.cs
+++ b/src/Discord.Net/WebSocket/Entities/Users/SocketDMUser.cs
@@ -1,9 +1,8 @@
-using Discord.WebSocket;
-using System;
+using System;
 using System.Diagnostics;
 using PresenceModel = Discord.API.Presence;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     internal class SocketDMUser : ISocketUser
diff --git a/src/Discord.Net/WebSocket/Entities/Users/SocketGlobalUser.cs b/src/Discord.Net/WebSocket/Entities/Users/SocketGlobalUser.cs
index bc7519748..3835dcc46 100644
--- a/src/Discord.Net/WebSocket/Entities/Users/SocketGlobalUser.cs
+++ b/src/Discord.Net/WebSocket/Entities/Users/SocketGlobalUser.cs
@@ -1,9 +1,9 @@
-using Discord.WebSocket;
+using Discord.Rest;
 using System;
 using Model = Discord.API.User;
 using PresenceModel = Discord.API.Presence;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketGlobalUser : User, ISocketUser
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Users/SocketGroupUser.cs b/src/Discord.Net/WebSocket/Entities/Users/SocketGroupUser.cs
index a4bda52e3..f19dc6b9d 100644
--- a/src/Discord.Net/WebSocket/Entities/Users/SocketGroupUser.cs
+++ b/src/Discord.Net/WebSocket/Entities/Users/SocketGroupUser.cs
@@ -1,7 +1,7 @@
-using Discord.WebSocket;
+using Discord.Rest;
 using System.Diagnostics;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     internal class SocketGroupUser : GroupUser, ISocketUser
diff --git a/src/Discord.Net/WebSocket/Entities/Users/SocketGuildUser.cs b/src/Discord.Net/WebSocket/Entities/Users/SocketGuildUser.cs
index 3bae4f069..5c957dada 100644
--- a/src/Discord.Net/WebSocket/Entities/Users/SocketGuildUser.cs
+++ b/src/Discord.Net/WebSocket/Entities/Users/SocketGuildUser.cs
@@ -1,8 +1,8 @@
-using Discord.WebSocket;
+using Discord.Rest;
 using Model = Discord.API.GuildMember;
 using PresenceModel = Discord.API.Presence;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketGuildUser : GuildUser, ISocketUser
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Users/SocketSelfUser.cs b/src/Discord.Net/WebSocket/Entities/Users/SocketSelfUser.cs
index 1887376b7..e0acfbfc1 100644
--- a/src/Discord.Net/WebSocket/Entities/Users/SocketSelfUser.cs
+++ b/src/Discord.Net/WebSocket/Entities/Users/SocketSelfUser.cs
@@ -1,10 +1,10 @@
 using Discord.API.Rest;
-using Discord.WebSocket;
+using Discord.Rest;
 using System;
 using System.Threading.Tasks;
 using Model = Discord.API.User;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     internal class SocketSelfUser : SelfUser, ISocketUser, ISelfUser
     {
diff --git a/src/Discord.Net/WebSocket/Entities/Users/VoiceState.cs b/src/Discord.Net/WebSocket/Entities/Users/VoiceState.cs
index 138c025a8..123c7ee98 100644
--- a/src/Discord.Net/WebSocket/Entities/Users/VoiceState.cs
+++ b/src/Discord.Net/WebSocket/Entities/Users/VoiceState.cs
@@ -1,7 +1,7 @@
 using System;
 using Model = Discord.API.VoiceState;
 
-namespace Discord
+namespace Discord.WebSocket
 {
     //TODO: C#7 Candidate for record type
     internal struct VoiceState : IVoiceState