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/IObservableGitHubClient.cs b/Octokit.Reactive/IObservableGitHubClient.cs
index 499088c6..f315196b 100644
--- a/Octokit.Reactive/IObservableGitHubClient.cs
+++ b/Octokit.Reactive/IObservableGitHubClient.cs
@@ -1,6 +1,4 @@
-using Octokit.Internal;
-
-namespace Octokit.Reactive
+namespace Octokit.Reactive
 {
     public interface IObservableGitHubClient
     {
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.Reactive/Octokit.Reactive.csproj b/Octokit.Reactive/Octokit.Reactive.csproj
index 403d321a..3efb8cd4 100644
--- a/Octokit.Reactive/Octokit.Reactive.csproj
+++ b/Octokit.Reactive/Octokit.Reactive.csproj
@@ -82,6 +82,9 @@
     <Compile Include="..\Octokit\Helpers\Ensure.cs">
       <Link>Helpers\Ensure.cs</Link>
     </Compile>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
     <Compile Include="Clients\ObservableAuthorizationsClient.cs" />
     <Compile Include="Clients\ObservableMiscellaneousClient.cs" />
     <Compile Include="Clients\ObservableOrganizationsClient.cs" />
@@ -117,6 +120,7 @@
       <Name>Octokit</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
diff --git a/Octokit.Reactive/Properties/AssemblyInfo.cs b/Octokit.Reactive/Properties/AssemblyInfo.cs
index 1d92c771..f9d22c63 100644
--- a/Octokit.Reactive/Properties/AssemblyInfo.cs
+++ b/Octokit.Reactive/Properties/AssemblyInfo.cs
@@ -1,36 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("Octokit.Reactive")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Octokit.Reactive")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("aed1a054-7d2c-4490-a16b-648964b4f128")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyDescription("An IObservable based GitHub API client library for .NET using Reactive Extensions")]
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
diff --git a/Octokit.sln b/Octokit.sln
index 4617ac70..c56fd49e 100644
--- a/Octokit.sln
+++ b/Octokit.sln
@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{397C742D-2
 		CONTRIBUTING.md = CONTRIBUTING.md
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md
+		SolutionInfo.cs = SolutionInfo.cs
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OctokitRT", "Octokit\OctokitRT.csproj", "{C8BC13B6-3FA3-4716-827D-E7706F976FE1}"
diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj
index 8caab489..01d2c0ea 100644
--- a/Octokit/Octokit.csproj
+++ b/Octokit/Octokit.csproj
@@ -78,6 +78,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Exceptions\TwoFactorChallengeFailedException.cs" />
     <Compile Include="Exceptions\TwoFactorRequiredException.cs" />
     <Compile Include="Helpers\ApiUrls.cs" />
@@ -172,7 +176,6 @@
     <Compile Include="Models\SshKeyUpdate.cs" />
     <Compile Include="Models\User.cs" />
     <Compile Include="Models\UserUpdate.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Helpers\StringExtensions.cs" />
     <Compile Include="Clients\RepositoriesClient.cs" />
     <Compile Include="SimpleJson.cs" />
diff --git a/Octokit/OctokitRT.csproj b/Octokit/OctokitRT.csproj
index 41f99411..726aa821 100644
--- a/Octokit/OctokitRT.csproj
+++ b/Octokit/OctokitRT.csproj
@@ -99,6 +99,9 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
     <Compile Include="ApiExtensions.cs" />
     <Compile Include="Authentication\AnonymousAuthenticator.cs" />
     <Compile Include="Authentication\Authenticator.cs" />
diff --git a/Octokit/Properties/AssemblyInfo.cs b/Octokit/Properties/AssemblyInfo.cs
index 126716e9..0c4ca80e 100644
--- a/Octokit/Properties/AssemblyInfo.cs
+++ b/Octokit/Properties/AssemblyInfo.cs
@@ -1,43 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 
 [assembly: AssemblyTitle("Octokit")]
-[assembly: AssemblyDescription("A .NET client library for the GitHub API")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Octokit")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: InternalsVisibleTo("Octokit.Tests")]
-[assembly: InternalsVisibleTo("OctokitRT.Tests")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("ef83c56b-1c49-43c0-92fd-282adc4f0743")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
-[assembly: AssemblyInformationalVersion("0.9.0.0")]
+[assembly: AssemblyDescription("A Task based GitHub API client library for .NET")]
diff --git a/SolutionInfo.cs b/SolutionInfo.cs
new file mode 100644
index 00000000..0ef4ac48
--- /dev/null
+++ b/SolutionInfo.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyVersion(SolutionInfo.Version + ".0")]
+[assembly: AssemblyInformationalVersion(SolutionInfo.Version)]
+[assembly: AssemblyFileVersion(SolutionInfo.Version + ".0")]
+
+[assembly: ComVisible(false)]
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("GitHub")]
+[assembly: AssemblyProduct("Octokit")]
+[assembly: AssemblyCopyright("Copyright © GitHub 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: InternalsVisibleTo("Octokit.Tests")]
+[assembly: InternalsVisibleTo("OctokitRT.Tests")]
+[assembly: CLSCompliant(false)]
+
+class SolutionInfo
+{
+    public const string Version = "0.1.0";
+}