diff --git a/ref/MessageQueue.cs b/ref/MessageQueue.cs
index e909bdacf..5f56abd1e 100644
--- a/ref/MessageQueue.cs
+++ b/ref/MessageQueue.cs
@@ -1,4 +1,4 @@
-namespace Discord.Net
+namespace Discord
 {
     public class MessageQueue
     {
diff --git a/ref/Net/Rest/IRestClient.cs b/ref/Net/Rest/IRestClient.cs
new file mode 100644
index 000000000..83c0405c7
--- /dev/null
+++ b/ref/Net/Rest/IRestClient.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Discord.Net.Rest
+{
+    public interface IRestClient
+	{
+        event EventHandler<RequestEventArgs> SendingRequest;
+        event EventHandler<CompletedRequestEventArgs> SentRequest;
+
+        CancellationToken CancelToken { get; }
+        string Token { get; }
+
+        Task<ResponseT> Send<ResponseT>(IRestRequest<ResponseT> request)
+            where ResponseT : class;
+        Task Send(IRestRequest request);
+
+        Task<ResponseT> Send<ResponseT>(IRestFileRequest<ResponseT> request)
+            where ResponseT : class;
+        Task Send(IRestFileRequest request);
+	}
+}
diff --git a/ref/Net/Rest/RestClient.cs b/ref/Net/Rest/RestClient.cs
deleted file mode 100644
index 33de1e9a4..000000000
--- a/ref/Net/Rest/RestClient.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Discord.Net.Rest
-{
-    public abstract partial class RestClient
-	{
-        public event EventHandler<RequestEventArgs> SendingRequest = delegate { };
-        public event EventHandler<CompletedRequestEventArgs> SentRequest = delegate { };
-
-        public CancellationToken CancelToken { get; set; }
-        public string Token { get; set; }
-        
-        public Task<ResponseT> Send<ResponseT>(IRestRequest<ResponseT> request)
-			where ResponseT : class 
-            => null;
-        public Task Send(IRestRequest request) => null;
-
-        public Task<ResponseT> Send<ResponseT>(IRestFileRequest<ResponseT> request)
-            where ResponseT : class 
-            => null;
-        public Task Send(IRestFileRequest request)  => null;
-	}
-}
diff --git a/ref/Net/WebSockets/GatewaySocket.cs b/ref/Net/WebSockets/GatewaySocket.cs
index 65ec02fad..e8f2ddd3d 100644
--- a/ref/Net/WebSockets/GatewaySocket.cs
+++ b/ref/Net/WebSockets/GatewaySocket.cs
@@ -1,5 +1,4 @@
-using Discord.Logging;
-using Discord.Net.Rest;
+using Discord.Net.Rest;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -7,25 +6,23 @@ using System.Threading.Tasks;
 
 namespace Discord.Net.WebSockets
 {
-    public class GatewaySocket : WebSocket
+    public class GatewaySocket
     {
-        public string SessionId { get; private set; }
+        public string SessionId { get; }
 
         public event EventHandler<WebSocketEventEventArgs> ReceivedDispatch = delegate { };
 
-        public GatewaySocket(DiscordConfig config, ILogger logger) : base(config, logger) { }
-
-        public Task Connect(RestClient rest, CancellationToken parentCancelToken) => null;
+        public Task Connect(IRestClient rest, CancellationToken parentCancelToken) => null;
         public Task Disconnect() => null;
 
         public void SendIdentify(string token) { }
 
         public void SendResume() { }
-        public override void SendHeartbeat() { }
+        public void SendHeartbeat() { }
         public void SendUpdateStatus(long? idleSince, string gameName) { }
         public void SendUpdateVoice(ulong? serverId, ulong? channelId, bool isSelfMuted, bool isSelfDeafened) { }
         public void SendRequestMembers(IEnumerable<ulong> serverId, string query, int limit) { }
         
-        public override void WaitForConnection(CancellationToken cancelToken) { }
+        public void WaitForConnection(CancellationToken cancelToken) { }
     }
 }