Cleaned up internal entity namespaces

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;

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
     {

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

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

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

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

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

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>
     {

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

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

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

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

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

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
     {

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
     {

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
     {

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

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

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
     {

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

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
     {

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

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
     {

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

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
     {

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
     {

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
     {

src/Discord.Net/WebSocket/Entities/Channels/ISocketGuildChannel.cs

@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord.WebSocket
 {
     internal interface ISocketGuildChannel : ISocketChannel, IGuildChannel
     {

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
     {

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
     {

src/Discord.Net/WebSocket/Entities/Channels/MessageCache.cs

@@ -1,13 +1,11 @@
-using Discord.Rest;
+using System;
-using Discord.WebSocket;
-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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

src/Discord.Net/WebSocket/Entities/Users/ISocketUser.cs

@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord.WebSocket
 {
     internal interface ISocketUser : IUser, IEntity<ulong>
     {

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

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

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
     {

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

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
     {

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
     {

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