diff --git a/Octokit.Tests/Clients/AuthorizationsClientTests.cs b/Octokit.Tests/Clients/AuthorizationsClientTests.cs
index 02c5aaa1..8ab49c0d 100644
--- a/Octokit.Tests/Clients/AuthorizationsClientTests.cs
+++ b/Octokit.Tests/Clients/AuthorizationsClientTests.cs
@@ -1,6 +1,5 @@
 using System;
 using NSubstitute;
-using Octokit.Clients;
 using Octokit.Http;
 using Xunit;
 
diff --git a/Octokit.Tests/Clients/MiscellaneousClientTests.cs b/Octokit.Tests/Clients/MiscellaneousClientTests.cs
index 835113f0..fcf5cdb5 100644
--- a/Octokit.Tests/Clients/MiscellaneousClientTests.cs
+++ b/Octokit.Tests/Clients/MiscellaneousClientTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NSubstitute;
-using Octokit.Clients;
 using Octokit.Http;
 using Xunit;
 
diff --git a/Octokit.Tests/Clients/OrganizationsClientTests.cs b/Octokit.Tests/Clients/OrganizationsClientTests.cs
index 5e38adaf..a0dd0719 100644
--- a/Octokit.Tests/Clients/OrganizationsClientTests.cs
+++ b/Octokit.Tests/Clients/OrganizationsClientTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using NSubstitute;
-using Octokit.Clients;
 using Octokit.Http;
 using Octokit.Tests.Helpers;
 using Xunit;
diff --git a/Octokit.Tests/Clients/ReleasesClientTests.cs b/Octokit.Tests/Clients/ReleasesClientTests.cs
index a5af7d07..45f74c4a 100644
--- a/Octokit.Tests/Clients/ReleasesClientTests.cs
+++ b/Octokit.Tests/Clients/ReleasesClientTests.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using NSubstitute;
-using Octokit.Clients;
 using Octokit.Http;
 using Octokit.Tests.Helpers;
 using Xunit;
diff --git a/Octokit.Tests/Clients/RepositoriesClientTests.cs b/Octokit.Tests/Clients/RepositoriesClientTests.cs
index 2c9a698d..899b2a42 100644
--- a/Octokit.Tests/Clients/RepositoriesClientTests.cs
+++ b/Octokit.Tests/Clients/RepositoriesClientTests.cs
@@ -2,7 +2,6 @@ using System;
 using System.Text;
 using System.Threading.Tasks;
 using NSubstitute;
-using Octokit.Clients;
 using Octokit.Http;
 using Octokit.Tests.Helpers;
 using Xunit;
diff --git a/Octokit.Tests/Clients/SshKeysClientTests.cs b/Octokit.Tests/Clients/SshKeysClientTests.cs
index 8de2d0d0..fc088cef 100644
--- a/Octokit.Tests/Clients/SshKeysClientTests.cs
+++ b/Octokit.Tests/Clients/SshKeysClientTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using NSubstitute;
-using Octokit.Clients;
 using Octokit.Http;
 using Octokit.Tests.Helpers;
 using Xunit;
diff --git a/Octokit.Tests/Clients/UsersClientTests.cs b/Octokit.Tests/Clients/UsersClientTests.cs
index c742cf70..b427d3e5 100644
--- a/Octokit.Tests/Clients/UsersClientTests.cs
+++ b/Octokit.Tests/Clients/UsersClientTests.cs
@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
 #endif
 using System.Threading.Tasks;
 using NSubstitute;
-using Octokit.Clients;
 using Octokit.Http;
 using Octokit.Tests.Helpers;
 using Xunit;
