diff --git a/Octokit.Reactive/Octokit.Reactive.csproj b/Octokit.Reactive/Octokit.Reactive.csproj
index 79722400..2bdad6a6 100644
--- a/Octokit.Reactive/Octokit.Reactive.csproj
+++ b/Octokit.Reactive/Octokit.Reactive.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <IntermediateOutputPath>obj\Debug\Net40</IntermediateOutputPath>
-    <OutputPath>bin\Debug\Net40</OutputPath>
+    <OutputPath>bin\Debug\Net45\</OutputPath>
     <DefineConstants>DEBUG;TRACE;CODE_ANALYSIS;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <IntermediateOutputPath>obj\Release\Net40</IntermediateOutputPath>
-    <OutputPath>bin\Release\Net40</OutputPath>
+    <OutputPath>bin\Release\Net45\</OutputPath>
     <DefineConstants>TRACE;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
index c0b63d67..0366926c 100644
--- a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
+++ b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
@@ -24,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\Release\Net45\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Octokit.Tests/OctoKit.Tests-NetCore45.csproj b/Octokit.Tests/OctoKit.Tests-NetCore45.csproj
index 46736d12..803627b3 100644
--- a/Octokit.Tests/OctoKit.Tests-NetCore45.csproj
+++ b/Octokit.Tests/OctoKit.Tests-NetCore45.csproj
@@ -16,7 +16,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\Debug\NetCore45\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NETFX_CORE;CODE_ANALYSIS;SIMPLE_JSON_OBJARRAYINTERNAL;SIMPLE_JSON_INTERNAL;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -24,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\Release\NetCore45\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;CODE_ANALYSIS;SIMPLE_JSON_OBJARRAYINTERNAL;SIMPLE_JSON_INTERNAL;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj
index 2bec1229..2e399b78 100644
--- a/Octokit.Tests/Octokit.Tests.csproj
+++ b/Octokit.Tests/Octokit.Tests.csproj
@@ -16,7 +16,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\Debug\Net45\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -24,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\Release\Net45\</OutputPath>
     <DefineConstants>TRACE;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Octokit.msbuild b/Octokit.msbuild
index f6bd6b8f..1ffc872a 100644
--- a/Octokit.msbuild
+++ b/Octokit.msbuild
@@ -14,11 +14,11 @@
   </Target>
 
   <Target Name="RunUnitTests" DependsOnTargets="Build"> 
-    <xunit Assembly=".\Octokit.Tests\bin\$(Configuration)\Octokit.Tests.dll" Xml="Octokit.Tests.results.xml" />
+    <xunit Assembly=".\Octokit.Tests\bin\$(Configuration)\Net45\Octokit.Tests.dll" Xml="Octokit.Tests.results.xml" />
   </Target>
 
-  <Target Name="RunRTUnitTests" DependsOnTargets="Build">
-    <xunit Assembly=".\Octokit.Tests\bin\$(Configuration)\OctokitRT.Tests.dll" Xml="OctokitRT.Tests.results.xml" />
+  <Target Name="RunNetCoreUnitTests" DependsOnTargets="Build">
+    <xunit Assembly=".\Octokit.Tests\bin\$(Configuration)\NetCore45\Octokit.Tests-NetCore45.dll" Xml="OctokitRT.Tests.results.xml" />
   </Target>
 
   <Target Name="RunIntegrationTests" DependsOnTargets="Build; DoNotSkipIntegrationTests; SkipIntegrationTests" />
@@ -31,5 +31,5 @@
     <Warning Text ="The integration tests were skipped because the OCTOKIT_GITHUBUSERNAME and OCTOKIT_GITHUBUSERNAME environment variables are not set. Please configure these environment variables for a GitHub test account (DO NOT USE A &quot;REAL&quot; ACCOUNT)." />
   </Target>
 
-  <Target Name="FullBuild" DependsOnTargets="RunUnitTests; RunRTUnitTests; RunIntegrationTests" />
+  <Target Name="FullBuild" DependsOnTargets="RunUnitTests; RunNetCoreUnitTests; RunIntegrationTests" />
 </Project>
diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj
index 4ce98065..23698df4 100644
--- a/Octokit/Octokit-netcore45.csproj
+++ b/Octokit/Octokit-netcore45.csproj
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <IntermediateOutputPath>obj\Release\NetCore45</IntermediateOutputPath>
-    <OutputPath>bin\Release\NetCore45</OutputPath>
+    <OutputPath>bin\Release\NetCore45\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;CODE_ANALYSIS;SIMPLE_JSON_OBJARRAYINTERNAL;SIMPLE_JSON_INTERNAL;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -180,4 +180,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj
index fc451b35..b9a387e7 100644
--- a/Octokit/Octokit.csproj
+++ b/Octokit/Octokit.csproj
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <IntermediateOutputPath>obj\Release\Net45</IntermediateOutputPath>
-    <OutputPath>bin\Release\Net45</OutputPath>
+    <OutputPath>bin\Release\Net45\</OutputPath>
     <DefineConstants>TRACE;CODE_ANALYSIS;CODE_ANALYSIS;SIMPLE_JSON_OBJARRAYINTERNAL;SIMPLE_JSON_INTERNAL;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -210,4 +210,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
index 7c4b2fc7..6b135685 100644
--- a/build.cmd
+++ b/build.cmd
@@ -14,8 +14,8 @@ if not exist packaging\octokit\lib\netcore45 mkdir packaging\octokit\lib\netcore
 copy LICENSE.txt packaging\octokit\
 copy README.md packaging\octokit\
 
-copy Octokit\bin\Release\Octokit.dll packaging\octokit\lib\net45\
-copy Octokit\bin\WinRT\Release\OctokitRT.dll packaging\octokit\lib\netcore45\
+copy Octokit\bin\%config%\Net45\Octokit.dll packaging\octokit\lib\net45\
+copy Octokit\bin\%config%\NetCore45\Octokit.dll packaging\octokit\lib\netcore45\
 
 tools\nuget\nuget.exe pack "octokit.nuspec" -BasePath packaging\octokit -Output packaging
 
diff --git a/script/cibuild.ps1 b/script/cibuild.ps1
index bb26e07e..5212d2ab 100644
--- a/script/cibuild.ps1
+++ b/script/cibuild.ps1
@@ -84,8 +84,8 @@ if ($LastExitCode -ne 0) {
     Die-WithOutput $exitCode $output
 }
 
-function Run-XUnit([string]$project, [int]$timeoutDuration, [string]$projectFolder = $project) {
-    $dll = "$projectFolder\bin\Release\$project.dll"
+function Run-XUnit([string]$platform, [string]$project, [int]$timeoutDuration, [string]$projectFolder = $project) {
+    $dll = "$projectFolder\bin\Release\$platform\$project.dll"
 
     $xunitDirectory = Join-Path $rootDirectory tools\xunit
     $consoleRunner = Join-Path $xunitDirectory xunit.console.clr4.x86.exe
@@ -102,7 +102,7 @@ function Run-XUnit([string]$project, [int]$timeoutDuration, [string]$projectFold
 $exitCode = 0
 
 Write-Output "Running Octokit.Tests..."
-$result = Run-XUnit Octokit.Tests 120
+$result = Run-XUnit Net45 Octokit.Tests 120
 if ($result.ExitCode -eq 0) {
     # Print out the test result summary.
     Write-Output $result.Output[-1]
@@ -112,8 +112,8 @@ if ($result.ExitCode -eq 0) {
 }
 Write-Output ""
 
-Write-Output "Running OctokitRT.Tests..."
-$result = Run-XUnit OctokitRT.Tests 120 Octokit.Tests
+Write-Output "Running Octokit.Tests-NetCore45..."
+$result = Run-XUnit NetCore45 Octokit.Tests-NetCore45 120 Octokit.Tests
 if ($result.ExitCode -eq 0) {
     # Print out the test result summary.
     Write-Output $result.Output[-1]
@@ -124,7 +124,7 @@ if ($result.ExitCode -eq 0) {
 Write-Output ""
 
 Write-Output "Running Octokit.Tests.Integration..."
-$result = Run-XUnit Octokit.Tests.Integration 180
+$result = Run-XUnit Net45 Octokit.Tests.Integration 180
 if ($result.ExitCode -eq 0) {
     # Print out the test result summary.
     Write-Output $result.Output[-1]