diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj
index 5f2abf662..d5e5639f8 100644
--- a/src/Discord.Net.Net45/Discord.Net.csproj
+++ b/src/Discord.Net.Net45/Discord.Net.csproj
@@ -176,18 +176,6 @@
     <Compile Include="..\Discord.Net\Helpers\Reference.cs">
       <Link>Helpers\Reference.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\HttpException.cs">
-      <Link>HttpException.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\IService.cs">
-      <Link>IService.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\LogExtensions.cs">
-      <Link>LogExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\Discord.Net\LogService.cs">
-      <Link>LogService.cs</Link>
-    </Compile>
     <Compile Include="..\Discord.Net\Models\Channel.cs">
       <Link>Models\Channel.cs</Link>
     </Compile>
@@ -218,6 +206,9 @@
     <Compile Include="..\Discord.Net\Models\User.cs">
       <Link>Models\User.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\Net\HttpException.cs">
+      <Link>Net\HttpException.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\Net\Rest\IRestEngine.cs">
       <Link>Net\Rest\IRestEngine.cs</Link>
     </Compile>
@@ -230,6 +221,9 @@
     <Compile Include="..\Discord.Net\Net\Rest\SharpRestEngine.cs">
       <Link>Net\Rest\SharpRestEngine.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\Net\TimeoutException.cs">
+      <Link>Net\TimeoutException.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\Net\WebSockets\GatewayWebSocket.cs">
       <Link>Net\WebSockets\GatewayWebSocket.cs</Link>
     </Compile>
@@ -245,8 +239,14 @@
     <Compile Include="..\Discord.Net\Net\WebSockets\WebSocketSharpEngine.cs">
       <Link>Net\WebSockets\WebSocketSharpEngine.cs</Link>
     </Compile>
-    <Compile Include="..\Discord.Net\TimeoutException.cs">
-      <Link>TimeoutException.cs</Link>
+    <Compile Include="..\Discord.Net\Services\IService.cs">
+      <Link>Services\IService.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Services\LogExtensions.cs">
+      <Link>Services\LogExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Discord.Net\Services\LogService.cs">
+      <Link>Services\LogService.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/src/Discord.Net/DiscordClient.Channels.cs b/src/Discord.Net/DiscordClient.Channels.cs
index 5d95272f8..99012bf93 100644
--- a/src/Discord.Net/DiscordClient.Channels.cs
+++ b/src/Discord.Net/DiscordClient.Channels.cs
@@ -1,3 +1,4 @@
+using Discord.Net;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/src/Discord.Net/DiscordClient.Invites.cs b/src/Discord.Net/DiscordClient.Invites.cs
index bfdb7325c..5358b1090 100644
--- a/src/Discord.Net/DiscordClient.Invites.cs
+++ b/src/Discord.Net/DiscordClient.Invites.cs
@@ -1,3 +1,4 @@
+using Discord.Net;
 using System;
 using System.Linq;
 using System.Net;
diff --git a/src/Discord.Net/DiscordClient.Messages.cs b/src/Discord.Net/DiscordClient.Messages.cs
index 727c9c755..61b614bf0 100644
--- a/src/Discord.Net/DiscordClient.Messages.cs
+++ b/src/Discord.Net/DiscordClient.Messages.cs
@@ -1,4 +1,5 @@
 using Discord.API;
+using Discord.Net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
diff --git a/src/Discord.Net/DiscordClient.Permissions.cs b/src/Discord.Net/DiscordClient.Permissions.cs
index 6c8a3c46f..7a10179c9 100644
--- a/src/Discord.Net/DiscordClient.Permissions.cs
+++ b/src/Discord.Net/DiscordClient.Permissions.cs
@@ -1,3 +1,4 @@
+using Discord.Net;
 using System;
 using System.Linq;
 using System.Net;
diff --git a/src/Discord.Net/DiscordClient.Roles.cs b/src/Discord.Net/DiscordClient.Roles.cs
index 03d884e66..7ecb66b9a 100644
--- a/src/Discord.Net/DiscordClient.Roles.cs
+++ b/src/Discord.Net/DiscordClient.Roles.cs
@@ -1,3 +1,4 @@
+using Discord.Net;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -140,7 +141,7 @@ namespace Discord
 			CheckReady();
 
 			try { await _api.DeleteRole(role.Server.Id, role.Id); }
-			catch (HttpException ex) when(ex.StatusCode == HttpStatusCode.NotFound) { }
+			catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { }
 	}
 
 		public Task ReorderRoles(Server server, IEnumerable<Role> roles, int startPos = 0)
diff --git a/src/Discord.Net/DiscordClient.Servers.cs b/src/Discord.Net/DiscordClient.Servers.cs
index 14960bc44..9a0d34699 100644
--- a/src/Discord.Net/DiscordClient.Servers.cs
+++ b/src/Discord.Net/DiscordClient.Servers.cs
@@ -1,3 +1,4 @@
+using Discord.Net;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Discord.Net/DiscordClient.Users.cs b/src/Discord.Net/DiscordClient.Users.cs
index e9c918a4f..0e69d1753 100644
--- a/src/Discord.Net/DiscordClient.Users.cs
+++ b/src/Discord.Net/DiscordClient.Users.cs
@@ -1,4 +1,5 @@
-using System;
+using Discord.Net;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/src/Discord.Net/HttpException.cs b/src/Discord.Net/Net/HttpException.cs
similarity index 93%
rename from src/Discord.Net/HttpException.cs
rename to src/Discord.Net/Net/HttpException.cs
index 420d885ef..84ae66530 100644
--- a/src/Discord.Net/HttpException.cs
+++ b/src/Discord.Net/Net/HttpException.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net;
 
-namespace Discord
+namespace Discord.Net
 {
 	public class HttpException : Exception
 	{
diff --git a/src/Discord.Net/TimeoutException.cs b/src/Discord.Net/Net/TimeoutException.cs
similarity index 88%
rename from src/Discord.Net/TimeoutException.cs
rename to src/Discord.Net/Net/TimeoutException.cs
index 1c831946f..090d1e5d4 100644
--- a/src/Discord.Net/TimeoutException.cs
+++ b/src/Discord.Net/Net/TimeoutException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Discord
+namespace Discord.Net
 {
 	public sealed class TimeoutException : OperationCanceledException
 	{
diff --git a/src/Discord.Net/IService.cs b/src/Discord.Net/Services/IService.cs
similarity index 99%
rename from src/Discord.Net/IService.cs
rename to src/Discord.Net/Services/IService.cs
index 6f75b3c2d..cf60f70d1 100644
--- a/src/Discord.Net/IService.cs
+++ b/src/Discord.Net/Services/IService.cs
@@ -2,7 +2,6 @@
 {
     public interface IService
     {
-
 		void Install(DiscordClient client);
     }
 }
diff --git a/src/Discord.Net/LogExtensions.cs b/src/Discord.Net/Services/LogExtensions.cs
similarity index 100%
rename from src/Discord.Net/LogExtensions.cs
rename to src/Discord.Net/Services/LogExtensions.cs
diff --git a/src/Discord.Net/LogService.cs b/src/Discord.Net/Services/LogService.cs
similarity index 100%
rename from src/Discord.Net/LogService.cs
rename to src/Discord.Net/Services/LogService.cs