diff --git a/Octokit/Clients/ApiClient.cs b/Octokit/Clients/ApiClient.cs
index 39ba72da..a22223da 100644
--- a/Octokit/Clients/ApiClient.cs
+++ b/Octokit/Clients/ApiClient.cs
@@ -1,6 +1,6 @@
 using Octokit.Http;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     public abstract class ApiClient<T>
     {
diff --git a/Octokit/Clients/ApiPagination.cs b/Octokit/Clients/ApiPagination.cs
index bd78158d..01b674e8 100644
--- a/Octokit/Clients/ApiPagination.cs
+++ b/Octokit/Clients/ApiPagination.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+#if NET_45
 using System.Collections.ObjectModel;
+#endif
 using System.Threading.Tasks;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     /// <summary>
     /// Used to paginate through API response results.
diff --git a/Octokit/Clients/AuthorizationsClient.cs b/Octokit/Clients/AuthorizationsClient.cs
index 742c5179..e4ea1732 100644
--- a/Octokit/Clients/AuthorizationsClient.cs
+++ b/Octokit/Clients/AuthorizationsClient.cs
@@ -1,9 +1,11 @@
 using System;
+#if NET_45
 using System.Collections.Generic;
+#endif
 using System.Threading.Tasks;
 using Octokit.Http;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     public class AuthorizationsClient : ApiClient<Authorization>, IAuthorizationsClient
     {
diff --git a/Octokit/Clients/MiscellaneousClient.cs b/Octokit/Clients/MiscellaneousClient.cs
index 41bda033..55faec09 100644
--- a/Octokit/Clients/MiscellaneousClient.cs
+++ b/Octokit/Clients/MiscellaneousClient.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+#if NET_45
 using System.Collections.ObjectModel;
+#endif
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit.Http;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     public class MiscellaneousClient : IMiscellaneousClient
     {
diff --git a/Octokit/Clients/OrganizationsClient.cs b/Octokit/Clients/OrganizationsClient.cs
index ef07c5f4..30233eae 100644
--- a/Octokit/Clients/OrganizationsClient.cs
+++ b/Octokit/Clients/OrganizationsClient.cs
@@ -1,9 +1,11 @@
 using System;
+#if NET_45
 using System.Collections.Generic;
+#endif
 using System.Threading.Tasks;
 using Octokit.Http;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     public class OrganizationsClient : ApiClient<Organization>, IOrganizationsClient
     {
diff --git a/Octokit/Clients/ReleasesClient.cs b/Octokit/Clients/ReleasesClient.cs
index 884865a8..6a92f2b7 100644
--- a/Octokit/Clients/ReleasesClient.cs
+++ b/Octokit/Clients/ReleasesClient.cs
@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+#if NET_45
+using System.Collections.Generic;
+#endif
 using System.Threading.Tasks;
 using Octokit.Http;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     public class ReleasesClient : ApiClient<Release>, IReleasesClient
     {
diff --git a/Octokit/Clients/RepositoriesClient.cs b/Octokit/Clients/RepositoriesClient.cs
index 4480c465..8ccf72e4 100644
--- a/Octokit/Clients/RepositoriesClient.cs
+++ b/Octokit/Clients/RepositoriesClient.cs
@@ -1,9 +1,11 @@
 using System;
+#if NET_45
 using System.Collections.Generic;
+#endif
 using System.Threading.Tasks;
 using Octokit.Http;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     public class RepositoriesClient : ApiClient<Repository>, IRepositoriesClient
     {
diff --git a/Octokit/Clients/SshKeysClient.cs b/Octokit/Clients/SshKeysClient.cs
index 8a706f32..1b174915 100644
--- a/Octokit/Clients/SshKeysClient.cs
+++ b/Octokit/Clients/SshKeysClient.cs
@@ -1,9 +1,11 @@
 using System;
+#if NET_45
 using System.Collections.Generic;
+#endif
 using System.Threading.Tasks;
 using Octokit.Http;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     public class SshKeysClient : ApiClient<SshKey>, ISshKeysClient
     {
diff --git a/Octokit/Clients/UsersClient.cs b/Octokit/Clients/UsersClient.cs
index a8e67a3c..713bc13d 100644
--- a/Octokit/Clients/UsersClient.cs
+++ b/Octokit/Clients/UsersClient.cs
@@ -1,10 +1,12 @@
 using System;
+#if NET_45
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+#endif
 using System.Threading.Tasks;
 using Octokit.Http;
 
-namespace Octokit.Clients
+namespace Octokit
 {
     /// <summary>
     /// Supports the ability to get and update users via the GitHub API v3.
diff --git a/Octokit/GitHubClient.cs b/Octokit/GitHubClient.cs
index 081c2194..0526f5cc 100644
--- a/Octokit/GitHubClient.cs
+++ b/Octokit/GitHubClient.cs
@@ -1,5 +1,4 @@
 using System;
-using Octokit.Clients;
 using Octokit.Http;
 
 namespace Octokit
diff --git a/Octokit/Http/ApiConnection.cs b/Octokit/Http/ApiConnection.cs
index 1c124fa4..54f2035e 100644
--- a/Octokit/Http/ApiConnection.cs
+++ b/Octokit/Http/ApiConnection.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Octokit.Clients;
 
 namespace Octokit.Http
 {
diff --git a/Octokit/Octokit.csproj.DotSettings b/Octokit/Octokit.csproj.DotSettings
index 58b4dfd1..0131cf58 100644
--- a/Octokit/Octokit.csproj.DotSettings
+++ b/Octokit/Octokit.csproj.DotSettings
@@ -1,2 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=Clients/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=Exceptions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=Helpers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=Models/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file