diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/Authentication/TfsOAuthCredentialsTests.cs b/src/Cake.Issues.PullRequests.Tfs.Tests/Authentication/TfsOAuthCredentialsTests.cs
index 875661f..ac6ae9d 100644
--- a/src/Cake.Issues.PullRequests.Tfs.Tests/Authentication/TfsOAuthCredentialsTests.cs
+++ b/src/Cake.Issues.PullRequests.Tfs.Tests/Authentication/TfsOAuthCredentialsTests.cs
@@ -1,7 +1,7 @@
 namespace Cake.Issues.PullRequests.Tfs.Tests.Authentication
 {
-    using Issues.Testing;
     using Shouldly;
+    using Testing;
     using Tfs.Authentication;
     using Xunit;
 
diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/Cake.Issues.PullRequests.Tfs.Tests.csproj b/src/Cake.Issues.PullRequests.Tfs.Tests/Cake.Issues.PullRequests.Tfs.Tests.csproj
index 0caf0d6..d1efda9 100644
--- a/src/Cake.Issues.PullRequests.Tfs.Tests/Cake.Issues.PullRequests.Tfs.Tests.csproj
+++ b/src/Cake.Issues.PullRequests.Tfs.Tests/Cake.Issues.PullRequests.Tfs.Tests.csproj
@@ -39,10 +39,10 @@
       <HintPath>..\packages\Cake.Core.0.16.2\lib\net45\Cake.Core.dll</HintPath>
     </Reference>
     <Reference Include="Cake.Issues, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Issues.0.1.0-beta0002\lib\net45\Cake.Issues.dll</HintPath>
+      <HintPath>..\packages\Cake.Issues.0.1.0-beta0003\lib\net45\Cake.Issues.dll</HintPath>
     </Reference>
     <Reference Include="Cake.Issues.Testing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Issues.Testing.0.1.0-beta0002\lib\net45\Cake.Issues.Testing.dll</HintPath>
+      <HintPath>..\packages\Cake.Issues.Testing.0.1.0-beta0003\lib\net45\Cake.Issues.Testing.dll</HintPath>
     </Reference>
     <Reference Include="Cake.Testing, Version=0.16.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Cake.Testing.0.16.2\lib\net45\Cake.Testing.dll</HintPath>
diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/ContentProviderTests.cs b/src/Cake.Issues.PullRequests.Tfs.Tests/ContentProviderTests.cs
index ac8a7dc..ddff4d5 100644
--- a/src/Cake.Issues.PullRequests.Tfs.Tests/ContentProviderTests.cs
+++ b/src/Cake.Issues.PullRequests.Tfs.Tests/ContentProviderTests.cs
@@ -1,7 +1,6 @@
 namespace Cake.Issues.PullRequests.Tfs.Tests
 {
     using System;
-    using IssueProvider;
     using Shouldly;
     using Xunit;
 
diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/TfsPullRequestSettingsTests.cs b/src/Cake.Issues.PullRequests.Tfs.Tests/TfsPullRequestSettingsTests.cs
index 82bd1ec..5e92f94 100644
--- a/src/Cake.Issues.PullRequests.Tfs.Tests/TfsPullRequestSettingsTests.cs
+++ b/src/Cake.Issues.PullRequests.Tfs.Tests/TfsPullRequestSettingsTests.cs
@@ -1,7 +1,7 @@
 namespace Cake.Issues.PullRequests.Tfs.Tests
 {
     using System;
-    using Issues.Testing;
+    using Testing;
     using Xunit;
 
     public class TfsPullRequestSettingsTests
diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/packages.config b/src/Cake.Issues.PullRequests.Tfs.Tests/packages.config
index d2be4ec..030f8d8 100644
--- a/src/Cake.Issues.PullRequests.Tfs.Tests/packages.config
+++ b/src/Cake.Issues.PullRequests.Tfs.Tests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Cake.Core" version="0.16.2" targetFramework="net452" />
-  <package id="Cake.Issues" version="0.1.0-beta0002" targetFramework="net452" />
-  <package id="Cake.Issues.Testing" version="0.1.0-beta0002" targetFramework="net452" />
+  <package id="Cake.Issues" version="0.1.0-beta0003" targetFramework="net452" />
+  <package id="Cake.Issues.Testing" version="0.1.0-beta0003" targetFramework="net452" />
   <package id="Cake.Testing" version="0.16.2" targetFramework="net452" />
   <package id="Shouldly" version="2.8.3" targetFramework="net452" />
   <package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net452" developmentDependency="true" />
diff --git a/src/Cake.Issues.PullRequests.Tfs/Cake.Issues.PullRequests.Tfs.csproj b/src/Cake.Issues.PullRequests.Tfs/Cake.Issues.PullRequests.Tfs.csproj
index d3369a2..5798739 100644
--- a/src/Cake.Issues.PullRequests.Tfs/Cake.Issues.PullRequests.Tfs.csproj
+++ b/src/Cake.Issues.PullRequests.Tfs/Cake.Issues.PullRequests.Tfs.csproj
@@ -40,10 +40,10 @@
       <HintPath>..\packages\Cake.Core.0.16.2\lib\net45\Cake.Core.dll</HintPath>
     </Reference>
     <Reference Include="Cake.Issues, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Issues.0.1.0-beta0002\lib\net45\Cake.Issues.dll</HintPath>
+      <HintPath>..\packages\Cake.Issues.0.1.0-beta0003\lib\net45\Cake.Issues.dll</HintPath>
     </Reference>
     <Reference Include="Cake.Issues.PullRequests, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Issues.PullRequests.0.1.0-beta0001\lib\net45\Cake.Issues.PullRequests.dll</HintPath>
+      <HintPath>..\packages\Cake.Issues.PullRequests.0.1.0-beta0002\lib\net45\Cake.Issues.PullRequests.dll</HintPath>
     </Reference>
     <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
@@ -149,7 +149,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="FodyWeavers.xml" />
diff --git a/src/Cake.Issues.PullRequests.Tfs/CommentExtensions.cs b/src/Cake.Issues.PullRequests.Tfs/CommentExtensions.cs
index afa9448..3f3bbcf 100644
--- a/src/Cake.Issues.PullRequests.Tfs/CommentExtensions.cs
+++ b/src/Cake.Issues.PullRequests.Tfs/CommentExtensions.cs
@@ -1,7 +1,6 @@
 namespace Cake.Issues.PullRequests.Tfs
 {
     using Microsoft.TeamFoundation.SourceControl.WebApi;
-    using PullRequestSystem;
 
     /// <summary>
     /// Extensions for <see cref="Comment"/>.
diff --git a/src/Cake.Issues.PullRequests.Tfs/CommentThreadStatusExtensions.cs b/src/Cake.Issues.PullRequests.Tfs/CommentThreadStatusExtensions.cs
index 64dd2c6..8592284 100644
--- a/src/Cake.Issues.PullRequests.Tfs/CommentThreadStatusExtensions.cs
+++ b/src/Cake.Issues.PullRequests.Tfs/CommentThreadStatusExtensions.cs
@@ -1,7 +1,6 @@
 namespace Cake.Issues.PullRequests.Tfs
 {
     using Microsoft.TeamFoundation.SourceControl.WebApi;
-    using PullRequestSystem;
 
     /// <summary>
     /// Extensions for <see cref="CommentThreadStatus"/> enumeration.
diff --git a/src/Cake.Issues.PullRequests.Tfs/ContentProvider.cs b/src/Cake.Issues.PullRequests.Tfs/ContentProvider.cs
index e2fa435..2fe6b49 100644
--- a/src/Cake.Issues.PullRequests.Tfs/ContentProvider.cs
+++ b/src/Cake.Issues.PullRequests.Tfs/ContentProvider.cs
@@ -1,7 +1,5 @@
 namespace Cake.Issues.PullRequests.Tfs
 {
-    using IssueProvider;
-
     /// <summary>
     /// Class for providing the content for a pull request comment.
     /// </summary>
diff --git a/src/Cake.Issues.PullRequests.Tfs/GitPullRequestCommentThreadExtensions.cs b/src/Cake.Issues.PullRequests.Tfs/GitPullRequestCommentThreadExtensions.cs
index 28a705a..11a4faf 100644
--- a/src/Cake.Issues.PullRequests.Tfs/GitPullRequestCommentThreadExtensions.cs
+++ b/src/Cake.Issues.PullRequests.Tfs/GitPullRequestCommentThreadExtensions.cs
@@ -4,7 +4,6 @@
     using System.Linq;
     using Core.IO;
     using Microsoft.TeamFoundation.SourceControl.WebApi;
-    using PullRequestSystem;
 
     /// <summary>
     /// Extensions for <see cref="GitPullRequestCommentThread"/>.
diff --git a/src/Cake.Issues.PullRequests.Tfs/TfsPullRequestSystem.cs b/src/Cake.Issues.PullRequests.Tfs/TfsPullRequestSystem.cs
index 8127035..5f3f40e 100644
--- a/src/Cake.Issues.PullRequests.Tfs/TfsPullRequestSystem.cs
+++ b/src/Cake.Issues.PullRequests.Tfs/TfsPullRequestSystem.cs
@@ -6,11 +6,9 @@
     using System.Threading;
     using Core.Diagnostics;
     using Core.IO;
-    using IssueProvider;
     using Microsoft.TeamFoundation.SourceControl.WebApi;
     using Microsoft.VisualStudio.Services.Identity;
     using Microsoft.VisualStudio.Services.WebApi;
-    using PullRequestSystem;
     using TfsUrlParser;
 
     /// <summary>
diff --git a/src/Cake.Issues.PullRequests.Tfs/TfsPullRequestSystemAliases.cs b/src/Cake.Issues.PullRequests.Tfs/TfsPullRequestSystemAliases.cs
index 274af66..b8f860b 100644
--- a/src/Cake.Issues.PullRequests.Tfs/TfsPullRequestSystemAliases.cs
+++ b/src/Cake.Issues.PullRequests.Tfs/TfsPullRequestSystemAliases.cs
@@ -4,7 +4,6 @@
     using Authentication;
     using Core;
     using Core.Annotations;
-    using PullRequestSystem;
 
     /// <summary>
     /// Contains functionality related to writing code analysis issues to Team Foundation Server or
diff --git a/src/Cake.Issues.PullRequests.Tfs/packages.config b/src/Cake.Issues.PullRequests.Tfs/packages.config
index 6d80069..f504b6b 100644
--- a/src/Cake.Issues.PullRequests.Tfs/packages.config
+++ b/src/Cake.Issues.PullRequests.Tfs/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Cake.Core" version="0.16.2" targetFramework="net452" />
-  <package id="Cake.Issues" version="0.1.0-beta0002" targetFramework="net452" />
-  <package id="Cake.Issues.PullRequests" version="0.1.0-beta0001" targetFramework="net452" />
+  <package id="Cake.Issues" version="0.1.0-beta0003" targetFramework="net452" />
+  <package id="Cake.Issues.PullRequests" version="0.1.0-beta0002" targetFramework="net452" />
   <package id="Costura.Fody" version="1.6.2" targetFramework="net452" developmentDependency="true" />
   <package id="Desktop.Analyzers" version="1.1.0" targetFramework="net452" />
   <package id="Fody" version="2.1.2" targetFramework="net452" developmentDependency="true" />