diff --git a/Octokit.Reactive/Clients/ObservableAuthorizationsClient.cs b/Octokit.Reactive/Clients/ObservableAuthorizationsClient.cs
index 0a1b6b5c..253f80d9 100644
--- a/Octokit.Reactive/Clients/ObservableAuthorizationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableAuthorizationsClient.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Reactive;
 using System.Reactive.Threading.Tasks;
-using Octokit.Reactive.Helpers;
+using Octokit.Reactive.Internal;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     public class ObservableAuthorizationsClient : IObservableAuthorizationsClient
     {
diff --git a/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs b/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
index 444b2c05..d18d4c12 100644
--- a/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
+++ b/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Reactive.Threading.Tasks;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     public class ObservableMiscellaneousClient : IObservableMiscellaneousClient
     {
diff --git a/Octokit.Reactive/Clients/ObservableOrganizationsClient.cs b/Octokit.Reactive/Clients/ObservableOrganizationsClient.cs
index 014e7e17..621c0c62 100644
--- a/Octokit.Reactive/Clients/ObservableOrganizationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableOrganizationsClient.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Reactive.Threading.Tasks;
-using Octokit.Reactive.Helpers;
+using Octokit.Reactive.Internal;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     public class ObservableOrganizationsClient : IObservableOrganizationsClient
     {
diff --git a/Octokit.Reactive/Clients/ObservableReleasesClient.cs b/Octokit.Reactive/Clients/ObservableReleasesClient.cs
index faff51a7..45ed8cea 100644
--- a/Octokit.Reactive/Clients/ObservableReleasesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableReleasesClient.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Reactive.Threading.Tasks;
-using Octokit.Reactive.Helpers;
+using Octokit.Reactive.Internal;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     public class ObservableReleasesClient : IObservableReleasesClient
     {
diff --git a/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs b/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs
index 2a8d8a89..a6ff5115 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Reactive;
 using System.Reactive.Threading.Tasks;
-using Octokit.Reactive.Helpers;
+using Octokit.Reactive.Internal;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     public class ObservableRepositoriesClient : IObservableRepositoriesClient
     {
diff --git a/Octokit.Reactive/Clients/ObservableSshKeysClient.cs b/Octokit.Reactive/Clients/ObservableSshKeysClient.cs
index 17a2f6e1..f94c6612 100644
--- a/Octokit.Reactive/Clients/ObservableSshKeysClient.cs
+++ b/Octokit.Reactive/Clients/ObservableSshKeysClient.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Reactive;
 using System.Reactive.Threading.Tasks;
-using Octokit.Reactive.Helpers;
+using Octokit.Reactive.Internal;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     public class ObservableSshKeysClient : IObservableSshKeysClient
     {
diff --git a/Octokit.Reactive/Clients/ObservableUsersClient.cs b/Octokit.Reactive/Clients/ObservableUsersClient.cs
index b151f1f2..81521992 100644
--- a/Octokit.Reactive/Clients/ObservableUsersClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUsersClient.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Reactive.Threading.Tasks;
-using Octokit.Reactive.Helpers;
+using Octokit.Reactive.Internal;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     public class ObservableUsersClient : IObservableUsersClient
     {
diff --git a/Octokit.Reactive/Helpers/ConnectionExtensions.cs b/Octokit.Reactive/Helpers/ConnectionExtensions.cs
index 612839dc..91d6b30c 100644
--- a/Octokit.Reactive/Helpers/ConnectionExtensions.cs
+++ b/Octokit.Reactive/Helpers/ConnectionExtensions.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Reactive.Threading.Tasks;
 
-namespace Octokit.Reactive.Helpers
+namespace Octokit.Reactive.Internal
 {
     internal static class ConnectionExtensions
     {
diff --git a/Octokit.Reactive/Helpers/ObservableExtensions.cs b/Octokit.Reactive/Helpers/ObservableExtensions.cs
index fbbe65b1..3972925f 100644
--- a/Octokit.Reactive/Helpers/ObservableExtensions.cs
+++ b/Octokit.Reactive/Helpers/ObservableExtensions.cs
@@ -5,7 +5,7 @@ using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
 
-namespace Octokit.Reactive.Helpers
+namespace Octokit.Reactive.Internal
 {
     public static class ObservableExtensions
     {
diff --git a/Octokit.Reactive/IObservableAuthorizationsClient.cs b/Octokit.Reactive/IObservableAuthorizationsClient.cs
index c6d1c95e..54d27ad1 100644
--- a/Octokit.Reactive/IObservableAuthorizationsClient.cs
+++ b/Octokit.Reactive/IObservableAuthorizationsClient.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
 
@@ -15,7 +14,7 @@ namespace Octokit.Reactive
         /// details.
         /// </remarks>
         /// <returns>An <see cref="Authorization"/></returns>
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate", 
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",
             Justification = "It's an API call, so it's not a property.")]
         IObservable<Authorization> GetAll();
 
@@ -92,7 +91,7 @@ namespace Octokit.Reactive
         /// <param name="authorizationUpdate">The changes to make to the authorization</param>
         /// <returns></returns>
         IObservable<Authorization> Update(int id, AuthorizationUpdate authorizationUpdate);
-        
+
         /// <summary>
         /// Deletes an <see cref="Authorization"/>.
         /// </summary>
diff --git a/Octokit.Reactive/IObservableMiscellaneousClient.cs b/Octokit.Reactive/IObservableMiscellaneousClient.cs
index 42d46482..9c216adb 100644
--- a/Octokit.Reactive/IObservableMiscellaneousClient.cs
+++ b/Octokit.Reactive/IObservableMiscellaneousClient.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Octokit.Reactive
@@ -9,6 +8,7 @@ namespace Octokit.Reactive
         [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate",
             Justification = "Makes a network request")]
         IObservable<IReadOnlyDictionary<string, Uri>> GetEmojis();
+
         IObservable<string> RenderRawMarkdown(string markdown);
     }
 }
diff --git a/Octokit.Reactive/IObservableOrganizationsClient.cs b/Octokit.Reactive/IObservableOrganizationsClient.cs
index 8502d5eb..7fb43aa4 100644
--- a/Octokit.Reactive/IObservableOrganizationsClient.cs
+++ b/Octokit.Reactive/IObservableOrganizationsClient.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Octokit.Reactive
diff --git a/Octokit.Reactive/IObservableSshKeysClient.cs b/Octokit.Reactive/IObservableSshKeysClient.cs
index 38a1ca41..c12e4616 100644
--- a/Octokit.Reactive/IObservableSshKeysClient.cs
+++ b/Octokit.Reactive/IObservableSshKeysClient.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
 
diff --git a/Octokit.Reactive/ObservableGitHubClient.cs b/Octokit.Reactive/ObservableGitHubClient.cs
index 6190da12..a097c449 100644
--- a/Octokit.Reactive/ObservableGitHubClient.cs
+++ b/Octokit.Reactive/ObservableGitHubClient.cs
@@ -1,5 +1,4 @@
 using Octokit.Internal;
-using Octokit.Reactive.Clients;
 
 namespace Octokit.Reactive
 {
@@ -21,7 +20,11 @@ namespace Octokit.Reactive
             Release = new ObservableReleasesClient(gitHubClient);
         }
 
-        public IConnection Connection { get { return _gitHubClient.Connection; }}
+        public IConnection Connection
+        {
+            get { return _gitHubClient.Connection; }
+        }
+
         public IObservableAuthorizationsClient Authorization { get; private set; }
         public IObservableMiscellaneousClient Miscellaneous { get; private set; }
         public IObservableOrganizationsClient Organization { get; private set; }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableRepositoriesClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableRepositoriesClientTests.cs
index a81e889c..ce71dd8a 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableRepositoriesClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableRepositoriesClientTests.cs
@@ -1,6 +1,6 @@
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using Octokit.Reactive.Clients;
+using Octokit.Reactive;
 using Xunit;
 
 namespace Octokit.Tests.Integration
diff --git a/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs b/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs
index 983ea7f8..c9ee5e6c 100644
--- a/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableRepositoriesClientTests.cs
@@ -4,8 +4,7 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using NSubstitute;
 using Octokit.Internal;
-using Octokit.Reactive.Clients;
-
+using Octokit.Reactive;
 using Xunit;
 
 namespace Octokit.Tests.Reactive