diff --git a/Discord.Net.Tests/ChannelTests.cs b/Discord.Net.Tests/ChannelTests.cs
index 82ca45c41..c88d69590 100644
--- a/Discord.Net.Tests/ChannelTests.cs
+++ b/Discord.Net.Tests/ChannelTests.cs
@@ -1,5 +1,4 @@
-using Discord.Models;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/Discord.Net.Tests/Discord.Net.Tests.csproj b/Discord.Net.Tests/Discord.Net.Tests.csproj
index 15c96c217..89ea64202 100644
--- a/Discord.Net.Tests/Discord.Net.Tests.csproj
+++ b/Discord.Net.Tests/Discord.Net.Tests.csproj
@@ -51,8 +51,8 @@
   </Choose>
   <ItemGroup>
     <Compile Include="ChannelTests.cs" />
+    <Compile Include="Credentials.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Discord.Net\Discord.Net.csproj">
diff --git a/Discord.Net/Models/Channel.cs b/Discord.Net/Channel.cs
similarity index 97%
rename from Discord.Net/Models/Channel.cs
rename to Discord.Net/Channel.cs
index 09e449a80..31fff3cbb 100644
--- a/Discord.Net/Models/Channel.cs
+++ b/Discord.Net/Channel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Discord.Models
+namespace Discord
 {
 	public sealed class Channel
 	{
diff --git a/Discord.Net/Discord.Net.csproj b/Discord.Net/Discord.Net.csproj
index e0f31cce0..5968f7cb4 100644
--- a/Discord.Net/Discord.Net.csproj
+++ b/Discord.Net/Discord.Net.csproj
@@ -51,10 +51,10 @@
     <Compile Include="API\Models\APIResponses.cs" />
     <Compile Include="API\Models\WebSocketCommands.cs" />
     <Compile Include="Helpers\AsyncCache.cs" />
-    <Compile Include="Models\Invite.cs" />
-    <Compile Include="Models\Role.cs" />
-    <Compile Include="Models\Message.cs" />
-    <Compile Include="Models\Channel.cs" />
+    <Compile Include="Invite.cs" />
+    <Compile Include="Role.cs" />
+    <Compile Include="Message.cs" />
+    <Compile Include="Channel.cs" />
     <Compile Include="DiscordWebSocket.Events.cs" />
     <Compile Include="Helpers\Http.cs" />
     <Compile Include="API\DiscordAPI.cs" />
@@ -64,8 +64,8 @@
     <Compile Include="DiscordClient.Events.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DiscordWebSocket.cs" />
-    <Compile Include="Models\Server.cs" />
-    <Compile Include="Models\User.cs" />
+    <Compile Include="Server.cs" />
+    <Compile Include="User.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/Discord.Net/DiscordClient.Events.cs b/Discord.Net/DiscordClient.Events.cs
index 8ab4ea21c..ee60e4057 100644
--- a/Discord.Net/DiscordClient.Events.cs
+++ b/Discord.Net/DiscordClient.Events.cs
@@ -1,5 +1,4 @@
-using Discord.Models;
-using System;
+using System;
 
 namespace Discord
 {
diff --git a/Discord.Net/DiscordClient.cs b/Discord.Net/DiscordClient.cs
index 1c0200e8b..7656dacf4 100644
--- a/Discord.Net/DiscordClient.cs
+++ b/Discord.Net/DiscordClient.cs
@@ -1,15 +1,12 @@
 using Discord.API;
 using Discord.API.Models;
 using Discord.Helpers;
-using Discord.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using Message = Discord.Models.Message;
-using Role = Discord.Models.Role;
 
 namespace Discord
 {
diff --git a/Discord.Net/Models/Invite.cs b/Discord.Net/Invite.cs
similarity index 96%
rename from Discord.Net/Models/Invite.cs
rename to Discord.Net/Invite.cs
index 972b8f1fe..64481a651 100644
--- a/Discord.Net/Models/Invite.cs
+++ b/Discord.Net/Invite.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Discord.Models
+namespace Discord
 {
 	public sealed class Invite
 	{
diff --git a/Discord.Net/Models/Message.cs b/Discord.Net/Message.cs
similarity index 97%
rename from Discord.Net/Models/Message.cs
rename to Discord.Net/Message.cs
index e8fc57e37..fce6aa722 100644
--- a/Discord.Net/Models/Message.cs
+++ b/Discord.Net/Message.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System;
 
-namespace Discord.Models
+namespace Discord
 {
 	public sealed class Message
 	{
diff --git a/Discord.Net/Models/Role.cs b/Discord.Net/Role.cs
similarity index 95%
rename from Discord.Net/Models/Role.cs
rename to Discord.Net/Role.cs
index 1c6d47a8e..ccc774dfc 100644
--- a/Discord.Net/Models/Role.cs
+++ b/Discord.Net/Role.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Discord.Models
+namespace Discord
 {
 	public sealed class Role
 	{
diff --git a/Discord.Net/Models/Server.cs b/Discord.Net/Server.cs
similarity index 98%
rename from Discord.Net/Models/Server.cs
rename to Discord.Net/Server.cs
index 36840f8b1..481b1d9f4 100644
--- a/Discord.Net/Models/Server.cs
+++ b/Discord.Net/Server.cs
@@ -5,7 +5,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Discord.Models
+namespace Discord
 {
 	public sealed class Server
 	{
diff --git a/Discord.Net/Models/User.cs b/Discord.Net/User.cs
similarity index 97%
rename from Discord.Net/Models/User.cs
rename to Discord.Net/User.cs
index f9f528e89..b38ce01bc 100644
--- a/Discord.Net/Models/User.cs
+++ b/Discord.Net/User.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Discord.Models
+namespace Discord
 {
 	public sealed class User
 	{