diff --git a/source/XeroAPI.Net.nuspec b/source/XeroAPI.Net.nuspec
index 41ef3c5..86a811c 100644
--- a/source/XeroAPI.Net.nuspec
+++ b/source/XeroAPI.Net.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>XeroAPI.Net</id>
-    <version>0.0.0.0</version>
+    <id>Booyami.XeroAPI.Net</id>
+    <version>1.0.2</version>
     <title>.Net wrapper library for Xero API</title>
     <authors>XeroAPI</authors>
     <owners />
@@ -11,9 +11,12 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>.Net wrapper library for Xero API. This library allows you to perform GET/PUT/POST methods against the Xero API without needing to know the internals of xml serialisation, oauth signatures or character encodings. See http://developer.xero.com for more information.</description>
     <summary>.Net wrapper library for Xero API</summary>
+    <dependencies>
+      <dependency id="Booyami.DevDefined.OAuth" version="1.0.1" />
+    </dependencies>
   </metadata>
   <files>
-    <file src="XeroApi\bin\Release\XeroApi.dll" target="lib\XeroApi.dll" />
-    <file src="XeroApi\bin\Release\XeroApi.pdb" target="lib\XeroApi.pdb" />
+    <file src="XeroApi\bin\release\XeroApi.dll" target="lib\XeroApi.dll" />
+    <file src="XeroApi\bin\release\XeroApi.docs.xml" target="lib\XeroApi.docs.xml" />
   </files>
 </package>
\ No newline at end of file
diff --git a/source/XeroApi.ConsoleTests/Attachments/Receipt.png b/source/XeroApi.ConsoleTests/Attachments/Receipt.png
deleted file mode 100644
index 2e26662..0000000
Binary files a/source/XeroApi.ConsoleTests/Attachments/Receipt.png and /dev/null differ
diff --git a/source/XeroApi.ConsoleTests/PartnerApplicationRunner.cs b/source/XeroApi.ConsoleTests/PartnerApplicationRunner.cs
index 71a0ddc..3e14bd2 100644
--- a/source/XeroApi.ConsoleTests/PartnerApplicationRunner.cs
+++ b/source/XeroApi.ConsoleTests/PartnerApplicationRunner.cs
@@ -2,10 +2,10 @@
 using System.Diagnostics;
 using System.Security.Cryptography.X509Certificates;
 
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Logging;
-using DevDefined.OAuth.Storage.Basic;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Framework;
+using Booyami.DevDefined.OAuth.Logging;
+using Booyami.DevDefined.OAuth.Storage.Basic;
 using XeroApi.OAuth;
 
 namespace XeroApi.ConsoleApp
diff --git a/source/XeroApi.ConsoleTests/PrivateApplicationRunner.cs b/source/XeroApi.ConsoleTests/PrivateApplicationRunner.cs
index 66e082e..b85b97e 100644
--- a/source/XeroApi.ConsoleTests/PrivateApplicationRunner.cs
+++ b/source/XeroApi.ConsoleTests/PrivateApplicationRunner.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography.X509Certificates;
 
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Logging;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Logging;
 
 using XeroApi.OAuth;
 
diff --git a/source/XeroApi.ConsoleTests/Program.cs b/source/XeroApi.ConsoleTests/Program.cs
index a2110a4..8688a71 100644
--- a/source/XeroApi.ConsoleTests/Program.cs
+++ b/source/XeroApi.ConsoleTests/Program.cs
@@ -1,55 +1,55 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using DevDefined.OAuth.Utility;
-using XeroApi.Model;
-using XeroApi.Model.Reporting;
-
-namespace XeroApi.ConsoleApp
-{
-    class Program
+using Booyami.DevDefined.OAuth.Utility;
+using XeroApi.Model;
+using XeroApi.Model.Reporting;
+
+namespace XeroApi.ConsoleApp
+{
+    class Program
     {
         private const string AnyAttachmentFilename = @".\Attachments\Receipt.png";
         private const string TestContactName = "Joe Bloggs (Test)";
 
-        static void Main(string[] args)
-        {
-            Console.WriteLine("Do you want to run as a public or private application?");
-            Console.WriteLine(" Press 1 for a public application");
-            Console.WriteLine(" Press 2 for a private application");
-            Console.WriteLine(" Press 3 for a partner application");
-
-            ConsoleKeyInfo keyInfo = Console.ReadKey(true);
-            Console.WriteLine();
-
-            if (keyInfo.KeyChar == '1')
-            {
-                Console.WriteLine("Running as a public application...");
-                ExerciseOrganisation(PublicApplicationRunner.CreateRepository());
-            }
-            if (keyInfo.KeyChar == '2')
-            {
-                Console.WriteLine("Running as a private application...");
-                ExerciseOrganisation(PrivateApplicationRunner.CreateRepository());
-            }
-            if (keyInfo.KeyChar == '3')
-            {
-                Console.WriteLine("Running as a partner application...");
-                ExerciseOrganisation(PartnerApplicationRunner.CreateRepository());
-            }
-        }
-
-        static void ExerciseOrganisation(Repository repository)
-        {
-            if (repository == null)
-            {
-                return;
-            }
-
-            // Make a call to api.xero.com to check that we can use the access token.
-            Organisation organisation = repository.Organisation;
-
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Do you want to run as a public or private application?");
+            Console.WriteLine(" Press 1 for a public application");
+            Console.WriteLine(" Press 2 for a private application");
+            Console.WriteLine(" Press 3 for a partner application");
+
+            ConsoleKeyInfo keyInfo = Console.ReadKey(true);
+            Console.WriteLine();
+
+            if (keyInfo.KeyChar == '1')
+            {
+                Console.WriteLine("Running as a public application...");
+                ExerciseOrganisation(PublicApplicationRunner.CreateRepository());
+            }
+            if (keyInfo.KeyChar == '2')
+            {
+                Console.WriteLine("Running as a private application...");
+                ExerciseOrganisation(PrivateApplicationRunner.CreateRepository());
+            }
+            if (keyInfo.KeyChar == '3')
+            {
+                Console.WriteLine("Running as a partner application...");
+                ExerciseOrganisation(PartnerApplicationRunner.CreateRepository());
+            }
+        }
+
+        static void ExerciseOrganisation(Repository repository)
+        {
+            if (repository == null)
+            {
+                return;
+            }
+
+            // Make a call to api.xero.com to check that we can use the access token.
+            Organisation organisation = repository.Organisation;
+
             Console.WriteLine("You have been authorised against organisation: {0}", organisation.Name);
 
             TestGetAccountsByFilter(repository);
@@ -77,7 +77,7 @@ static void ExerciseOrganisation(Repository repository)
             TestGettingATrialBalance(repository);
             TestGettingAListOfReports(repository);
 
-            Console.WriteLine("All done!");
+            Console.WriteLine("All done!");
         }
 
         private static void TestAttachmentsAgainstPurchaseInvoice(Repository repository)
@@ -527,7 +527,7 @@ private static void TestGetAccountsByFilter(Repository repository)
         private static void TestGetOrganisaitonUsingLinqSingle(Repository repository)
         {
             // Try out the 'Single' linq method (http://answers.xero.com/developer/question/36501/)
-            var organisation = repository.Organisations.Single();
+            var organisation = repository.Organisations.Single();
 
             Console.WriteLine("The organisation is still called: " + organisation.Name);
         }
@@ -542,5 +542,5 @@ private static void TestGettingAListOfReports(Repository repository)
                 Console.WriteLine("Found published report, name:{0}, type:{1}", report.ReportName, report.ReportType);
             }
         }
-    }
-}
+    }
+}
diff --git a/source/XeroApi.ConsoleTests/PublicApplicationRunner.cs b/source/XeroApi.ConsoleTests/PublicApplicationRunner.cs
index 086bbb0..8c8215c 100644
--- a/source/XeroApi.ConsoleTests/PublicApplicationRunner.cs
+++ b/source/XeroApi.ConsoleTests/PublicApplicationRunner.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Diagnostics;
 
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Logging;
-using DevDefined.OAuth.Storage.Basic;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Framework;
+using Booyami.DevDefined.OAuth.Logging;
+using Booyami.DevDefined.OAuth.Storage.Basic;
 using XeroApi.OAuth;
 
 namespace XeroApi.ConsoleApp
diff --git a/source/XeroApi.ConsoleTests/XeroApi.Console.csproj b/source/XeroApi.ConsoleTests/XeroApi.Console.csproj
index c0fb95b..aed3e58 100644
--- a/source/XeroApi.ConsoleTests/XeroApi.Console.csproj
+++ b/source/XeroApi.ConsoleTests/XeroApi.Console.csproj
@@ -37,6 +37,9 @@
     </StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Booyami.DevDefined.OAuth, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a3261f5b4697e67d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Booyami.DevDefined.OAuth.1.0.1\lib\Booyami.DevDefined.OAuth.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -61,6 +64,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/source/XeroApi.ConsoleTests/packages.config b/source/XeroApi.ConsoleTests/packages.config
new file mode 100644
index 0000000..29b0d5b
--- /dev/null
+++ b/source/XeroApi.ConsoleTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Booyami.DevDefined.OAuth" version="1.0.1" targetFramework="net35" />
+</packages>
\ No newline at end of file
diff --git a/source/XeroApi.MvcWebApp/Controllers/ConnectController.cs b/source/XeroApi.MvcWebApp/Controllers/ConnectController.cs
index 18c0475..d524b3b 100644
--- a/source/XeroApi.MvcWebApp/Controllers/ConnectController.cs
+++ b/source/XeroApi.MvcWebApp/Controllers/ConnectController.cs
@@ -2,8 +2,8 @@
 using System.Diagnostics;
 using System.Web.Mvc;
 
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Storage.Basic;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Storage.Basic;
 
 using Xero.ScreencastWeb.Services;
 
diff --git a/source/XeroApi.MvcWebApp/Services/CertificateRepository.cs b/source/XeroApi.MvcWebApp/Services/CertificateRepository.cs
index 3c38d76..85de079 100644
--- a/source/XeroApi.MvcWebApp/Services/CertificateRepository.cs
+++ b/source/XeroApi.MvcWebApp/Services/CertificateRepository.cs
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 
-using DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Consumer;
 
 namespace Xero.ScreencastWeb.Services
 {
diff --git a/source/XeroApi.MvcWebApp/Services/ServiceProvider.cs b/source/XeroApi.MvcWebApp/Services/ServiceProvider.cs
index 5710624..96e77c0 100644
--- a/source/XeroApi.MvcWebApp/Services/ServiceProvider.cs
+++ b/source/XeroApi.MvcWebApp/Services/ServiceProvider.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Configuration;
 
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Storage.Basic;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Storage.Basic;
 
 using XeroApi;
 using XeroApi.OAuth;
diff --git a/source/XeroApi.MvcWebApp/Services/SessionStateTokenRepository.cs b/source/XeroApi.MvcWebApp/Services/SessionStateTokenRepository.cs
index 0f3215e..d96a9f9 100644
--- a/source/XeroApi.MvcWebApp/Services/SessionStateTokenRepository.cs
+++ b/source/XeroApi.MvcWebApp/Services/SessionStateTokenRepository.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Web;
 
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Storage.Basic;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Storage.Basic;
 
 namespace Xero.ScreencastWeb.Services
 {
diff --git a/source/XeroApi.Tests/OAuth/Consumer/ConsumerRequestRunnerTests.cs b/source/XeroApi.Tests/OAuth/Consumer/ConsumerRequestRunnerTests.cs
index f45a17c..7484eed 100644
--- a/source/XeroApi.Tests/OAuth/Consumer/ConsumerRequestRunnerTests.cs
+++ b/source/XeroApi.Tests/OAuth/Consumer/ConsumerRequestRunnerTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
-using DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Consumer;
 using NUnit.Framework;
 
 using Rhino.Mocks;
diff --git a/source/XeroApi.Tests/OAuth/Consumer/ConsumerRequestTests.cs b/source/XeroApi.Tests/OAuth/Consumer/ConsumerRequestTests.cs
index fdc4e76..d84c5c4 100644
--- a/source/XeroApi.Tests/OAuth/Consumer/ConsumerRequestTests.cs
+++ b/source/XeroApi.Tests/OAuth/Consumer/ConsumerRequestTests.cs
@@ -1,19 +1,19 @@
 using System;
 using System.Collections.Specialized;
 using System.Net;
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Storage.Basic;
-using NUnit.Framework;
-
-using Rhino.Mocks;
-
-namespace XeroApi.Tests.OAuth.Consumer 
-{
-    [TestFixture]
-    public class ConsumerRequestTests
-    {
-        [Test]
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Framework;
+using Booyami.DevDefined.OAuth.Storage.Basic;
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+namespace XeroApi.Tests.OAuth.Consumer 
+{
+    [TestFixture]
+    public class ConsumerRequestTests
+    {
+        [Test]
         public void to_consumer_response_with_really_old_date_string_should_fail_validation()
         {
             const string reallyOldDateString = "1000-01-01T00:00:00";
@@ -50,7 +50,7 @@ public void to_consumer_response_with_current_date_string_should_pass_validation
             Assert.DoesNotThrow(() => consumerRequest.ToWebRequest());
         }
         
-        [Test]
+        [Test]
         public void it_can_parse_unset_IfModifiedSince_date()
         {
             ConsumerRequest consumerRequest = new ConsumerRequest(null, null, null, null);
@@ -143,6 +143,6 @@ private static ConsumerRequest NewConsumerRequest(OAuthContext oAuthContext)
             };
 
             return new ConsumerRequest(oAuthSession, oAuthContext, consumerContext, new NullCertificateFactory());
-        }
-    }
-}
+        }
+    }
+}
diff --git a/source/XeroApi.Tests/SignatureTests.cs b/source/XeroApi.Tests/SignatureTests.cs
index b4997a5..4549971 100644
--- a/source/XeroApi.Tests/SignatureTests.cs
+++ b/source/XeroApi.Tests/SignatureTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Framework;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Framework;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using XeroApi.OAuth;
diff --git a/source/XeroApi.sln b/source/XeroApi.sln
index 21785c5..3f7b4f4 100644
--- a/source/XeroApi.sln
+++ b/source/XeroApi.sln
@@ -1,18 +1,10 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2006
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XeroApi", "XeroApi\XeroApi.csproj", "{20A56AFE-3B15-4FA6-A06D-96F20D5A770D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XeroApi.Console", "XeroApi.ConsoleTests\XeroApi.Console.csproj", "{31280DA3-F3EA-49AA-A326-F5ACA2127859}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XeroApi.Tests", "XeroApi.Tests\XeroApi.Tests.csproj", "{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XeroApi.MvcWebApp", "XeroApi.MvcWebApp\XeroApi.MvcWebApp.csproj", "{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}"
-EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "XeroApi.VBConsole", "XeroApi.VBConsole\XeroApi.VBConsole.vbproj", "{DF776A50-8B97-465D-A9D5-5924EF731433}"
-EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "XeroApi.VBTests", "XeroApi.VBTests\XeroApi.VBTests.vbproj", "{F183E784-CDD6-4A41-A567-EA3D46C6C26D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,58 +25,11 @@ Global
 		{20A56AFE-3B15-4FA6-A06D-96F20D5A770D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20A56AFE-3B15-4FA6-A06D-96F20D5A770D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20A56AFE-3B15-4FA6-A06D-96F20D5A770D}.Release|x86.ActiveCfg = Release|Any CPU
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Debug|x86.ActiveCfg = Debug|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Debug|x86.Build.0 = Debug|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Release|Any CPU.ActiveCfg = Release|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Release|Mixed Platforms.Build.0 = Release|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Release|x86.ActiveCfg = Release|x86
-		{31280DA3-F3EA-49AA-A326-F5ACA2127859}.Release|x86.Build.0 = Release|x86
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F2AEE2B2-FEE7-4144-8B92-F258200A27B9}.Release|x86.ActiveCfg = Release|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{51821CFB-9788-4B86-9B01-F9A07C6AE0EA}.Release|x86.ActiveCfg = Release|Any CPU
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Debug|x86.ActiveCfg = Debug|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Debug|x86.Build.0 = Debug|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Release|Any CPU.ActiveCfg = Release|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Release|Mixed Platforms.Build.0 = Release|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Release|x86.ActiveCfg = Release|x86
-		{DF776A50-8B97-465D-A9D5-5924EF731433}.Release|x86.Build.0 = Release|x86
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F183E784-CDD6-4A41-A567-EA3D46C6C26D}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AAF3C258-F4D0-4128-B6F0-3D438110B26F}
+	EndGlobalSection
 EndGlobal
diff --git a/source/XeroApi/Exceptions/ApiResponseException.cs b/source/XeroApi/Exceptions/ApiResponseException.cs
index cc33f8e..181ae3d 100644
--- a/source/XeroApi/Exceptions/ApiResponseException.cs
+++ b/source/XeroApi/Exceptions/ApiResponseException.cs
@@ -1,5 +1,5 @@
 using System;
-using DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Consumer;
 
 namespace XeroApi.Exceptions
 {
diff --git a/source/XeroApi/Integration/IntegrationProxy.cs b/source/XeroApi/Integration/IntegrationProxy.cs
index 6fe757a..1a2d653 100644
--- a/source/XeroApi/Integration/IntegrationProxy.cs
+++ b/source/XeroApi/Integration/IntegrationProxy.cs
@@ -3,7 +3,7 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Net;
-using DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Consumer;
 using XeroApi.Exceptions;
 using XeroApi.Model;
 
@@ -122,7 +122,7 @@ public string CreateElements(string endpointName, string body)
         #region Attachment Read/Write Methods
 
         public string UpdateOrCreateAttachment(string endpointName, string itemId, Attachment attachment)
-        {
+        {
             Uri uri = ConstructChildResourceUri(_oauthSession.ConsumerContext.BaseEndpointUri, endpointName, itemId, "Attachments", attachment.FileName);
 
             IConsumerRequest oauthRequest = _oauthSession.Request()
@@ -143,7 +143,7 @@ public string UpdateOrCreateAttachment(string endpointName, string itemId, Attac
         }
 
         public string CreateAttachment(string endpointName, string itemId, Attachment attachment)
-        {
+        {
             Uri uri = ConstructChildResourceUri(_oauthSession.ConsumerContext.BaseEndpointUri, endpointName, itemId, "Attachments", attachment.FileName);
 
             IConsumerRequest oauthRequest = _oauthSession.Request()
@@ -200,29 +200,29 @@ public Stream FindOneAttachment(string endpointName, string itemId, string attac
             }
 
             throw new ApiResponseException(consumerResponse);
-        }
-
-        public string ApplyAllocation(CreditNote creditNote, string body)
-        {
-            Uri uri = ConstructChildResourceUri(_oauthSession.ConsumerContext.BaseEndpointUri, "CreditNotes", creditNote.CreditNoteID.ToString(), "Allocations", null);
-
-            IConsumerRequest oauthRequest = _oauthSession.Request()
-                .ForMethod("PUT")
-                .WithAcceptHeader(MimeTypes.TextXml)
-                .ForUri(uri)
-                .SignWithToken()
-                .WithBody(body);
-
-            var consumerResponse = oauthRequest.ToConsumerResponse();
-
-            // Check for <ApiException> response message
-            if (consumerResponse.Content.StartsWith("<ApiException"))
-            {
-                ApiExceptionDetails details = ModelSerializer.DeserializeTo<ApiExceptionDetails>(consumerResponse.Content);
-                throw new ApiException(details);
-            }
-
-            return consumerResponse.Content;
+        }
+
+        public string ApplyAllocation(CreditNote creditNote, string body)
+        {
+            Uri uri = ConstructChildResourceUri(_oauthSession.ConsumerContext.BaseEndpointUri, "CreditNotes", creditNote.CreditNoteID.ToString(), "Allocations", null);
+
+            IConsumerRequest oauthRequest = _oauthSession.Request()
+                .ForMethod("PUT")
+                .WithAcceptHeader(MimeTypes.TextXml)
+                .ForUri(uri)
+                .SignWithToken()
+                .WithBody(body);
+
+            var consumerResponse = oauthRequest.ToConsumerResponse();
+
+            // Check for <ApiException> response message
+            if (consumerResponse.Content.StartsWith("<ApiException"))
+            {
+                ApiExceptionDetails details = ModelSerializer.DeserializeTo<ApiExceptionDetails>(consumerResponse.Content);
+                throw new ApiException(details);
+            }
+
+            return consumerResponse.Content;
         }
 
 
@@ -240,7 +240,7 @@ private IConsumerResponse CallApi(string method, string body, Uri baseUrl, strin
             IConsumerRequest request = _oauthSession.Request()
                 .ForMethod(method)
                 .ForUri(uri)
-                .WithAcceptHeader(acceptMimeType ?? "text/xml")
+                .WithAcceptHeader(acceptMimeType ?? "text/xml")
                 .WithIfModifiedSince(lastModifiedDate)
                 .SignWithToken();
 
@@ -287,7 +287,7 @@ public static Uri ConstructUri(Uri baseUrl, string endpointName, string itemId,
                 uriBuilder.Path += (itemId);
             }
             
-            string queryString = DevDefined.OAuth.Framework.UriUtility.FormatQueryString(additionalQueryParams);
+            string queryString = Booyami.DevDefined.OAuth.Framework.UriUtility.FormatQueryString(additionalQueryParams);
 
             if (!string.IsNullOrEmpty(queryString))
                 uriBuilder.Query = queryString;
diff --git a/source/XeroApi/Model/Account.cs b/source/XeroApi/Model/Account.cs
index 4f2427b..81c676d 100644
--- a/source/XeroApi/Model/Account.cs
+++ b/source/XeroApi/Model/Account.cs
@@ -33,6 +33,13 @@ public class Account : EndpointModelBase
 
         public string ReportingCodeName { get; set; }
 
+        /// <summary>
+        /// This is an important property because Accounts that represent credit cards will
+        /// have a Type=BANK, Class=ASSET. The only way that we can map a credit card account
+        /// to a liablility isto check that BankAccountType=CREDITCARD.
+        /// </summary>
+        public string BankAccountType { get; set; }
+
         // Added for v2.14
         public bool ShowInExpenseClaims { get; set; }
 
diff --git a/source/XeroApi/Model/Attachment.cs b/source/XeroApi/Model/Attachment.cs
index dc82348..2cb01de 100644
--- a/source/XeroApi/Model/Attachment.cs
+++ b/source/XeroApi/Model/Attachment.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Xml.Serialization;
-using DevDefined.OAuth.Utility;
+using Booyami.DevDefined.OAuth.Utility;
 
 namespace XeroApi.Model
 {
diff --git a/source/XeroApi/OAuth/Consumer/ConsumerRequest.cs b/source/XeroApi/OAuth/Consumer/ConsumerRequest.cs
deleted file mode 100644
index f4736e7..0000000
--- a/source/XeroApi/OAuth/Consumer/ConsumerRequest.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Collections.Specialized;
-using System.IO;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Utility;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public class ConsumerRequest : IConsumerRequest
-    {
-        private readonly IOAuthConsumerContext _consumerContext;
-        private readonly IOAuthContext _context;
-        private readonly ICertificateFactory _clientSslCertificateFactory;
-        private readonly IOAuthSession _oauthSession;
-
-        public ConsumerRequest(IOAuthSession oauthSession, IOAuthContext context, IOAuthConsumerContext consumerContext,
-                               ICertificateFactory clientSslCertificateFactory)
-        {
-            _oauthSession = oauthSession;
-            _context = context;
-            _consumerContext = consumerContext;
-            _clientSslCertificateFactory = clientSslCertificateFactory;
-        }
-
-        public IOAuthContext Context
-        {
-            get { return _context; }
-        }
-
-        public IConsumerResponse ToConsumerResponse()
-        {
-            return _oauthSession.RunConsumerRequest(this);
-        }
-
-        public virtual HttpWebRequest ToWebRequest()
-        {
-            RequestDescription description = GetRequestDescription();
-
-            var request = (HttpWebRequest) WebRequest.Create(description.Url);
-            request.Timeout = (int) TimeSpan.FromMinutes(3).TotalMilliseconds; 
-            request.Method = description.Method;
-            request.UserAgent = _consumerContext.UserAgent;
-
-            if (!string.IsNullOrEmpty(AcceptsType))
-            {
-                request.Accept = AcceptsType;
-            }
-
-            DateTime? ifModifiedSinceDate = ParseIfModifiedSince(Context);
-
-            if (ifModifiedSinceDate.HasValue)
-                request.IfModifiedSince = ifModifiedSinceDate.Value;
-
-            if (ProxyServerUri != null)
-            {
-                request.Proxy = new WebProxy(ProxyServerUri, false);
-            }
-
-            if (description.ContentType == Parameters.HttpFormEncoded)
-            {
-                request.ContentType = description.ContentType;
-
-                using (var writer = new StreamWriter(request.GetRequestStream()))
-                {
-                    writer.Write(description.Body);
-                }
-            }
-            else if (!string.IsNullOrEmpty(description.Body))
-            {
-                using (var writer = new StreamWriter(request.GetRequestStream()))
-                {
-                    writer.Write(description.Body);
-                }
-            }
-            else if (description.RequestStream != null)
-            {
-                using (var requestStream = request.GetRequestStream())
-                {
-                    description.RequestStream.CopyTo(requestStream);
-                }
-            }
-
-            if (description.Headers.Count > 0)
-            {
-                foreach (string key in description.Headers.AllKeys)
-                {
-                    request.Headers[key] = description.Headers[key];
-                }
-            }
-
-            // Attach a client ssl certificate to the HttpWebRequest
-            if (_clientSslCertificateFactory != null)
-            {
-                X509Certificate2 certificate = _clientSslCertificateFactory.CreateCertificate();
-
-                if (certificate != null)
-                {
-                    request.ClientCertificates.Add(certificate);
-                }
-            }
-
-            return request;
-        }
-
-        public RequestDescription GetRequestDescription()
-        {
-            if (string.IsNullOrEmpty(_context.Signature))
-            {
-                _consumerContext.SignContext(_context);
-            }
-
-            Uri uri = _context.GenerateUri();
-
-            var description = new RequestDescription
-                                  {
-                                      Url = uri,
-                                      Method = _context.RequestMethod
-                                  };
-
-            if ((_context.FormEncodedParameters != null) && (_context.FormEncodedParameters.Count > 0))
-            {
-                description.ContentType = Parameters.HttpFormEncoded;
-                description.Body =
-                    UriUtility.FormatQueryString(_context.FormEncodedParameters.ToQueryParametersExcludingTokenSecret());
-            }
-            else if (!string.IsNullOrEmpty(RequestBody))
-            {
-                description.Body = UriUtility.UrlEncode(RequestBody);
-            }
-            else if (RequestStream != null)
-            {
-                description.RequestStream = RequestStream;
-            }
-
-            if (_consumerContext.UseHeaderForOAuthParameters)
-            {
-                description.Headers[Parameters.OAuth_Authorization_Header] = _context.GenerateOAuthParametersForHeader();
-            }
-
-            return description;
-        }
-
-        [Obsolete("Prefer ToConsumerResponse instead as this has more error handling built in")]
-        public HttpWebResponse ToWebResponse()
-        {
-            try
-            {
-                HttpWebRequest request = ToWebRequest();
-                return (HttpWebResponse) request.GetResponse();
-            }
-            catch (WebException webEx)
-            {
-                OAuthException authException;
-
-                if (WebExceptionHelper.TryWrapException(Context, webEx, out authException))
-                {
-                    throw authException;
-                }
-
-                throw;
-            }
-        }
-
-        public IConsumerRequest SignWithoutToken()
-        {
-            EnsureRequestHasNotBeenSignedYet();
-            _consumerContext.SignContext(_context);
-            return this;
-        }
-
-        public IConsumerRequest SignWithToken()
-        {
-            var accessToken = _oauthSession.GetAccessToken();
-            return SignWithToken(accessToken);
-        }
-
-        public IConsumerRequest SignWithToken(IToken token, bool checkForExistingSignature = true)
-        {
-            if (checkForExistingSignature)
-                EnsureRequestHasNotBeenSignedYet();
-
-            _consumerContext.SignContextWithToken(_context, token);
-            return this;
-        }
-
-        public Uri ProxyServerUri { get; set; }
-
-        public string AcceptsType { get; set; }
-
-        public string RequestBody { get; set; }
-
-        public Stream RequestStream { get; set; }
-
-        public override string ToString()
-        {
-            return ToConsumerResponse().Content;
-        }
-
-        private void EnsureRequestHasNotBeenSignedYet()
-        {
-            if (!string.IsNullOrEmpty(_context.Signature))
-            {
-                throw Error.ThisConsumerRequestHasAlreadyBeenSigned();
-            }
-        }
-
-        public DateTime? ParseIfModifiedSince(IOAuthContext context)
-        {
-            if (context.IfModifiedSince.HasValue)
-            {
-                AssertValidIfModifiedSinceDate(context.IfModifiedSince.Value);
-                return context.IfModifiedSince.Value;
-            }
-            
-            string ifModifiedSinceString = context.Headers["If-Modified-Since"];
-
-            if (string.IsNullOrEmpty(ifModifiedSinceString))
-                return null;
-
-            DateTime ifModifiedSinceDate;
-
-            if (DateTime.TryParse(ifModifiedSinceString, out ifModifiedSinceDate))
-            {
-                AssertValidIfModifiedSinceDate(ifModifiedSinceDate);
-                return ifModifiedSinceDate;
-            }
-            
-            return null;
-        }
-
-        public void AssertValidIfModifiedSinceDate(DateTime date)
-        {
-            if (date < new DateTime(1753, 01, 01))
-            {
-                throw Error.IfModifiedSinceHeaderOutOfRange(date);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/ConsumerRequestExtensions.cs b/source/XeroApi/OAuth/Consumer/ConsumerRequestExtensions.cs
deleted file mode 100644
index fc1a231..0000000
--- a/source/XeroApi/OAuth/Consumer/ConsumerRequestExtensions.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.IO;
-
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Utility;
-
-namespace DevDefined.OAuth.Consumer
-{
-  public static class ConsumerRequestExtensions
-  {
-    public static IConsumerRequest Get(this IConsumerRequest request)
-    {
-      return request.ForMethod("GET");
-    }
-
-    public static IConsumerRequest Delete(this IConsumerRequest request)
-    {
-      return request.ForMethod("DELETE");
-    }
-
-    public static IConsumerRequest Put(this IConsumerRequest request)
-    {
-      return request.ForMethod("PUT");
-    }
-
-    public static IConsumerRequest Post(this IConsumerRequest request)
-    {
-      return request.ForMethod("POST");
-    }
-
-    static void ApplyParameters(NameValueCollection destination, object anonymousClass)
-    {
-      ApplyParameters(destination, new ReflectionBasedDictionaryAdapter(anonymousClass));
-    }
-
-    static void ApplyParameters(NameValueCollection destination, IDictionary additions)
-    {
-      if (additions == null) throw new ArgumentNullException("additions");
-
-      foreach (string parameter in additions.Keys)
-      {
-        destination[parameter] = Convert.ToString(additions[parameter]);
-      }
-    }
-
-    public static IConsumerRequest ForMethod(this IConsumerRequest request, string method)
-    {
-      request.Context.RequestMethod = method;
-      return request;
-    }
-
-    public static IConsumerRequest ForUri(this IConsumerRequest request, Uri uri)
-    {
-      request.Context.RawUri = uri;
-      return request;
-    }
-
-    public static IConsumerRequest ForUrl(this IConsumerRequest request, string url)
-    {
-      request.Context.RawUri = new Uri(url);
-      return request;
-    }
-
-    public static IConsumerRequest WithFormParameters(this IConsumerRequest request, IDictionary dictionary)
-    {
-      ApplyParameters(request.Context.FormEncodedParameters, dictionary);
-      return request;
-    }
-
-    public static IConsumerRequest WithAcceptHeader(this IConsumerRequest request, string acceptsType)
-    {
-      request.AcceptsType = acceptsType;
-      return request;
-    }
-
-    public static IConsumerRequest WithIfModifiedSince(this IConsumerRequest request, DateTime? ifModifiedSinceDate)
-    {
-        request.Context.IfModifiedSince = ifModifiedSinceDate;
-        return request;
-    }
-
-    public static IConsumerRequest WithBody(this IConsumerRequest request, string requestBody)
-    {
-        request.RequestBody = requestBody;
-        return request;
-    }
-
-    public static IConsumerRequest WithRequestStream(this IConsumerRequest request, Stream requestStream)
-    {
-        request.RequestStream = requestStream;
-        return request;
-    }
-
-    public static IConsumerRequest WithFormParameters(this IConsumerRequest request, object anonymousClass)
-    {
-      ApplyParameters(request.Context.FormEncodedParameters, anonymousClass);
-      return request;
-    }
-
-    public static IConsumerRequest WithQueryParameters(this IConsumerRequest request, IDictionary dictionary)
-    {
-      ApplyParameters(request.Context.QueryParameters, dictionary);
-      return request;
-    }
-
-    public static IConsumerRequest WithQueryParameters(this IConsumerRequest request, object anonymousClass)
-    {
-      ApplyParameters(request.Context.QueryParameters, anonymousClass);
-      return request;
-    }
-
-    public static IConsumerRequest WithCookies(this IConsumerRequest request, IDictionary dictionary)
-    {
-      ApplyParameters(request.Context.Cookies, dictionary);
-      return request;
-    }
-
-    public static IConsumerRequest WithCookies(this IConsumerRequest request, object anonymousClass)
-    {
-      ApplyParameters(request.Context.Cookies, anonymousClass);
-      return request;
-    }
-
-    public static IConsumerRequest WithHeaders(this IConsumerRequest request, IDictionary dictionary)
-    {
-      ApplyParameters(request.Context.Headers, dictionary);
-      return request;
-    }
-
-    public static IConsumerRequest WithHeaders(this IConsumerRequest request, object anonymousClass)
-    {
-      ApplyParameters(request.Context.Headers, anonymousClass);
-      return request;
-    }
-
-    public static IConsumerRequest AlterContext(this IConsumerRequest request, Action<IOAuthContext> alteration)
-    {
-      alteration(request.Context);
-      return request;
-    }
-
-    public static T Select<T>(this IConsumerRequest request, Func<NameValueCollection, T> selectFunc)
-    {
-      try
-      {
-        return selectFunc(request.ToConsumerResponse().ToBodyParameters());
-      }
-      catch (ArgumentNullException)
-      {
-        throw Error.FailedToParseResponse(request.ToString());
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/ConsumerRequestRunner.cs b/source/XeroApi/OAuth/Consumer/ConsumerRequestRunner.cs
deleted file mode 100644
index 16ab4bb..0000000
--- a/source/XeroApi/OAuth/Consumer/ConsumerRequestRunner.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-
-namespace DevDefined.OAuth.Consumer
-{
-
-    public interface IConsumerRequestRunner
-    {
-        IConsumerResponse Run(IConsumerRequest consumerRequest);
-    }
-
-    public class DefaultConsumerRequestRunner : IConsumerRequestRunner
-    {
-
-        public IConsumerResponse Run(IConsumerRequest consumerRequest)
-        {
-            HttpWebRequest webRequest = consumerRequest.ToWebRequest();
-            IConsumerResponse consumerResponse = null;
-
-            var stopwatch = Stopwatch.StartNew();
-
-            try
-            {
-                var httpWebResponse = webRequest.GetResponse() as HttpWebResponse;
-                consumerResponse = new ConsumerResponse(httpWebResponse, GetElapsedTimespan(stopwatch));
-            }
-            catch (WebException webEx)
-            {
-                // I *think* it's safe to assume that the response will always be a HttpWebResponse...
-                HttpWebResponse httpWebResponse = (HttpWebResponse)(webEx.Response);
-
-                if (httpWebResponse == null)
-                {
-                    //Generate a more helpful error message, hopefully this will save someone else hours in "the abyss"
-                    if (webEx.Message.ToLower().Contains("could not create ssl/tls secure channel"))
-                    {
-                        //Find out what certificates were in the web request
-                        var clientCerts = webRequest.ClientCertificates;
-                        var certString = "";
-                        foreach (var clientCert in clientCerts)
-                        {
-                            var thumbprint = "unknown";
-                            var name = "unknown";
-
-                            var x509Certificate2 = clientCert as X509Certificate2;
-                            if (x509Certificate2 != null)
-                            {
-                                thumbprint = x509Certificate2.Thumbprint;
-                                name = x509Certificate2.GetNameInfo(X509NameType.SimpleName, false);
-                            }
-
-                            certString += String.Format("[name: \"{0}\", serial: \"{1}\", thumbprint: \"{2}\"] ",
-                                                        name,
-                                                        clientCert.GetSerialNumberString(),
-                                                        thumbprint);
-                        }
-
-                        //Try get the username that is running the current process (so we know who to give permissions to)
-                        var processUser = System.Security.Principal.WindowsIdentity.GetCurrent();
-                        var userId = "your current process";
-                        if (processUser != null)
-                        {
-                            userId = String.Format("\"{0}\"", processUser.Name);
-                        }
-
-                        throw new WebException(String.Format("{0} Check that {1} has permission to read the following certificates: {2}", webEx.Message, userId, certString));
-                    }
-
-                    throw new ApplicationException("An HttpWebResponse could not be obtained from the WebException. Status was " + webEx.Status, webEx);
-                }
-
-                consumerResponse = new ConsumerResponse(httpWebResponse, webEx, GetElapsedTimespan(stopwatch));
-            }
-
-            return consumerResponse;
-        }
-
-        private TimeSpan GetElapsedTimespan(Stopwatch stopwatch)
-        {
-            if (stopwatch.IsRunning)
-                stopwatch.Stop();
-
-            return stopwatch.Elapsed;
-        }
-    }
-
-
-}
diff --git a/source/XeroApi/OAuth/Consumer/ConsumerResponse.cs b/source/XeroApi/OAuth/Consumer/ConsumerResponse.cs
deleted file mode 100644
index 58e13c7..0000000
--- a/source/XeroApi/OAuth/Consumer/ConsumerResponse.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.IO;
-using System.Net;
-using System.Web;
-using System.Xml;
-using System.Xml.Linq;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Utility;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public interface IConsumerResponse
-    {
-        HttpStatusCode ResponseCode { get; }
-        WebHeaderCollection Headers { get; }
-        WebException WebException { get; }
-
-        bool IsServerError { get; }
-        bool IsClientError { get; }
-        bool IsGoodResponse { get; }
-        bool IsTokenExpiredResponse { get; }
-        bool IsOAuthProblemResponse { get; }
-        bool IsForbiddenResponse { get; }
-
-        TimeSpan TimeTaken { get; }
-
-        Stream Stream { get; }
-        byte[] ByteArray { get; }
-        string Content { get; }
-        string ContentType { get; }
-        int ContentLength { get; }
-        
-        OAuthProblemReport ToProblemReport();
-        XDocument ToXDocument();
-        T DeSerialiseTo<T>();
-        NameValueCollection ToBodyParameters();
-    }
-
-    public class ConsumerResponse : IConsumerResponse
-    {
-        private readonly MemoryStream _responseContentStream = new MemoryStream();
-        private readonly OAuthProblemReport _problemReport = null;
-        private readonly WebException _webException = null;
-
-
-        public ConsumerResponse(HttpWebResponse webResponse, WebException webException, TimeSpan timeTaken = default(TimeSpan))
-            : this(webResponse, timeTaken)
-        {
-            _webException = webException;
-        }
-
-        public ConsumerResponse(HttpWebResponse webResponse, TimeSpan timeTaken = default(TimeSpan))
-        {
-            webResponse.GetResponseStream().CopyTo(_responseContentStream);
-
-            if (webResponse.Headers["Content-Type"] != string.Empty)
-                ContentType = webResponse.Headers["Content-Type"];
-
-            if (webResponse.Headers["Content-Length"] != string.Empty)
-                ContentLength = int.Parse(webResponse.Headers["Content-Length"]);
-
-            TimeTaken = timeTaken;
-            ContentEncoding = webResponse.ContentEncoding;
-            ResponseCode = webResponse.StatusCode;
-            Headers = webResponse.Headers;
-
-            // Look for 'oauth_problem' in the message response for http 401 and 400 responses
-            if (ResponseCode == HttpStatusCode.Unauthorized || ResponseCode == HttpStatusCode.BadRequest)
-            {
-                _problemReport = Content.Contains(Parameters.OAuth_Problem) ? new OAuthProblemReport(Content) : null;
-            }
-        }
-
-        public Byte[] ByteArray
-        {
-            get
-            {
-                return _responseContentStream.ToArray();
-            }
-        }
-
-        public TimeSpan TimeTaken
-        {
-            get; 
-            private set;
-        }
-
-        public Stream Stream
-        {
-            get
-            {
-                return _responseContentStream;
-            }
-        }
-
-        public string Content
-        {
-            get
-            {
-                return Stream.ReadToEnd();
-            }
-        }
-
-        public string ContentEncoding
-        {
-            get; 
-            private set;
-        }
-
-        public string ContentType
-        {
-            get; 
-            private set;
-        }
-
-        public int ContentLength
-        { 
-            get; 
-            private set;
-        }
-
-        public WebException WebException
-        {
-            get { return _webException; }
-        }
-
-        public XDocument ToXDocument()
-        {
-            return XDocument.Parse(Content);
-        }
-
-        public T DeSerialiseTo<T>()
-        {
-            var serializer = new System.Xml.Serialization.XmlSerializer(typeof(T));
-
-            using (StreamReader sr = new StreamReader(Stream))
-            using (XmlReader xr = new XmlTextReader(sr))
-            {
-                return (T)serializer.Deserialize(xr);
-            }
-        }
-
-        public NameValueCollection ToBodyParameters()
-        {
-            return UriUtility.ParseQueryString(Content);
-        }
-
-        public HttpStatusCode ResponseCode
-        {
-            get; 
-            set;
-        }
-
-        public WebHeaderCollection Headers
-        {
-            get; 
-            set;
-        }
-
-        public bool IsServerError
-        {
-            get { return (int) ResponseCode >= 500; }
-        }
-
-        public bool IsClientError
-        {
-            get { return (int) ResponseCode >= 400 && (int) ResponseCode <= 499; }
-        }
-        
-        public bool IsGoodResponse
-        {
-            get { return (int)ResponseCode >= 200 && (int)ResponseCode <= 299; }
-        }
-
-        public bool IsOAuthProblemResponse
-        {
-            get { return _problemReport != null; }
-        }
-
-        public bool IsForbiddenResponse
-        {
-            get { return (int) ResponseCode == 403; }
-        }
-
-        public bool IsTokenExpiredResponse
-        {
-            get
-            {
-                return (_problemReport != null) 
-                    && (string.Compare(_problemReport.Problem, OAuthProblems.TokenExpired, true) == 0)
-                    && ( _problemReport.ProblemAdvice.Contains("expired"));
-            }
-        }
-        
-        public OAuthProblemReport ToProblemReport()
-        {
-            return _problemReport;
-        }
-    }
-}
diff --git a/source/XeroApi/OAuth/Consumer/DefaultConsumerRequestFactory.cs b/source/XeroApi/OAuth/Consumer/DefaultConsumerRequestFactory.cs
deleted file mode 100644
index b53ee51..0000000
--- a/source/XeroApi/OAuth/Consumer/DefaultConsumerRequestFactory.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using DevDefined.OAuth.Framework;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public class DefaultConsumerRequestFactory : IConsumerRequestFactory
-    {
-        static IConsumerRequestFactory _defaultInstance;
-
-        public DefaultConsumerRequestFactory()
-        {
-        }
-
-        public DefaultConsumerRequestFactory(ICertificateFactory clientSslCertificateFactory)
-        {
-            CertificateFactory = clientSslCertificateFactory;
-        }
-
-        public static IConsumerRequestFactory Instance
-        {
-            get { return _defaultInstance ?? (_defaultInstance = new DefaultConsumerRequestFactory()); }
-            set { _defaultInstance = value; }
-        }
-
-        public ICertificateFactory CertificateFactory
-        {
-            get; 
-            set;
-        }
-
-        public IConsumerRequest CreateConsumerRequest(IOAuthSession session, IOAuthContext context, IOAuthConsumerContext consumerContext)
-        {
-            return new ConsumerRequest(session, context, consumerContext, CertificateFactory);
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/ICertificateFactory.cs b/source/XeroApi/OAuth/Consumer/ICertificateFactory.cs
deleted file mode 100644
index edcd596..0000000
--- a/source/XeroApi/OAuth/Consumer/ICertificateFactory.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public interface ICertificateFactory
-    {
-        X509Certificate2 CreateCertificate();
-
-        int GetMatchingCertificateCount();
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/IConsumerRequest.cs b/source/XeroApi/OAuth/Consumer/IConsumerRequest.cs
deleted file mode 100644
index d0a3baf..0000000
--- a/source/XeroApi/OAuth/Consumer/IConsumerRequest.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-
-using DevDefined.OAuth.Framework;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public interface IConsumerRequest
-    {
-        IOAuthContext Context { get; }
-
-        [Obsolete("Prefer ToConsumerResponse instead as this has more error handling built in")]
-        HttpWebResponse ToWebResponse();
-        HttpWebRequest ToWebRequest();
-
-        IConsumerResponse ToConsumerResponse();
-        
-        RequestDescription GetRequestDescription();
-        IConsumerRequest SignWithoutToken();
-        IConsumerRequest SignWithToken();
-        IConsumerRequest SignWithToken(IToken token, bool checkForExistingSignature = true);
-
-        Uri ProxyServerUri { get; set; }
-        string AcceptsType { get; set; }
-        string RequestBody { get; set; }
-        Stream RequestStream { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/IConsumerRequestFactory.cs b/source/XeroApi/OAuth/Consumer/IConsumerRequestFactory.cs
deleted file mode 100644
index 4ec5328..0000000
--- a/source/XeroApi/OAuth/Consumer/IConsumerRequestFactory.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using DevDefined.OAuth.Framework;
-
-namespace DevDefined.OAuth.Consumer
-{
-  public interface IConsumerRequestFactory
-  {
-    IConsumerRequest CreateConsumerRequest(IOAuthSession session, IOAuthContext context, IOAuthConsumerContext consumerContext);
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/IMessageLogger.cs b/source/XeroApi/OAuth/Consumer/IMessageLogger.cs
deleted file mode 100644
index a95c387..0000000
--- a/source/XeroApi/OAuth/Consumer/IMessageLogger.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public interface IMessageLogger
-    {
-
-        void LogMessage(IConsumerRequest request, IConsumerResponse response);
-
-    }
-}
diff --git a/source/XeroApi/OAuth/Consumer/IOAuthConsumerContext.cs b/source/XeroApi/OAuth/Consumer/IOAuthConsumerContext.cs
deleted file mode 100644
index 9dda7a1..0000000
--- a/source/XeroApi/OAuth/Consumer/IOAuthConsumerContext.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Security.Cryptography;
-using DevDefined.OAuth.Framework;
-
-namespace DevDefined.OAuth.Consumer
-{
-  /// <summary>
-  /// A consumer context is used to identify a consumer, and to sign a context on behalf 
-  /// of a consumer using an optional supplied token.
-  /// </summary>
-  public interface IOAuthConsumerContext
-  {
-    string Realm { get; set; }
-    string ConsumerKey { get; set; }
-    string ConsumerSecret { get; set; }
-    string SignatureMethod { get; }
-    string UserAgent { get; set; }
-    Uri ProxyUri { get; set; }
-    AsymmetricAlgorithm Key { get; }
-    bool UseHeaderForOAuthParameters { get; }
-    void SignContext(IOAuthContext context);
-    void SignContextWithToken(IOAuthContext context, IToken token);
-
-    Uri RequestTokenUri { get; set; }
-    Uri UserAuthorizeUri { get; set; }
-    Uri AccessTokenUri { get; set; }
-    Uri BaseEndpointUri { get; set; }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/IOAuthSession.cs b/source/XeroApi/OAuth/Consumer/IOAuthSession.cs
deleted file mode 100644
index 7cd4e9a..0000000
--- a/source/XeroApi/OAuth/Consumer/IOAuthSession.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-#region License 
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Storage.Basic;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public interface IOAuthSession
-    {
-        IOAuthConsumerContext ConsumerContext { get; set; }
-        ITokenRepository TokenRepository { get; }
-
-        [Obsolete("All tokens should be stored in a ITokenRepository", true)]
-        IToken AccessToken { get; set; }
-
-        IConsumerRequest Request();
-
-        [Obsolete("Use the overloaded method without using an access token")]
-        IConsumerRequest Request(IToken accessToken);
-
-        RequestToken GetRequestToken();
-        RequestToken GetRequestToken(Uri callbackUri);
-
-        AccessToken GetAccessToken();
-        bool HasValidAccessToken { get; }
-
-        IMessageLogger MessageLogger { get; set; }
-        IConsumerResponse LogMessage(IConsumerRequest request, IConsumerResponse response);
-
-        [Obsolete("The request token is stored in the TokenRepository, use the overloaded method that only uses a verificationCode parameter")]
-        AccessToken ExchangeRequestTokenForAccessToken(IToken requestToken);
-
-        [Obsolete("The request token is stored in the TokenRepository, use the overloaded method that only uses a verificationCode parameter")]
-        AccessToken ExchangeRequestTokenForAccessToken(IToken requestToken, string verificationCode);
-
-        AccessToken ExchangeRequestTokenForAccessToken(string verificationCode);
-
-        [Obsolete("Use the GetUserAuthorizationUrl method instead")]
-        string GetUserAuthorizationUrlForToken(IToken token, string callbackUrl);
-
-        [Obsolete("Use the GetUserAuthorizationUrl method instead")]
-        string GetUserAuthorizationUrlForToken(IToken token);
-
-        string GetUserAuthorizationUrl();
-
-        IOAuthSession WithFormParameters(IDictionary<string, string> dictionary);
-        IOAuthSession WithQueryParameters(IDictionary<string, string> dictionary);
-        IOAuthSession WithCookies(IDictionary<string, string> dictionary);
-        IOAuthSession WithHeaders(IDictionary<string, string> dictionary);
-
-        // http://oauth.googlecode.com/svn/spec/ext/session/1.0/drafts/1/spec.html
-        [Obsolete("Use the overloaded method that gets the current access token and session handle from the token repository")]
-        AccessToken RenewAccessToken(IToken accessToken, string sessionHandle);
-        AccessToken RenewAccessToken();
-
-        IConsumerResponse RunConsumerRequest(IConsumerRequest consumerRequest);
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/LocalFileCertificateFactory.cs b/source/XeroApi/OAuth/Consumer/LocalFileCertificateFactory.cs
deleted file mode 100644
index c878b32..0000000
--- a/source/XeroApi/OAuth/Consumer/LocalFileCertificateFactory.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Security;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public class LocalFileCertificateFactory : ICertificateFactory
-    {
-        private readonly string _filename;
-        private readonly string _password;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalFileCertificateFactory"/> class.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <param name="password">The password.</param>
-        public LocalFileCertificateFactory(string filename, string password)
-        {
-            _filename = filename;
-            _password = password;      
-            
-            if (!File.Exists(filename))
-            {
-                throw new FileNotFoundException("The certificate file could not be located on disk.", filename);
-            }
-
-            if (CreateCertificate() == null)
-            {
-                throw new ApplicationException("The certificate could not be loaded from disk.");
-            }
-        }
-
-        /// <summary>
-        /// Creates the certificate.
-        /// </summary>
-        /// <returns></returns>
-        public X509Certificate2 CreateCertificate()
-        {
-            if (!File.Exists(_filename))
-            {
-                return null;
-            }
-
-            try
-            {
-                X509Certificate2 certificate = new X509Certificate2(_filename, _password);
-                Debug.Assert(certificate.Subject != string.Empty);
-                return certificate;
-            }
-            catch (CryptographicException)
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Counts the matching certificates.
-        /// </summary>
-        /// <returns></returns>
-        public int GetMatchingCertificateCount()
-        {
-            return CreateCertificate() != null ? 1 : 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/LocalMachineCertificateFactory.cs b/source/XeroApi/OAuth/Consumer/LocalMachineCertificateFactory.cs
deleted file mode 100644
index 94d6a49..0000000
--- a/source/XeroApi/OAuth/Consumer/LocalMachineCertificateFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-
-namespace DevDefined.OAuth.Consumer
-{
-    /// <summary>
-    /// Creates X509 certificates from the Local Computer certificate sture based on the certificate subject.
-    /// </summary>
-    public class LocalMachineCertificateFactory : ICertificateFactory
-    {
-        private string _certificateSubject;
-        private X509FindType _findType;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalMachineCertificateFactory"/> class.
-        /// </summary>
-        /// <param name="certificateSubject">The certificate subject.</param>
-        /// <param name="findType"></param>
-        public LocalMachineCertificateFactory(string certificateSubject, X509FindType findType)
-        {
-            _certificateSubject = certificateSubject;
-            _findType = findType;
-
-            ServicePointManager.ServerCertificateValidationCallback = RemoteCertificateValidationCallback;
-        }
-
-        /// <summary>
-        /// Remotes the certificate validation callback.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="certificate">The certificate.</param>
-        /// <param name="chain">The chain.</param>
-        /// <param name="sslPolicyErrors">The SSL policy errors.</param>
-        /// <returns></returns>
-        public bool RemoteCertificateValidationCallback(Object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// Creates the certificate.
-        /// </summary>
-        /// <returns></returns>
-        public X509Certificate2 CreateCertificate()
-        {
-            X509Certificate2Collection certificateCollection = GetCertificateCollection();
-            return certificateCollection.Count > 0 ? certificateCollection[0] : null;
-        }
-
-        /// <summary>
-        /// Counts the matching certificates.
-        /// </summary>
-        /// <returns></returns>
-        public int GetMatchingCertificateCount()
-        {
-            return GetCertificateCollection().Count;
-        }
-
-        /// <summary>
-        /// Gets the certificate collection.
-        /// </summary>
-        /// <returns></returns>
-        private X509Certificate2Collection GetCertificateCollection()
-        {
-            X509Store certStore = new X509Store("My", StoreLocation.LocalMachine);
-            certStore.Open(OpenFlags.ReadOnly | OpenFlags.OpenExistingOnly);
-            X509Certificate2Collection certificateCollection = certStore.Certificates.Find(_findType, _certificateSubject, false);
-            certStore.Close();
-
-            return certificateCollection;
-        } 
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/NullCertificateFactory.cs b/source/XeroApi/OAuth/Consumer/NullCertificateFactory.cs
deleted file mode 100644
index 57ae8b8..0000000
--- a/source/XeroApi/OAuth/Consumer/NullCertificateFactory.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-
-namespace DevDefined.OAuth.Consumer
-{
-    public class NullCertificateFactory : ICertificateFactory
-    {
-        public X509Certificate2 CreateCertificate()
-        {
-            return null;
-        }
-
-        public int GetMatchingCertificateCount()
-        {
-            return 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/OAuthConsumerContext.cs b/source/XeroApi/OAuth/Consumer/OAuthConsumerContext.cs
deleted file mode 100644
index cfb0e7a..0000000
--- a/source/XeroApi/OAuth/Consumer/OAuthConsumerContext.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Security.Cryptography;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Framework.Signing;
-using DevDefined.OAuth.Storage.Basic;
-
-namespace DevDefined.OAuth.Consumer
-{
-  [Serializable]
-  public class OAuthConsumerContext : IOAuthConsumerContext
-  {
-    INonceGenerator _nonceGenerator = new GuidNonceGenerator();
-    IOAuthContextSigner _signer = new OAuthContextSigner();
-
-    public OAuthConsumerContext()
-    {
-      SignatureMethod = Framework.SignatureMethod.PlainText;
-    }
-      
-    public IOAuthContextSigner Signer
-    {
-      get { return _signer; }
-      set { _signer = value; }
-    }
-
-    public INonceGenerator NonceGenerator
-    {
-      get { return _nonceGenerator; }
-      set { _nonceGenerator = value; }
-    }
-
-    public string Realm { get; set; }
-    public string ConsumerKey { get; set; }
-    public string ConsumerSecret { get; set; }
-    public string SignatureMethod { get; set; }
-    public AsymmetricAlgorithm Key { get; set; }
-    public bool UseHeaderForOAuthParameters { get; set; }
-    public string UserAgent { get; set; }
-    public Uri ProxyUri { get; set; }
-
-    public Uri RequestTokenUri { get; set; }
-    public Uri UserAuthorizeUri { get; set; }
-    public Uri AccessTokenUri { get; set; }
-    public Uri BaseEndpointUri { get; set; }
-
-    public void SignContext(IOAuthContext context)
-    {
-      EnsureStateIsValid();
-        
-      context.UseAuthorizationHeader = UseHeaderForOAuthParameters;
-      context.Nonce = _nonceGenerator.GenerateNonce(context);
-      context.ConsumerKey = ConsumerKey;
-      context.Realm = Realm;
-      context.SignatureMethod = SignatureMethod;
-      context.Timestamp = DateTime.Now.Epoch().ToString();
-      context.Version = "1.0";
-      context.Nonce = NonceGenerator.GenerateNonce(context);
-
-      string signatureBase = context.GenerateSignatureBase();
-
-      _signer.SignContext(context, new SigningContext{Algorithm = Key, SignatureBase = signatureBase, ConsumerSecret = ConsumerSecret});
-    }
-
-    public void SignContextWithToken(IOAuthContext context, IToken token)
-    {
-      context.Token = token.Token;
-      context.TokenSecret = token.TokenSecret;
-
-      if (token is AccessToken)
-      {
-          // I'm sure this violates SOLID...
-          context.SessionHandle = (token as AccessToken).SessionHandle;
-      }
-
-      SignContext(context);
-    }
-
-
-    void EnsureStateIsValid()
-    {
-      if (string.IsNullOrEmpty(ConsumerKey)) throw Error.EmptyConsumerKey();
-      if (string.IsNullOrEmpty(SignatureMethod)) throw Error.UnknownSignatureMethod(SignatureMethod);
-      if ((SignatureMethod == Framework.SignatureMethod.RsaSha1)
-          && (Key == null)) throw Error.ForRsaSha1SignatureMethodYouMustSupplyAssymetricKeyParameter();
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/OAuthSession.cs b/source/XeroApi/OAuth/Consumer/OAuthSession.cs
deleted file mode 100644
index ac64b7a..0000000
--- a/source/XeroApi/OAuth/Consumer/OAuthSession.cs
+++ /dev/null
@@ -1,441 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Security.Authentication;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Storage.Basic;
-using XeroApi.OAuth.Framework;
-
-
-namespace DevDefined.OAuth.Consumer
-{
-  [Serializable]
-  public class OAuthSession : IOAuthSession
-  {
-    readonly NameValueCollection _cookies = new NameValueCollection();
-    readonly NameValueCollection _formParameters = new NameValueCollection();
-    readonly NameValueCollection _headers = new NameValueCollection();
-    readonly NameValueCollection _queryParameters = new NameValueCollection();
-    readonly ITokenRepository _tokenRepository;
-    
-
-    [Obsolete("Use the constructor with ITokenReposiory parameter")]
-    public OAuthSession(IOAuthConsumerContext consumerContext)
-        : this(consumerContext, new InMemoryTokenRepository())
-    {
-    }
-
-
-    public OAuthSession(IOAuthConsumerContext consumerContext, ITokenRepository tokenRepository)
-    {
-        ConsumerContext = consumerContext;
-        ConsumerRequestFactory = DefaultConsumerRequestFactory.Instance;
-        ConsumerRequestRunner = new DefaultConsumerRequestRunner();
-        _tokenRepository = tokenRepository;
-    }
-
-    public IConsumerRequestRunner ConsumerRequestRunner { get; set; }
-
-    public IConsumerRequestFactory ConsumerRequestFactory { get; set; }
-
-    public bool CallbackMustBeConfirmed { get; set; }
-
-    public IOAuthConsumerContext ConsumerContext { get; set; }
-
-    public ITokenRepository TokenRepository { get { return _tokenRepository; } }
-
-    [Obsolete("All tokens should be stored in a ITokenRepository these days", true)]
-    public IToken AccessToken { get; set; }
-
-    public IMessageLogger MessageLogger { get; set; }
-
-    public IConsumerResponse LogMessage(IConsumerRequest request, IConsumerResponse response)
-    {
-        if (MessageLogger != null)
-        {
-            MessageLogger.LogMessage(request, response);
-        }
-
-        return response;
-    }
-
-    public AccessToken GetAccessToken()
-    {
-        var accessToken = _tokenRepository.GetAccessToken();
-
-        if (accessToken == null)
-        {
-            throw new MissingTokenException("The token repository doesn't contain a valid access token");
-        }
-
-        if ((accessToken.HasExpired() ?? false) && accessToken.CanRefresh)
-        {
-            // Proactively refresh the access token before using it.
-            return RenewAccessToken();
-        }
-
-        return accessToken;
-    }
-
-    public bool HasValidAccessToken
-    {
-        get
-        {
-            return (TokenRepository != null) && (TokenRepository.GetAccessToken() != null) && (!TokenRepository.GetAccessToken().HasExpired() ?? false);
-        }
-    }
-
-    [Obsolete("Use the overloaded method without using an access token")]
-    public virtual IConsumerRequest Request(IToken accessToken)
-    {
-      var context = new OAuthContext
-        {
-          UseAuthorizationHeader = ConsumerContext.UseHeaderForOAuthParameters
-        };
-
-      context.Cookies.Add(_cookies);
-      context.FormEncodedParameters.Add(_formParameters);
-      context.Headers.Add(_headers);
-      context.QueryParameters.Add(_queryParameters);
-
-      return ConsumerRequestFactory.CreateConsumerRequest(this, context, ConsumerContext);
-    }
-
-    public virtual IConsumerRequest Request()
-    {
-      var context = new OAuthContext
-      {
-        UseAuthorizationHeader = ConsumerContext.UseHeaderForOAuthParameters
-      };
-
-      context.Cookies.Add(_cookies);
-      context.FormEncodedParameters.Add(_formParameters);
-      context.Headers.Add(_headers);
-      context.QueryParameters.Add(_queryParameters);
-
-      return ConsumerRequestFactory.CreateConsumerRequest(this, context, ConsumerContext);
-    }
-
-    public RequestToken GetRequestToken()
-    {
-      return GetRequestToken(null);
-    }
-
-    public RequestToken GetRequestToken(Uri callbackUri)
-    {
-        IConsumerRequest request = Request()
-          .ForMethod("GET")
-          .AlterContext(context => context.CallbackUrl = (callbackUri == null) ? "oob" : callbackUri.ToString())
-          .AlterContext(context => context.Token = null)
-          .ForUri(ConsumerContext.RequestTokenUri)
-          .SignWithoutToken();
-
-        var results = request.Select(collection =>
-        new
-        {
-            ConsumerContext.ConsumerKey,
-            Token = ParseResponseParameter(collection, Parameters.OAuth_Token),
-            TokenSecret = ParseResponseParameter(collection, Parameters.OAuth_Token_Secret),
-            CallackConfirmed = WasCallbackConfimed(collection)
-        });
-
-        if (!results.CallackConfirmed && CallbackMustBeConfirmed)
-        {
-            throw Error.CallbackWasNotConfirmed();
-        }
-
-        var requestToken = new RequestToken
-        {
-            ConsumerKey = results.ConsumerKey,
-            Token = results.Token,
-            TokenSecret = results.TokenSecret
-        };
-
-        TokenRepository.SaveRequestToken(requestToken);
-
-        return requestToken;
-    }
-
-    [Obsolete("The request token is stored in the TokenRepository, use the overloaded method that only uses a verificationCode parameter")]
-    public AccessToken ExchangeRequestTokenForAccessToken(IToken requestToken)
-    {
-      return ExchangeRequestTokenForAccessToken(requestToken, null);
-    }
-
-    [Obsolete("The request token is stored in the TokenRepository, use the overloaded method that only uses a verificationCode parameter")]
-    public AccessToken ExchangeRequestTokenForAccessToken(IToken requestToken, string verificationCode)
-    {
-      AccessToken token = BuildExchangeRequestTokenForAccessTokenContext(requestToken, verificationCode)
-        .Select(collection =>
-                new AccessToken
-                  {
-                    ConsumerKey = requestToken.ConsumerKey,
-                    Token = ParseResponseParameter(collection,Parameters.OAuth_Token),
-                    TokenSecret = ParseResponseParameter(collection,Parameters.OAuth_Token_Secret),
-                    SessionHandle = ParseResponseParameter(collection, Parameters.OAuth_Session_Handle),
-                    SessionExpiresIn = ParseResponseParameter(collection, Parameters.OAuth_Authorization_Expires_In),
-                    ExpiresIn = ParseResponseParameter(collection, Parameters.OAuth_Expires_In),
-                    CreatedDateUtc = DateTime.UtcNow
-                  });
-
-      AssertValidAccessToken(token);
-      TokenRepository.SaveAccessToken(token);
-
-      return token;
-    }
-
-    public AccessToken ExchangeRequestTokenForAccessToken(string verificationCode)
-    {
-        var requestToken = TokenRepository.GetRequestToken();
-
-        if (requestToken == null)
-        {
-            throw new ApplicationException("The current TokenRepository doesn't have a current request token");
-        }
-
-        AccessToken token = BuildExchangeRequestTokenForAccessTokenContext(requestToken, verificationCode)
-        .Select(collection =>
-                new AccessToken
-                  {
-                    ConsumerKey = requestToken.ConsumerKey,
-                    Token = ParseResponseParameter(collection,Parameters.OAuth_Token),
-                    TokenSecret = ParseResponseParameter(collection,Parameters.OAuth_Token_Secret),
-                    SessionHandle = ParseResponseParameter(collection, Parameters.OAuth_Session_Handle),
-                    SessionExpiresIn = ParseResponseParameter(collection, Parameters.OAuth_Authorization_Expires_In),
-                    ExpiresIn = ParseResponseParameter(collection, Parameters.OAuth_Expires_In),
-                    CreatedDateUtc = DateTime.UtcNow
-                  });
-
-      AssertValidAccessToken(token);
-      TokenRepository.SaveAccessToken(token);
-
-      return token;
-    }
-      
-
-    public AccessToken RenewAccessToken(IToken accessToken, string sessionHandle)
-    {
-        var requestToken = TokenRepository.GetRequestToken();
-
-        if (requestToken == null)
-        {
-            throw new ApplicationException("The token repository doesn't have a current request token");
-        }
-
-        AccessToken token = BuildRenewAccessTokenContext(accessToken, sessionHandle)
-            .Select(collection =>
-                    new AccessToken
-                    {
-                        ConsumerKey = accessToken.ConsumerKey,
-                        Token = ParseResponseParameter(collection, Parameters.OAuth_Token),
-                        TokenSecret = ParseResponseParameter(collection, Parameters.OAuth_Token_Secret),
-                        SessionHandle = ParseResponseParameter(collection, Parameters.OAuth_Session_Handle),
-                        SessionExpiresIn = ParseResponseParameter(collection, Parameters.OAuth_Authorization_Expires_In),
-                        ExpiresIn = ParseResponseParameter(collection, Parameters.OAuth_Expires_In),
-                        CreatedDateUtc = DateTime.UtcNow
-                    });
-
-        AssertValidAccessToken(token);
-        TokenRepository.SaveAccessToken(token);
-
-        return token;
-    }
-
-    public AccessToken RenewAccessToken()
-    {
-        var currentAccessToken = TokenRepository.GetAccessToken();
-
-        if (currentAccessToken == null)
-        {
-            throw new ApplicationException("The token repository doesn't have a current access token");
-        }
-
-        return RenewAccessToken(currentAccessToken, currentAccessToken.SessionHandle);
-    }
-
-    public IConsumerRequest BuildExchangeRequestTokenForAccessTokenContext(IToken requestToken, string verificationCode)
-    {
-      return Request()
-        .ForMethod("GET")
-        .AlterContext(context => context.Verifier = verificationCode)
-        .ForUri(ConsumerContext.AccessTokenUri)
-        .SignWithToken(requestToken);
-    }
-
-    public IConsumerRequest BuildRenewAccessTokenContext(IToken requestToken, string sessionHandle)
-    {
-        return Request()
-          .ForMethod("GET")
-          .AlterContext(context => context.SessionHandle = sessionHandle)
-          .ForUri(ConsumerContext.AccessTokenUri)
-          .SignWithToken(requestToken);
-    }
-
-    [Obsolete("Use the GetUserAuthorizationUrl method instead")]
-    public string GetUserAuthorizationUrlForToken(IToken token)
-    {
-        return GetUserAuthorizationUrl(token);
-    }
-
-    [Obsolete("Use the GetUserAuthorizationUrl method instead")]
-    public string GetUserAuthorizationUrlForToken(IToken token, string callbackUrl)
-    {
-        return GetUserAuthorizationUrl(token);
-    }
-      
-    public string GetUserAuthorizationUrl()
-    {
-        var requestToken = TokenRepository.GetRequestToken();
-
-        if (requestToken == null)
-        {
-            throw new MissingTokenException("The token repository does not contain a valid request token");
-        }
-
-        return GetUserAuthorizationUrl(requestToken);
-    }
-
-    private string GetUserAuthorizationUrl(IToken requestToken)
-    {
-      var builder = new UriBuilder(ConsumerContext.UserAuthorizeUri);
-
-      var collection = new NameValueCollection();
-
-      if (builder.Query != null)
-      {
-          collection.Add(UriUtility.ParseQueryString(builder.Query));
-      }
-
-      if (_queryParameters != null) collection.Add(_queryParameters);
-
-      collection[Parameters.OAuth_Token] = requestToken.Token;
-
-      builder.Query = UriUtility.FormatQueryString(collection);
-
-      return builder.Uri.ToString();
-    }
-
-    public IOAuthSession WithFormParameters(IDictionary<string, string> dictionary)
-    {
-      return AddItems(_formParameters, dictionary);
-    }
-
-    public IOAuthSession WithQueryParameters(IDictionary<string, string> dictionary)
-    {
-      return AddItems(_queryParameters, dictionary);
-    }
-
-    public IOAuthSession WithCookies(IDictionary<string, string> dictionary)
-    {
-      return AddItems(_cookies, dictionary);
-    }
-
-    public IOAuthSession WithHeaders(IDictionary<string, string> dictionary)
-    {
-      return AddItems(_headers, dictionary);
-    }
-      
-    public IOAuthSession RequiresCallbackConfirmation()
-    {
-      CallbackMustBeConfirmed = true;
-      return this;
-    }
-
-    static bool WasCallbackConfimed(NameValueCollection parameters)
-    {
-      string value = ParseResponseParameter(parameters, Parameters.OAuth_Callback_Confirmed);
-      return (value == "true");
-    }
-
-    static string ParseResponseParameter(NameValueCollection collection, string parameter)
-    {
-      string value = (collection[parameter] ?? "").Trim();
-      return (value.Length > 0) ? value : null;
-    }
-
-    OAuthSession AddItems(NameValueCollection destination, IDictionary<string, string> additions)
-    {
-      foreach (string parameter in additions.Keys)
-      {
-        destination[parameter] = additions[parameter];
-      }
-
-      return this;
-    }
-
-    private static void AssertValidAccessToken(AccessToken token)
-    {
-        if (token == null)
-        {
-            throw new MissingTokenException("The access token could not be obtained");
-        }
-
-        string expiryDateString = token.ExpiryDateUtc.HasValue ? token.ExpiryDateUtc.ToString() : "n/a";
-        string usableTimespan = token.SessionTimespan.ToString();
-
-        Debug.WriteLine(string.Format("Access token {0} will last for {1} and will expire at {2} UTC.", token.Token, usableTimespan, expiryDateString));
-    }
-     
-
-    public IConsumerResponse RunConsumerRequest(IConsumerRequest consumerRequest)
-    {
-        int retryCounter = 2;
-        while (retryCounter-- > 0)
-        {
-            IConsumerResponse consumerResponse = ConsumerRequestRunner.Run(consumerRequest);
-            LogMessage(consumerRequest, consumerResponse);
-
-            if (consumerResponse.IsForbiddenResponse)
-            {
-                // Catch http 403 errors generated by IIS that are actually html pages warning about certificate issues..
-                throw new AuthenticationException(string.Format("The API server returned http {0} with content type {1}. See the inner exception for more details.", (int)consumerResponse.ResponseCode, consumerResponse.ContentType), consumerResponse.WebException);
-            }
-
-            if (consumerResponse.IsTokenExpiredResponse && !string.IsNullOrEmpty(consumerRequest.Context.SessionHandle))
-            {
-                // Refresh the access token and try again..
-                AccessToken newAccessToken = RenewAccessToken();
-                consumerRequest.SignWithToken(newAccessToken, false);
-                continue;
-            }
-            
-            if (consumerResponse.IsOAuthProblemResponse)
-            {
-                // A usable response wasn't returned..
-                throw new OAuthException(consumerResponse, consumerRequest.Context, consumerResponse.ToProblemReport());
-            }
-
-            return consumerResponse;
-        }
-
-        throw new ApplicationException("The consumer request could not be executed into a valid consumer response");
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/RequestDescription.cs b/source/XeroApi/OAuth/Consumer/RequestDescription.cs
deleted file mode 100644
index 30f061d..0000000
--- a/source/XeroApi/OAuth/Consumer/RequestDescription.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.IO;
-
-namespace DevDefined.OAuth.Consumer
-{
-  public class RequestDescription
-  {
-    public RequestDescription()
-    {
-      Headers = new NameValueCollection();
-    }
-
-    public Uri Url { get; set; }
-    public string Method { get; set; }
-    public string ContentType { get; set; }
-    public string Body { get; set; }
-    public Stream RequestStream { get; set; }
-    public NameValueCollection Headers { get; private set; }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Consumer/SimpleCertificateFactory.cs b/source/XeroApi/OAuth/Consumer/SimpleCertificateFactory.cs
deleted file mode 100644
index 4fa1349..0000000
--- a/source/XeroApi/OAuth/Consumer/SimpleCertificateFactory.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-
-namespace DevDefined.OAuth.Consumer
-{
-    /// <summary>
-    /// Simple Certificate Factory
-    /// </summary>
-    public class SimpleCertificateFactory : ICertificateFactory
-    {
-        private readonly X509Certificate2 _certificate;
-
-        public SimpleCertificateFactory(X509Certificate2 certificate)
-        {
-            _certificate = certificate;
-        }
-
-        public X509Certificate2 CreateCertificate()
-        {
-            return _certificate;
-        }
-
-        public int GetMatchingCertificateCount()
-        {
-            return (_certificate == null) ? 0 : 1;
-        }
-    }
-}
diff --git a/source/XeroApi/OAuth/Consumer/WebExceptionHelper.cs b/source/XeroApi/OAuth/Consumer/WebExceptionHelper.cs
deleted file mode 100644
index be6ae48..0000000
--- a/source/XeroApi/OAuth/Consumer/WebExceptionHelper.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Net;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Utility;
-
-namespace DevDefined.OAuth.Consumer
-{
-  public static class WebExceptionHelper
-  {
-    /// <summary>
-    /// Will attempt to wrap the exception, returning true if the exception was wrapped, or returning false if it was not (in which case
-    /// the original exception should be thrown).
-    /// </summary>
-    /// <param name="requestContext"></param>
-    /// <param name="webEx"></param>
-    /// <param name="authException"></param>
-    /// <returns><c>true</c>, if the authException should be throw, <c>false</c> if the original web exception should be thrown</returns>
-    public static bool TryWrapException(IOAuthContext requestContext, WebException webEx, out OAuthException authException)
-    {
-      try
-      {
-        string content = webEx.Response.ReadToEnd();
-
-        if (content.Contains(Parameters.OAuth_Problem))
-        {
-          var report = new OAuthProblemReport(content);
-          authException = new OAuthException(report.ProblemAdvice ?? report.Problem, webEx) {Context = requestContext, Report = report};
-          return true;
-        }
-      }
-      catch
-      {
-      }
-      authException = new OAuthException();
-      return false;
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/BoundParameter.cs b/source/XeroApi/OAuth/Framework/BoundParameter.cs
deleted file mode 100644
index 424ed44..0000000
--- a/source/XeroApi/OAuth/Framework/BoundParameter.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.Collections.Specialized;
-
-namespace DevDefined.OAuth.Framework
-{
-    class BoundParameter
-    {
-        readonly OAuthContext _context;
-        readonly string _name;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BoundParameter"/> class.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="context">The context.</param>
-        public BoundParameter(string name, OAuthContext context)
-        {
-            _name = name;
-            _context = context;
-        }
-
-        /// <summary>
-        /// Gets or sets the value.
-        /// </summary>
-        /// <value>The value.</value>
-        public string Value
-        {
-            get 
-            {
-                if (_context.AuthorizationHeaderParameters[_name] != null)
-                    return _context.AuthorizationHeaderParameters[_name];
-
-                if (_context.QueryParameters[_name] != null)
-                    return _context.QueryParameters[_name];
-
-                if (_context.FormEncodedParameters[_name] != null)
-                    return _context.FormEncodedParameters[_name];
-
-                return null;
-            }
-            set
-            {
-                if (value == null)
-                {
-                    Collection.Remove(_name);
-                }
-                else
-                {
-                    Collection[_name] = value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the collection.
-        /// </summary>
-        /// <value>The collection.</value>
-        NameValueCollection Collection
-        {
-            get
-            {
-                if (_context.UseAuthorizationHeader)
-                    return _context.AuthorizationHeaderParameters;
-
-                if (_context.RequestMethod == "GET")
-                    return _context.QueryParameters;
-
-                return _context.FormEncodedParameters;
-            }
-        }
-
-    }
-}
diff --git a/source/XeroApi/OAuth/Framework/DateTimeUtility.cs b/source/XeroApi/OAuth/Framework/DateTimeUtility.cs
deleted file mode 100644
index 6922d5c..0000000
Binary files a/source/XeroApi/OAuth/Framework/DateTimeUtility.cs and /dev/null differ
diff --git a/source/XeroApi/OAuth/Framework/Error.cs b/source/XeroApi/OAuth/Framework/Error.cs
deleted file mode 100644
index bbdf0cc..0000000
--- a/source/XeroApi/OAuth/Framework/Error.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.IO;
-using System.Net;
-//using DevDefined.OAuth.Provider;
-
-namespace DevDefined.OAuth.Framework
-{
-  public static class Error
-  {
-    public static Exception MissingRequiredOAuthParameter(IOAuthContext context, string parameterName)
-    {
-      var exception = new OAuthException(context, OAuthProblems.ParameterAbset,
-                                         string.Format("Missing required parameter : {0}", parameterName));
-
-      exception.Report.ParametersAbsent.Add(parameterName);
-
-      return exception;
-    }
-
-    public static Exception OAuthAuthenticationFailure(string errorMessage)
-    {
-      return new Exception(string.Format("OAuth authentication failed, message was: {0}", errorMessage));
-    }
-
-    public static Exception TokenCanNoLongerBeUsed(string token)
-    {
-      return new Exception(string.Format("Token \"{0}\" is no longer valid", token));
-    }
-
-    public static Exception FailedToParseResponse(string parameters)
-    {
-      return new Exception(string.Format("Failed to parse response string \"{0}\"", parameters));
-    }
-
-    public static Exception UnknownSignatureMethod(string signatureMethod)
-    {
-      return new Exception(string.Format("Unknown signature method \"{0}\"", signatureMethod));
-    }
-
-    public static Exception ForRsaSha1SignatureMethodYouMustSupplyAssymetricKeyParameter()
-    {
-      return
-        new Exception(
-          "For the RSASSA-PKCS1-v1_5 signature method you must use the constructor which takes an additional AssymetricAlgorithm \"key\" parameter");
-    }
-
-    public static Exception RequestFailed(WebException innerException)
-    {
-      var response = innerException.Response as HttpWebResponse;
-
-      if (response != null)
-      {
-        using (var reader = new StreamReader(innerException.Response.GetResponseStream()))
-        {
-          string body = reader.ReadToEnd();
-
-          return
-            new Exception(
-              string.Format(
-                "Request for uri: {0} failed.\r\nstatus code: {1}\r\nheaders: {2}\r\nbody:\r\n{3}",
-                response.ResponseUri, response.StatusCode, response.Headers, body), innerException);
-        }
-      }
-
-      return innerException;
-    }
-
-    public static Exception EmptyConsumerKey()
-    {
-      throw new Exception("Consumer key is null or empty");
-    }
-
-    public static Exception RequestMethodHasNotBeenAssigned(string parameter)
-    {
-      return new Exception(string.Format("The RequestMethod parameter \"{0}\" is null or empty.", parameter));
-    }
-
-    public static Exception FailedToValidateSignature(IOAuthContext context)
-    {
-      return new OAuthException(context, OAuthProblems.SignatureInvalid, "Failed to validate signature");
-    }
-
-    public static Exception UnknownConsumerKey(IOAuthContext context)
-    {
-      return new OAuthException(context, OAuthProblems.ConsumerKeyUnknown,
-                                string.Format("Unknown Consumer (Realm: {0}, Key: {1})", context.Realm,
-                                              context.ConsumerKey));
-    }
-
-    public static Exception AlgorithmPropertyNotSetOnSigningContext()
-    {
-      return
-        new Exception(
-          "Algorithm Property must be set on SingingContext when using an Assymetric encryption method such as RSA-SHA1");
-    }
-
-    public static Exception SuppliedTokenWasNotIssuedToThisConsumer(string expectedConsumerKey,
-                                                                    string actualConsumerKey)
-    {
-      return
-        new Exception(
-          string.Format("Supplied token was not issued to this consumer, expected key: {0}, actual key: {1}",
-                        expectedConsumerKey, actualConsumerKey));
-    }
-
-    /*public static Exception F(AccessOutcome outcome)
-    {
-      Uri uri = outcome.Context.GenerateUri();
-
-      if (string.IsNullOrEmpty(outcome.AdditionalInfo))
-      {
-        return new AccessDeniedException(outcome, string.Format("Access to resource \"{0}\" was denied", uri));
-      }
-
-      return new AccessDeniedException(outcome,
-                                       string.Format("Access to resource: {0} was denied, additional info: {1}",
-                                                     uri, outcome.AdditionalInfo));
-    }*/
-
-    public static Exception ConsumerHasNotBeenGrantedAccessYet(IOAuthContext context)
-    {
-      return new OAuthException(context, OAuthProblems.PermissionUnknown,
-                                "The decision to give access to the consumer has yet to be made, please try again later.");
-    }
-
-    public static Exception ConsumerHasBeenDeniedAccess(IOAuthContext context)
-    {
-      return new OAuthException(context, OAuthProblems.PermissionDenied,
-                                "The consumer was denied access to this resource.");
-    }
-
-    public static Exception CantBuildProblemReportWhenProblemEmpty()
-    {
-      return new Exception("Can't build problem report when \"Problem\" property is null or empty");
-    }
-
-    public static Exception NonceHasAlreadyBeenUsed(IOAuthContext context)
-    {
-      return new OAuthException(context, OAuthProblems.NonceUsed,
-                                string.Format("The nonce value \"{0}\" has already been used", context.Nonce));
-    }
-
-    public static Exception ThisConsumerRequestHasAlreadyBeenSigned()
-    {
-      return new Exception("The consumer request for consumer \"{0}\" has already been signed");
-    }
-
-    public static Exception CallbackWasNotConfirmed()
-    {
-      return new Exception("Callback was not confirmed");
-    }
-
-    public static Exception RejectedRequiredOAuthParameter(IOAuthContext context, string parameter)
-    {
-      return new OAuthException(context, OAuthProblems.ParameterRejected, string.Format("The parameter \"{0}\" was rejected", parameter));
-    }
-
-    public static Exception UnknownToken(IOAuthContext context, string token)
-    {
-      return new OAuthException(context, OAuthProblems.TokenRejected, string.Format("Unknown or previously rejected token \"{0}\"", token));
-    }
-
-    public static Exception UnknownToken(IOAuthContext context, string token, Exception exception)
-    {
-      return new OAuthException(context, OAuthProblems.TokenRejected, string.Format("Unknown or previously rejected token \"{0}\"", token), exception);
-    }
-
-    public static Exception RequestForTokenMustNotIncludeTokenInContext(IOAuthContext context)
-    {
-      throw new OAuthException(context, OAuthProblems.ParameterRejected, "When obtaining a request token, you must not supply the oauth_token parameter");
-    }
-
-      public static Exception IfModifiedSinceHeaderOutOfRange(DateTime ifModifiedSince)
-      {
-          return new ArgumentOutOfRangeException("ifModifiedSince", string.Format("Supplied value of If-Modified-Since header is too small: {0}", ifModifiedSince.ToString("s")));
-      }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/IConsumer.cs b/source/XeroApi/OAuth/Framework/IConsumer.cs
deleted file mode 100644
index adc8d72..0000000
--- a/source/XeroApi/OAuth/Framework/IConsumer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-namespace DevDefined.OAuth.Framework
-{
-  public interface IConsumer
-  {
-    string ConsumerKey { get; set; }
-    string Realm { get; set; }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/INonceGenerator.cs b/source/XeroApi/OAuth/Framework/INonceGenerator.cs
deleted file mode 100644
index c019c42..0000000
--- a/source/XeroApi/OAuth/Framework/INonceGenerator.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using DevDefined.OAuth.Framework;
-
-namespace DevDefined.OAuth
-{
-  /// <summary>
-  /// Generates a nonce, which should be unique for the selected consumer (i.e. never generated
-  /// by subsequent calls to <see cref="GenerateNonce" />)
-  /// </summary>
-  public interface INonceGenerator
-  {
-    string GenerateNonce(IOAuthContext context);
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/IOAuthContext.cs b/source/XeroApi/OAuth/Framework/IOAuthContext.cs
deleted file mode 100644
index 46398de..0000000
--- a/source/XeroApi/OAuth/Framework/IOAuthContext.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Specialized;
-
-namespace DevDefined.OAuth.Framework
-{
-    public interface IOAuthContext : IToken
-    {
-        NameValueCollection Headers { get; set; }
-        NameValueCollection QueryParameters { get; set; }
-        NameValueCollection Cookies { get; set; }
-        NameValueCollection FormEncodedParameters { get; set; }
-        NameValueCollection AuthorizationHeaderParameters { get; set; }
-
-        Uri RawUri { get; set; }
-
-        string NormalizedRequestUrl { get; }
-        string RequestMethod { get; set; }
-        string Nonce { get; set; }
-        string Signature { get; set; }
-        string SignatureMethod { get; set; }
-        string Timestamp { get; set; }
-        string Version { get; set; }
-        string CallbackUrl { get; set; }
-        string Verifier { get; set; }
-        string SessionHandle { get; set; }
-
-        bool UseAuthorizationHeader { get; set; }
-        DateTime? IfModifiedSince { get; set; }
-
-        Uri GenerateUri();
-        string GenerateUrl();
-        string GenerateOAuthParametersForHeader();
-        Uri GenerateUriWithoutOAuthParameters();
-        string GenerateSignatureBase();
-        string ToString();
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/IToken.cs b/source/XeroApi/OAuth/Framework/IToken.cs
deleted file mode 100644
index 71a807a..0000000
--- a/source/XeroApi/OAuth/Framework/IToken.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-
-namespace DevDefined.OAuth.Framework
-{  
-  public interface IToken : IConsumer
-  {
-    string TokenSecret { get; set; }
-    string Token { get; set; }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/MissingTokenException.cs b/source/XeroApi/OAuth/Framework/MissingTokenException.cs
deleted file mode 100644
index 74a9eab..0000000
--- a/source/XeroApi/OAuth/Framework/MissingTokenException.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace XeroApi.OAuth.Framework
-{
-    public class MissingTokenException : Exception
-    {
-        public MissingTokenException()
-        {
-        }
-
-        public MissingTokenException(string message)
-            : base(message)
-        {
-        }
-
-        public MissingTokenException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        public MissingTokenException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
-    }
-}
diff --git a/source/XeroApi/OAuth/Framework/NonceGenerator.cs b/source/XeroApi/OAuth/Framework/NonceGenerator.cs
deleted file mode 100644
index 0acec50..0000000
Binary files a/source/XeroApi/OAuth/Framework/NonceGenerator.cs and /dev/null differ
diff --git a/source/XeroApi/OAuth/Framework/OAuthContext.cs b/source/XeroApi/OAuth/Framework/OAuthContext.cs
deleted file mode 100644
index 0c029e8..0000000
--- a/source/XeroApi/OAuth/Framework/OAuthContext.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using QueryParameter = System.Collections.Generic.KeyValuePair<string, string>;
-
-namespace DevDefined.OAuth.Framework
-{
-  [Serializable]
-  public class OAuthContext : IOAuthContext
-  {
-    readonly BoundParameter _callbackUrl;
-    readonly BoundParameter _consumerKey;
-    readonly BoundParameter _nonce;
-    readonly BoundParameter _signature;
-    readonly BoundParameter _signatureMethod;
-    readonly BoundParameter _timestamp;
-    readonly BoundParameter _token;
-    readonly BoundParameter _tokenSecret;
-    readonly BoundParameter _verifier;
-    readonly BoundParameter _sessionHandle;
-    readonly BoundParameter _expiresIn;
-    readonly BoundParameter _version;
-    NameValueCollection _authorizationHeaderParameters;
-    NameValueCollection _cookies;
-    NameValueCollection _formEncodedParameters;
-    NameValueCollection _headers;
-    private DateTime? _ifModifiedSince;
-    string _normalizedRequestUrl;
-    NameValueCollection _queryParameters;
-    Uri _rawUri;
-
-    public OAuthContext()
-    {
-      _verifier = new BoundParameter(Parameters.OAuth_Verifier, this);
-      _consumerKey = new BoundParameter(Parameters.OAuth_Consumer_Key, this);
-      _callbackUrl = new BoundParameter(Parameters.OAuth_Callback, this);
-      _nonce = new BoundParameter(Parameters.OAuth_Nonce, this);
-      _signature = new BoundParameter(Parameters.OAuth_Signature, this);
-      _signatureMethod = new BoundParameter(Parameters.OAuth_Signature_Method, this);
-      _timestamp = new BoundParameter(Parameters.OAuth_Timestamp, this);
-      _token = new BoundParameter(Parameters.OAuth_Token, this);
-      _tokenSecret = new BoundParameter(Parameters.OAuth_Token_Secret, this);
-      _version = new BoundParameter(Parameters.OAuth_Version, this);
-      _sessionHandle = new BoundParameter(Parameters.OAuth_Session_Handle, this);
-      _expiresIn = new BoundParameter(Parameters.OAuth_Expires_In, this);
-
-      FormEncodedParameters = new NameValueCollection();
-      Cookies = new NameValueCollection();
-      Headers = new NameValueCollection();
-      AuthorizationHeaderParameters = new NameValueCollection();
-    }
-
-    public NameValueCollection Headers
-    {
-      get
-      {
-        if (_headers == null) _headers = new NameValueCollection();
-        return _headers;
-      }
-      set { _headers = value; }
-    }
-
-    public NameValueCollection QueryParameters
-    {
-      get
-      {
-        if (_queryParameters == null) _queryParameters = new NameValueCollection();
-        return _queryParameters;
-      }
-      set { _queryParameters = value; }
-    }
-
-    public NameValueCollection Cookies
-    {
-      get
-      {
-        if (_cookies == null) _cookies = new NameValueCollection();
-        return _cookies;
-      }
-      set { _cookies = value; }
-    }
-
-    public NameValueCollection FormEncodedParameters
-    {
-      get
-      {
-        if (_formEncodedParameters == null) _formEncodedParameters = new NameValueCollection();
-        return _formEncodedParameters;
-      }
-      set { _formEncodedParameters = value; }
-    }
-
-    public NameValueCollection AuthorizationHeaderParameters
-    {
-      get
-      {
-        if (_authorizationHeaderParameters == null) _authorizationHeaderParameters = new NameValueCollection();
-        return _authorizationHeaderParameters;
-      }
-      set { _authorizationHeaderParameters = value; }
-    }
-
-    public Uri RawUri
-    {
-      get { return _rawUri; }
-      set
-      {
-        _rawUri = value;
-
-        NameValueCollection newParameters = UriUtility.ParseQueryString(_rawUri.Query);
-
-        // TODO: tidy this up, bit clunky
-
-        foreach (string parameter in newParameters)
-        {
-          QueryParameters[parameter] = newParameters[parameter];
-        }
-
-        _normalizedRequestUrl = UriUtility.NormalizeUri(_rawUri);
-      }
-    }
-
-    public string NormalizedRequestUrl
-    {
-      get { return _normalizedRequestUrl; }
-    }
-
-    public string RequestMethod { get; set; }
-
-    public string Nonce
-    {
-      get { return _nonce.Value; }
-      set { _nonce.Value = value; }
-    }
-
-    public string Verifier
-    {
-      get { return _verifier.Value; }
-      set { _verifier.Value = value; }
-    }
-
-    public string SessionHandle
-    {
-        get { return _sessionHandle.Value; }
-        set { _sessionHandle.Value = value; }
-    }
-
-    public string ExpiresIn
-    {
-      get { return _expiresIn.Value; }
-      set { _expiresIn.Value = value; }
-    }
-
-    public string CallbackUrl
-    {
-      get { return _callbackUrl.Value; }
-      set { _callbackUrl.Value = value; }
-    }
-
-    public string Signature
-    {
-      get { return _signature.Value; }
-      set { _signature.Value = value; }
-    }
-
-    public string SignatureMethod
-    {
-      get { return _signatureMethod.Value; }
-      set { _signatureMethod.Value = value; }
-    }
-
-    public string Timestamp
-    {
-      get { return _timestamp.Value; }
-      set { _timestamp.Value = value; }
-    }
-
-    public string Version
-    {
-      get { return _version.Value; }
-      set { _version.Value = value; }
-    }
-
-    public bool UseAuthorizationHeader { get; set; }
-
-    public DateTime? IfModifiedSince
-    {
-        get { return _ifModifiedSince; }
-        set { _ifModifiedSince = value; }
-    }
-
-    public string Realm
-    {
-      get { return AuthorizationHeaderParameters[Parameters.Realm]; }
-      set { AuthorizationHeaderParameters[Parameters.Realm] = value; }
-    }
-
-    public string ConsumerKey
-    {
-      get { return _consumerKey.Value; }
-      set { _consumerKey.Value = value; }
-    }
-
-    public string Token
-    {
-      get { return _token.Value; }
-      set { _token.Value = value; }
-    }
-
-    public string TokenSecret
-    {
-      get { return _tokenSecret.Value; }
-      set { _tokenSecret.Value = value; }
-    }
-
-    public Uri GenerateUri()
-    {
-      var builder = new UriBuilder(NormalizedRequestUrl);
-
-      IEnumerable<QueryParameter> parameters = QueryParameters.ToQueryParametersExcludingTokenSecret();
-
-      builder.Query = UriUtility.FormatQueryString(parameters);
-
-      return builder.Uri;
-    }
-
-    public string GenerateUrl()
-    {
-      var builder = new UriBuilder(NormalizedRequestUrl);
-
-      builder.Query = "";
-
-      return builder.Uri + "?" + UriUtility.FormatQueryString(QueryParameters);
-    }
-
-    public string GenerateOAuthParametersForHeader()
-    {
-      var builder = new StringBuilder();
-
-      if (Realm != null) builder.Append("realm=\"").Append(Realm).Append("\"");
-
-      IEnumerable<QueryParameter> parameters = AuthorizationHeaderParameters.ToQueryParametersExcludingTokenSecret();
-
-      foreach (
-        var parameter in parameters.Where(p => p.Key != Parameters.Realm)
-        )
-      {
-        if (builder.Length > 0) builder.Append(",");
-        builder.Append(UriUtility.UrlEncode(parameter.Key)).Append("=\"").Append(
-          UriUtility.UrlEncode(parameter.Value)).Append("\"");
-      }
-
-      builder.Insert(0, "OAuth ");
-
-      return builder.ToString();
-    }
-
-    public Uri GenerateUriWithoutOAuthParameters()
-    {
-      var builder = new UriBuilder(NormalizedRequestUrl);
-
-      IEnumerable<QueryParameter> parameters = QueryParameters.ToQueryParameters()
-        .Where(q => !q.Key.StartsWith(Parameters.OAuthParameterPrefix));
-
-      builder.Query = UriUtility.FormatQueryString(parameters);
-
-      return builder.Uri;
-    }
-
-
-    public string GenerateSignatureBase()
-    {
-      if (string.IsNullOrEmpty(ConsumerKey))
-      {
-        throw Error.MissingRequiredOAuthParameter(this, Parameters.OAuth_Consumer_Key);
-      }
-
-      if (string.IsNullOrEmpty(SignatureMethod))
-      {
-        throw Error.MissingRequiredOAuthParameter(this, Parameters.OAuth_Signature_Method);
-      }
-
-      if (string.IsNullOrEmpty(RequestMethod))
-      {
-        throw Error.RequestMethodHasNotBeenAssigned("RequestMethod");
-      }
-
-      var allParameters = new List<QueryParameter>();
-
-      //fix for issue: http://groups.google.com/group/oauth/browse_thread/thread/42ef5fecc54a7e9a/a54e92b13888056c?hl=en&lnk=gst&q=Signing+PUT+Request#a54e92b13888056c
-      if (FormEncodedParameters != null && RequestMethod == "POST") 
-          allParameters.AddRange(FormEncodedParameters.ToQueryParametersExcludingTokenSecret());
-
-      if (QueryParameters != null) allParameters.AddRange(QueryParameters.ToQueryParametersExcludingTokenSecret());
-
-      if (Cookies != null) allParameters.AddRange(Cookies.ToQueryParametersExcludingTokenSecret());
-
-      if (AuthorizationHeaderParameters != null)
-        allParameters.AddRange(AuthorizationHeaderParameters.ToQueryParametersExcludingTokenSecret().Where(q => q.Key != Parameters.Realm));
-
-      allParameters.RemoveAll(param => param.Key == Parameters.OAuth_Signature);
-
-      string signatureBase = UriUtility.FormatParameters(RequestMethod, new Uri(NormalizedRequestUrl), allParameters);
-
-      return signatureBase;
-    }
-
-
-
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/OAuthException.cs b/source/XeroApi/OAuth/Framework/OAuthException.cs
deleted file mode 100644
index 890b3db..0000000
--- a/source/XeroApi/OAuth/Framework/OAuthException.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Runtime.Serialization;
-using DevDefined.OAuth.Consumer;
-
-namespace DevDefined.OAuth.Framework
-{
-  public class OAuthException : Exception
-  {
-    public OAuthException()
-    {
-    }
-
-    public OAuthException(string message, Exception innerException)
-      : base(message, innerException)
-    {      
-    }
-
-    public OAuthException(IOAuthContext context, string problem, string advice) 
-        : base(advice)
-    {
-      Context = context;
-      Report = new OAuthProblemReport() {Problem = problem, ProblemAdvice = advice};
-    }
-
-    public OAuthException(IOAuthContext context, string problem, string advice, Exception innerException)
-      : base(advice, innerException)
-    {
-      Context = context;
-      Report = new OAuthProblemReport() {Problem = problem, ProblemAdvice = advice};
-    }
-
-    public OAuthException(SerializationInfo info, StreamingContext context) 
-        : base(info, context)
-    {
-    }
-
-    public OAuthException(IConsumerResponse consumerResponse, IOAuthContext requestContext, OAuthProblemReport problemReport)
-        : base(problemReport.ProblemAdvice)
-    {
-        ConsumerResponse = consumerResponse;
-        Report = problemReport;
-        Context = requestContext;
-    }
-
-    public OAuthProblemReport Report { get; set; }
-    public IOAuthContext Context { get; set; }
-    public IConsumerResponse ConsumerResponse { get; set;}
-  }
-}
diff --git a/source/XeroApi/OAuth/Framework/OAuthProblemReport.cs b/source/XeroApi/OAuth/Framework/OAuthProblemReport.cs
deleted file mode 100644
index cc4e61b..0000000
--- a/source/XeroApi/OAuth/Framework/OAuthProblemReport.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using System.Web;
-
-namespace DevDefined.OAuth.Framework
-{
-  [Serializable]
-  public class OAuthProblemReport
-  {
-    public OAuthProblemReport()
-    {
-      ParametersRejected = new List<string>();
-      ParametersAbsent = new List<string>();
-    }
-
-    public OAuthProblemReport(NameValueCollection parameters)
-    {
-      Problem = parameters[Parameters.OAuth_Problem];
-
-      ProblemAdvice = parameters[Parameters.OAuth_Problem_Advice];
-
-      ParametersAbsent = parameters.AllKeys.Any(key => key == Parameters.OAuth_Parameters_Absent)
-                           ? ParseFormattedParameters(parameters[Parameters.OAuth_Parameters_Absent])
-                           : new List<string>();
-
-      ParametersRejected = parameters.AllKeys.Any(key => key == Parameters.OAuth_Parameters_Rejected)
-                             ? ParseFormattedParameters(parameters[Parameters.OAuth_Parameters_Rejected])
-                             : new List<string>();
-
-      if (parameters.AllKeys.Any(key => key == Parameters.OAuth_Acceptable_Timestamps))
-      {
-        string[] timeStamps = parameters[Parameters.OAuth_Acceptable_Timestamps].Split(new[] {'-'});
-        AcceptableTimeStampsFrom = DateTimeUtility.FromEpoch(Convert.ToInt64(timeStamps[0]));
-        AcceptableTimeStampsTo = DateTimeUtility.FromEpoch(Convert.ToInt64(timeStamps[1]));
-      }
-
-      if (parameters.AllKeys.Any(key => key == Parameters.OAuth_Acceptable_Versions))
-      {
-        string[] versions = parameters[Parameters.OAuth_Acceptable_Versions].Split(new[] {'-'});
-        AcceptableVersionFrom = versions[0];
-        AcceptableVersionTo = versions[1];
-      }
-    }
-
-    public OAuthProblemReport(string formattedReport)
-        : this(UriUtility.ParseQueryString(formattedReport))
-    {
-    }
-
-    public string AcceptableVersionTo { get; set; }
-    public string AcceptableVersionFrom { get; set; }
-    public List<string> ParametersRejected { get; set; }
-    public List<string> ParametersAbsent { get; set; }
-    public string ProblemAdvice { get; set; }
-    public string Problem { get; set; }
-    public DateTime? AcceptableTimeStampsTo { get; set; }
-    public DateTime? AcceptableTimeStampsFrom { get; set; }
-
-    public override string ToString()
-    {
-      if (string.IsNullOrEmpty(Problem)) throw Error.CantBuildProblemReportWhenProblemEmpty();
-
-      var response = new NameValueCollection();
-
-      response[Parameters.OAuth_Problem] = Problem;
-
-      if (!string.IsNullOrEmpty(ProblemAdvice))
-      {
-        response[Parameters.OAuth_Problem_Advice] = ProblemAdvice.Replace("\r\n", "\n").Replace("\r", "\n");
-      }
-
-      if (ParametersAbsent.Count > 0)
-      {
-        response[Parameters.OAuth_Parameters_Absent] = FormatParameterNames(ParametersAbsent);
-      }
-
-      if (ParametersRejected.Count > 0)
-      {
-        response[Parameters.OAuth_Parameters_Rejected] = FormatParameterNames(ParametersRejected);
-      }
-
-      if (AcceptableTimeStampsFrom.HasValue && AcceptableTimeStampsTo.HasValue)
-      {
-        response[Parameters.OAuth_Acceptable_Timestamps] = string.Format("{0}-{1}",
-                                                                         AcceptableTimeStampsFrom.Value.Epoch(),
-                                                                         AcceptableTimeStampsTo.Value.Epoch());
-      }
-
-      if (!(string.IsNullOrEmpty(AcceptableVersionFrom) || string.IsNullOrEmpty(AcceptableVersionTo)))
-      {
-        response[Parameters.OAuth_Acceptable_Versions] = string.Format("{0}-{1}", AcceptableVersionFrom,
-                                                                       AcceptableVersionTo);
-      }
-
-      return UriUtility.FormatQueryString(response);
-    }
-
-    static string FormatParameterNames(IEnumerable<string> names)
-    {
-      var builder = new StringBuilder();
-
-      foreach (string name in names)
-      {
-        if (builder.Length > 0) builder.Append("&");
-        builder.Append(UriUtility.UrlEncode(name));
-      }
-
-      return builder.ToString();
-    }
-
-    static List<string> ParseFormattedParameters(string formattedList)
-    {
-      return formattedList.Split(new[] {'&'}, StringSplitOptions.RemoveEmptyEntries).ToList();
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/OAuthProblems.cs b/source/XeroApi/OAuth/Framework/OAuthProblems.cs
deleted file mode 100644
index d323d68..0000000
--- a/source/XeroApi/OAuth/Framework/OAuthProblems.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-namespace DevDefined.OAuth.Framework
-{
-  public static class OAuthProblems
-  {
-    public const string AdditionalAuthorizationRequired = "additional_authorization_required";
-    public const string ConsumerKeyRefused = "consumer_key_refused";
-    public const string ConsumerKeyRejected = "consumer_key_rejected";
-    public const string ConsumerKeyUnknown = "consumer_key_unknown";
-    public const string NonceUsed = "nonce_used";
-    public const string ParameterAbset = "parameter_absent";
-    public const string ParameterRejected = "parameter_rejected";
-    public const string PermissionDenied = "permission_denied";
-    public const string PermissionUnknown = "permission_unknown";
-    public const string SignatureInvalid = "signature_invalid";
-    public const string SignatureMethodRejected = "signature_method_rejected";
-    public const string TimestampRefused = "timestamp_refused";
-    public const string TokenExpired = "token_expired";
-    public const string TokenRejected = "token_rejected";
-    public const string TokenRevoked = "token_revoked";
-    public const string TokenUsed = "token_used";
-    public const string UserRefused = "user_refused";
-    public const string VersionRejected = "version_rejected";
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/Parameters.cs b/source/XeroApi/OAuth/Framework/Parameters.cs
deleted file mode 100644
index 3e503d4..0000000
--- a/source/XeroApi/OAuth/Framework/Parameters.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-namespace DevDefined.OAuth.Framework
-{
-  public static class Parameters
-  {
-    public const string OAuth_Acceptable_Timestamps = "oauth_acceptable_timestamps";
-    public const string OAuth_Acceptable_Versions = "oauth_acceptable_versions";
-    public const string OAuth_Authorization_Header = "Authorization";
-    public const string OAuth_Callback = "oauth_callback";
-    public const string OAuth_Callback_Confirmed = "oauth_callback_confirmed";
-    public const string OAuth_Consumer_Key = "oauth_consumer_key";
-    public const string OAuth_Nonce = "oauth_nonce";
-    public const string OAuth_Parameters_Absent = "oauth_parameters_absent";
-    public const string OAuth_Parameters_Rejected = "oauth_parameters_rejected";
-    public const string OAuth_Problem = "oauth_problem";
-    public const string OAuth_Problem_Advice = "oauth_problem_advice";
-    public const string OAuth_Signature = "oauth_signature";
-    public const string OAuth_Signature_Method = "oauth_signature_method";
-    public const string OAuth_Timestamp = "oauth_timestamp";
-    public const string OAuth_Token = "oauth_token";
-    public const string OAuth_Token_Secret = "oauth_token_secret";
-    public const string OAuth_Verifier = "oauth_verifier";
-    public const string OAuth_Version = "oauth_version";
-    public const string OAuth_Session_Handle = "oauth_session_handle";
-    public const string OAuth_Expires_In = "oauth_expires_in";
-    public const string OAuth_Authorization_Expires_In = "oauth_authorization_expires_in";
-    public const string OAuthParameterPrefix = "oauth_";
-    public const string Realm = "realm";
-    public const string HttpFormEncoded = "application/x-www-form-urlencoded; charset=utf-8";
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/SignatureMethod.cs b/source/XeroApi/OAuth/Framework/SignatureMethod.cs
deleted file mode 100644
index 865a1f1..0000000
--- a/source/XeroApi/OAuth/Framework/SignatureMethod.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-namespace DevDefined.OAuth.Framework
-{
-  public static class SignatureMethod
-  {
-    public const string HmacSha1 = "HMAC-SHA1";
-    public const string PlainText = "PLAINTEXT";
-    public const string RsaSha1 = "RSA-SHA1";
-  }
-}
diff --git a/source/XeroApi/OAuth/Framework/Signing/HmacSha1SignatureImplementation.cs b/source/XeroApi/OAuth/Framework/Signing/HmacSha1SignatureImplementation.cs
deleted file mode 100644
index 95902db..0000000
--- a/source/XeroApi/OAuth/Framework/Signing/HmacSha1SignatureImplementation.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace DevDefined.OAuth.Framework.Signing
-{
-  public class HmacSha1SignatureImplementation : IContextSignatureImplementation
-  {
-    public string MethodName
-    {
-      get { return SignatureMethod.HmacSha1; }
-    }
-
-    public void SignContext(IOAuthContext authContext, SigningContext signingContext)
-    {
-      authContext.Signature = GenerateSignature(authContext, signingContext);
-    }
-
-    public bool ValidateSignature(IOAuthContext authContext, SigningContext signingContext)
-    {
-      return (authContext.Signature == GenerateSignature(authContext, signingContext));
-    }
-
-    static string GenerateSignature(IToken authContext, SigningContext signingContext)
-    {
-      string consumerSecret = (signingContext.ConsumerSecret != null)
-                                ? UriUtility.UrlEncode(signingContext.ConsumerSecret)
-                                : "";
-      string tokenSecret = (authContext.TokenSecret != null)
-                             ? UriUtility.UrlEncode(authContext.TokenSecret)
-                             : null;
-      string hashSource = string.Format("{0}&{1}", consumerSecret, tokenSecret);
-
-      var hashAlgorithm = new HMACSHA1 {Key = Encoding.ASCII.GetBytes(hashSource)};
-
-      return ComputeHash(hashAlgorithm, signingContext.SignatureBase);
-    }
-
-    static string ComputeHash(HashAlgorithm hashAlgorithm, string data)
-    {
-      if (hashAlgorithm == null)
-      {
-        throw new ArgumentNullException("hashAlgorithm");
-      }
-
-      if (string.IsNullOrEmpty(data))
-      {
-        throw new ArgumentNullException("data");
-      }
-
-      byte[] dataBuffer = Encoding.ASCII.GetBytes(data);
-      byte[] hashBytes = hashAlgorithm.ComputeHash(dataBuffer);
-
-      return Convert.ToBase64String(hashBytes);
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/Signing/IContextSignatureImplementation.cs b/source/XeroApi/OAuth/Framework/Signing/IContextSignatureImplementation.cs
deleted file mode 100644
index 4b6d87c..0000000
--- a/source/XeroApi/OAuth/Framework/Signing/IContextSignatureImplementation.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-namespace DevDefined.OAuth.Framework.Signing
-{
-  public interface IContextSignatureImplementation
-  {
-    string MethodName { get; }
-    void SignContext(IOAuthContext authContext, SigningContext signingContext);
-    bool ValidateSignature(IOAuthContext authContext, SigningContext signingContext);
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/Signing/IOAuthContextSigner.cs b/source/XeroApi/OAuth/Framework/Signing/IOAuthContextSigner.cs
deleted file mode 100644
index 7f3f2d3..0000000
--- a/source/XeroApi/OAuth/Framework/Signing/IOAuthContextSigner.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-namespace DevDefined.OAuth.Framework.Signing
-{
-  public interface IOAuthContextSigner
-  {
-    void SignContext(IOAuthContext authContext, SigningContext signingContext);
-    bool ValidateSignature(IOAuthContext authContext, SigningContext signingContext);
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/Signing/OAuthContextSigner.cs b/source/XeroApi/OAuth/Framework/Signing/OAuthContextSigner.cs
deleted file mode 100644
index d1f16f0..0000000
--- a/source/XeroApi/OAuth/Framework/Signing/OAuthContextSigner.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DevDefined.OAuth.Framework.Signing
-{
-  public class OAuthContextSigner : IOAuthContextSigner
-  {
-    readonly List<IContextSignatureImplementation> _implementations =
-      new List<IContextSignatureImplementation>();
-
-    public OAuthContextSigner(params IContextSignatureImplementation[] implementations)
-    {
-      if (implementations != null) _implementations.AddRange(implementations);
-    }
-
-    public OAuthContextSigner()
-      : this(
-        new RsaSha1SignatureImplementation(), new HmacSha1SignatureImplementation(),
-        new PlainTextSignatureImplementation())
-    {
-    }
-
-    public void SignContext(IOAuthContext authContext, SigningContext signingContext)
-    {
-      signingContext.SignatureBase = authContext.GenerateSignatureBase();
-      FindImplementationForAuthContext(authContext).SignContext(authContext, signingContext);
-    }
-
-    public bool ValidateSignature(IOAuthContext authContext, SigningContext signingContext)
-    {
-      signingContext.SignatureBase = authContext.GenerateSignatureBase();
-      return FindImplementationForAuthContext(authContext).ValidateSignature(authContext, signingContext);
-    }
-
-    IContextSignatureImplementation FindImplementationForAuthContext(IOAuthContext authContext)
-    {
-      IContextSignatureImplementation impl =
-        _implementations.FirstOrDefault(i => i.MethodName == authContext.SignatureMethod);
-
-      if (impl != null) return impl;
-
-      throw Error.UnknownSignatureMethod(authContext.SignatureMethod);
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/Signing/PlainTextSignatureImplementation.cs b/source/XeroApi/OAuth/Framework/Signing/PlainTextSignatureImplementation.cs
deleted file mode 100644
index dd1e53c..0000000
--- a/source/XeroApi/OAuth/Framework/Signing/PlainTextSignatureImplementation.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-namespace DevDefined.OAuth.Framework.Signing
-{
-  public class PlainTextSignatureImplementation : IContextSignatureImplementation
-  {
-    public string MethodName
-    {
-      get { return SignatureMethod.PlainText; }
-    }
-
-    public void SignContext(IOAuthContext authContext, SigningContext signingContext)
-    {
-      authContext.Signature = GenerateSignature(authContext, signingContext);
-    }
-
-    public bool ValidateSignature(IOAuthContext authContext, SigningContext signingContext)
-    {
-      return (authContext.Signature == GenerateSignature(authContext, signingContext));
-    }
-
-    string GenerateSignature(IOAuthContext authContext, SigningContext signingContext)
-    {
-      return UriUtility.UrlEncode(string.Format("{0}&{1}", signingContext.ConsumerSecret, authContext.TokenSecret));
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/Signing/RsaSha1SignatureImplementation.cs b/source/XeroApi/OAuth/Framework/Signing/RsaSha1SignatureImplementation.cs
deleted file mode 100644
index b2a58ad..0000000
--- a/source/XeroApi/OAuth/Framework/Signing/RsaSha1SignatureImplementation.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace DevDefined.OAuth.Framework.Signing
-{
-  public class RsaSha1SignatureImplementation : IContextSignatureImplementation
-  {
-    public string MethodName
-    {
-      get { return SignatureMethod.RsaSha1; }
-    }
-
-    public void SignContext(IOAuthContext authContext, SigningContext signingContext)
-    {
-      authContext.Signature = GenerateSignature(authContext, signingContext);
-    }
-
-    public bool ValidateSignature(IOAuthContext authContext, SigningContext signingContext)
-    {
-      if (signingContext.Algorithm == null) 
-          throw Error.AlgorithmPropertyNotSetOnSigningContext();
-
-      SHA1CryptoServiceProvider sha1 = GenerateHash(signingContext);
-
-      var deformatter = new RSAPKCS1SignatureDeformatter(signingContext.Algorithm);
-      deformatter.SetHashAlgorithm("MD5");
-
-      byte[] signature = Convert.FromBase64String(authContext.Signature);
-
-      return deformatter.VerifySignature(sha1, signature);
-    }
-
-    string GenerateSignature(IOAuthContext authContext, SigningContext signingContext)
-    {
-      if (signingContext.Algorithm == null) 
-          throw Error.AlgorithmPropertyNotSetOnSigningContext();
-
-      SHA1CryptoServiceProvider sha1 = GenerateHash(signingContext);
-
-      var formatter = new RSAPKCS1SignatureFormatter(signingContext.Algorithm);
-      formatter.SetHashAlgorithm("MD5");
-
-      byte[] signature = formatter.CreateSignature(sha1);
-
-      return Convert.ToBase64String(signature);
-    }
-
-    SHA1CryptoServiceProvider GenerateHash(SigningContext signingContext)
-    {
-      var sha1 = new SHA1CryptoServiceProvider();
-
-      byte[] dataBuffer = Encoding.ASCII.GetBytes(signingContext.SignatureBase);
-
-      var cs = new CryptoStream(Stream.Null, sha1, CryptoStreamMode.Write);
-      cs.Write(dataBuffer, 0, dataBuffer.Length);
-      cs.Close();
-      return sha1;
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/SigningContext.cs b/source/XeroApi/OAuth/Framework/SigningContext.cs
deleted file mode 100644
index 8215498..0000000
--- a/source/XeroApi/OAuth/Framework/SigningContext.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System.Security.Cryptography;
-
-namespace DevDefined.OAuth.Framework
-{
-  public class SigningContext
-  {
-    public AsymmetricAlgorithm Algorithm { get; set; }
-    public string ConsumerSecret { get; set; }
-    public string SignatureBase { get; set; }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/TokenBase.cs b/source/XeroApi/OAuth/Framework/TokenBase.cs
deleted file mode 100644
index d068a31..0000000
--- a/source/XeroApi/OAuth/Framework/TokenBase.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-
-namespace DevDefined.OAuth.Framework
-{
-  [Serializable]
-  public class TokenBase : IToken
-  {
-    public string TokenSecret { get; set; }
-
-    public string Token { get; set; }
-
-    public string ConsumerKey { get; set; }
-
-    public string Realm { get; set; }
-
-    public override string ToString()
-    {
-      return UriUtility.FormatTokenForResponse(this);
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/UriUtility.cs b/source/XeroApi/OAuth/Framework/UriUtility.cs
deleted file mode 100644
index 0ccbd97..0000000
--- a/source/XeroApi/OAuth/Framework/UriUtility.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using QueryParameter = System.Collections.Generic.KeyValuePair<string, string>;
-
-namespace DevDefined.OAuth.Framework
-{
-
-  public static class UriUtility
-  {
-    const string AuthorizationHeaderRealmParameter = "realm";
-    const string OAuthAuthorizationHeaderStart = "OAuth";
-    const string UnreservedChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~";
-    static readonly string[] QuoteCharacters = new[] {"\"", "'"};
-
-    /// <summary>
-    /// Extracts all the parameters from the supplied encoded parameters. 
-    /// </summary>
-    /// <param name="parameters"></param>
-    /// <returns></returns>
-    public static List<QueryParameter> GetQueryParameters(string parameters)
-    {
-      if (parameters.StartsWith("?"))
-      {
-        parameters = parameters.Remove(0, 1);
-      }
-
-      var result = new List<QueryParameter>();
-
-      if (!string.IsNullOrEmpty(parameters))
-      {
-        string[] p = parameters.Split('&');
-        foreach (string s in p)
-        {
-          if (!string.IsNullOrEmpty(s) && !s.StartsWith(Parameters.OAuthParameterPrefix))
-          {
-            if (s.IndexOf('=') > -1)
-            {
-              string[] temp = s.Split('=');
-              result.Add(new QueryParameter(temp[0], temp[1]));
-            }
-            else
-            {
-              result.Add(new QueryParameter(s, string.Empty));
-            }
-          }
-        }
-      }
-
-      return result;
-    }
-      
-    /// <summary>
-    /// Extracts all the parameters from the supplied encoded parameters. 
-    /// </summary>
-    /// <param name="parameters"></param>
-    /// <returns></returns>
-    public static List<QueryParameter> GetHeaderParameters(string parameters)
-    {
-      parameters = parameters.Trim();
-
-      var result = new List<QueryParameter>();
-
-      if (!parameters.StartsWith(OAuthAuthorizationHeaderStart, StringComparison.InvariantCultureIgnoreCase))
-      {
-        return result;
-      }
-
-      parameters = parameters.Substring(OAuthAuthorizationHeaderStart.Length).Trim();
-
-      if (!string.IsNullOrEmpty(parameters))
-      {
-        string[] p = parameters.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
-
-        foreach (string s in p)
-        {
-          if (string.IsNullOrEmpty(s)) continue;
-          QueryParameter parameter = ParseAuthorizationHeaderKeyValuePair(s);
-          if (parameter.Key != AuthorizationHeaderRealmParameter)
-          {
-            result.Add(parameter);
-          }
-        }
-      }
-
-      return result;
-    }
-
-    static QueryParameter ParseAuthorizationHeaderKeyValuePair(string keyEqualValuePair)
-    {
-        if (keyEqualValuePair.IndexOf('=') > -1)
-        {
-            string[] temp = keyEqualValuePair.Split('=');
-
-            string itemValue = temp[1];
-            itemValue = StripQuotes(itemValue);
-            itemValue = Uri.UnescapeDataString(itemValue); // HttpUtility.UrlDecode(itemValue)
-
-            return new QueryParameter(temp[0].Trim(), itemValue);
-        }
-        return new QueryParameter(keyEqualValuePair.Trim(), string.Empty);
-    }
-
-    static string StripQuotes(string quotedValue)
-    {
-      foreach (string quoteCharacter in QuoteCharacters)
-      {
-        if (quotedValue.StartsWith(quoteCharacter) && quotedValue.EndsWith(quoteCharacter) && quotedValue.Length > 1)
-        {
-          return quotedValue.Substring(1, quotedValue.Length - 2);
-        }
-      }
-
-      return quotedValue;
-    }
-
-    /// <summary>
-    /// An OAuth specific implementation of Url Encoding - we need this to produce consistent base
-    /// strings to other platforms such as php or ruby, as the <see cref="HttpUtility.UrlEncode" />
-    /// doesn't encode in the same way.
-    /// </summary>
-    /// <remarks>
-    /// Taken from: http://oauth.net/core/1.0a/#encoding_parameters
-    /// All parameter names and values are escaped using the [RFC3986] percent-encoding (%xx) mechanism. 
-    /// Characters not in the unreserved character set ([RFC3986] section 2.3) MUST be encoded. Characters 
-    /// in the unreserved character set MUST NOT be encoded. Hexadecimal characters in encodings MUST 
-    /// be upper case. Text names and values MUST be encoded as UTF-8 octets before percent-encoding 
-    /// them per [RFC3629]. 
-    /// </remarks>
-    /// <param name="value"></param>
-    /// <returns></returns>
-    public static string UrlEncode(string value)
-    {
-      if (value == null) return null;
-
-      var result = new StringBuilder();
-
-      foreach (char symbol in value)
-      {
-        if (UnreservedChars.IndexOf(symbol) != -1)
-        {
-          // Characters in the unreserved character set MUST NOT be encoded.
-          result.Append(symbol);
-        }
-        else
-        {
-          // Text names and values MUST be encoded as UTF-8 octets before percent-encoding them
-          byte[] utf8Octets = Encoding.UTF8.GetBytes(new[] { symbol });
-
-          foreach (byte utf8Octet in utf8Octets)
-          {
-              // Second, the each octet should be %nn encoded
-              result.Append('%' + String.Format("{0:X2}", (int) utf8Octet));
-          }
-        }
-      }
-
-      return result.ToString();
-    }
-
-    /// <summary>
-    /// Formats a set of query parameters, as per query string encoding.
-    /// </summary>
-    /// <param name="parameters"></param>
-    /// <returns></returns>
-    public static string FormatQueryString(IEnumerable<KeyValuePair<string, string>> parameters)
-    {
-      var builder = new StringBuilder();
-
-      if (parameters != null)
-      {
-        foreach (var pair in parameters)
-        {
-          if (builder.Length > 0) builder.Append("&");
-          builder.Append(pair.Key).Append("=");
-          builder.Append(UrlEncode(pair.Value));
-        }
-      }
-
-      return builder.ToString();
-    }
-
-    /// <summary>
-    /// Formats a set of query parameters, as per query string encoding.
-    /// </summary>
-    /// <param name="parameters"></param>
-    /// <returns></returns>
-    public static string FormatQueryString(NameValueCollection parameters)
-    {
-      var builder = new StringBuilder();
-
-      if (parameters != null)
-      {
-        foreach (string key in parameters.Keys)
-        {
-          if (builder.Length > 0) builder.Append("&");
-          builder.Append(key).Append("=");
-          builder.Append(UrlEncode(parameters[key]));
-        }
-      }
-
-      return builder.ToString();
-    }
-
-    /// <summary>
-    /// Takes an http method, url and a set of parameters and formats them as a signature base as per the OAuth core spec.
-    /// </summary>
-    /// <param name="httpMethod"></param>
-    /// <param name="url"></param>
-    /// <param name="parameters"></param>
-    /// <returns></returns>
-    public static string FormatParameters(string httpMethod, Uri url, List<QueryParameter> parameters)
-    {
-      string normalizedRequestParameters = NormalizeRequestParameters(parameters);
-
-      var signatureBase = new StringBuilder();
-      signatureBase.AppendFormat("{0}&", httpMethod.ToUpper());
-
-      signatureBase.AppendFormat("{0}&", UrlEncode(NormalizeUri(url)));
-      signatureBase.AppendFormat("{0}", UrlEncode(normalizedRequestParameters));
-
-      return signatureBase.ToString();
-    }
-
-    /// <summary>
-    /// Normalizes a sequence of key/value pair parameters as per the OAuth core specification.
-    /// </summary>
-    /// <param name="parameters"></param>
-    /// <returns></returns>
-    public static string NormalizeRequestParameters(IEnumerable<QueryParameter> parameters)
-    {
-      IComparer<string> stringComparer = new LexicographicalByteValueStringComparer();
-
-      IEnumerable<QueryParameter> orderedParameters = parameters
-        .OrderBy(x => x.Key, stringComparer)
-        .ThenBy(x => x.Value, stringComparer)
-        .Select(x => new QueryParameter(x.Key, UrlEncode(x.Value)));
-
-      var builder = new StringBuilder();
-
-      foreach (var parameter in orderedParameters)
-      {
-        if (builder.Length > 0) builder.Append("&");
-
-        builder.Append(parameter.Key).Append("=").Append(parameter.Value);
-      }
-
-      return builder.ToString();
-    }
-
-    /// <summary>
-    /// Normalizes a Url according to the OAuth specification (this ensures http or https on a default port is not displayed
-    /// with the :XXX following the host in the url).
-    /// </summary>
-    /// <param name="uri"></param>
-    /// <returns></returns>
-    public static string NormalizeUri(Uri uri)
-    {
-      string normalizedUrl = string.Format("{0}://{1}", uri.Scheme, uri.Host);
-
-      if (!((uri.Scheme == "http" && uri.Port == 80) ||
-            (uri.Scheme == "https" && uri.Port == 443)))
-      {
-        normalizedUrl += ":" + uri.Port;
-      }
-
-      return normalizedUrl + ((uri.AbsolutePath == "/") ? "" : uri.AbsolutePath);
-    }
-
-    public static IEnumerable<QueryParameter> ToQueryParameters(this NameValueCollection source)
-    {
-      foreach (string key in source.AllKeys)
-      {
-        yield return new QueryParameter(key, source[key]);
-      }
-    }
-
-    public static IEnumerable<QueryParameter> ToQueryParametersExcludingTokenSecret(this NameValueCollection source)
-    {
-      foreach (string key in source.AllKeys)
-      {
-        if (key != Parameters.OAuth_Token_Secret)
-        {
-          yield return new QueryParameter(key, source[key]);
-        }
-      }
-    }
-
-    public static NameValueCollection ToNameValueCollection(this IEnumerable<QueryParameter> source)
-    {
-      var collection = new NameValueCollection();
-
-      foreach (var parameter in source)
-      {
-        collection[parameter.Key] = parameter.Value;
-      }
-
-      return collection;
-    }
-
-    public static string FormatTokenForResponse(IToken token)
-    {
-      var builder = new StringBuilder();
-
-      builder.Append(Parameters.OAuth_Token).Append("=").Append(UrlEncode(token.Token))
-        .Append("&").Append(Parameters.OAuth_Token_Secret).Append("=").Append(UrlEncode(token.TokenSecret));
-
-      return builder.ToString();
-    }
-
-    public static NameValueCollection ParseQueryString(string queryString)
-    {
-        if (queryString.StartsWith("?"))
-            queryString = queryString.Remove(0, 1);
-
-        NameValueCollection collection = new NameValueCollection();
-
-        if (string.IsNullOrEmpty(queryString)) 
-            return collection;
-
-        foreach (string s in queryString.Split('&').Where(s => !string.IsNullOrEmpty(s)))
-        {
-            if (s.IndexOf('=') > -1)
-            {
-                string[] temp = s.Split('=');
-                collection.Add(Uri.UnescapeDataString(temp[0]), Uri.UnescapeDataString(temp[1]));
-            }
-            else
-            {
-                collection.Add(s, string.Empty);
-            }
-        }
-
-        return collection;
-    }
-
-    /// <summary>
-    /// Lexicographical byte value string comparer
-    /// </summary>
-    /// <remarks>
-    /// Adapted from http://stackoverflow.com/questions/839429/oauth-lexicographical-byte-value-ordering-in-c
-    /// </remarks>
-    private class LexicographicalByteValueStringComparer : IComparer<string> 
-    {
-        public int Compare(string x, string y)
-        {
-            return string.Compare(x, y, StringComparison.Ordinal);
-        }
-    }
-      
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Framework/With.cs b/source/XeroApi/OAuth/Framework/With.cs
deleted file mode 100644
index 1c6cb4d..0000000
--- a/source/XeroApi/OAuth/Framework/With.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using System.Net;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-
-namespace DevDefined.OAuth.Framework
-{
-  public static class With
-  {
-    public static IDisposable NoCertificateValidation()
-    {
-      RemoteCertificateValidationCallback oldCallback = ServicePointManager.ServerCertificateValidationCallback;
-      ServicePointManager.ServerCertificateValidationCallback = CertificateAlwaysValidCallback;
-      return new DisposableAction(delegate { ServicePointManager.ServerCertificateValidationCallback = oldCallback; });
-    }
-
-    static bool CertificateAlwaysValidCallback(object sender, X509Certificate certificate, X509Chain chain,
-                                               SslPolicyErrors sslPolicyErrors)
-    {
-      return true;
-    }
-  }
-
-  public class DisposableAction : IDisposable
-  {
-    readonly Action _action;
-
-    public DisposableAction(Action action)
-    {
-      if (action == null) throw new ArgumentNullException("action");
-      _action = action;
-    }
-
-    public void Dispose()
-    {
-      _action();
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Logging/DebugMessageLogger.cs b/source/XeroApi/OAuth/Logging/DebugMessageLogger.cs
deleted file mode 100644
index a59564e..0000000
--- a/source/XeroApi/OAuth/Logging/DebugMessageLogger.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using DevDefined.OAuth.Consumer;
-
-namespace DevDefined.OAuth.Logging
-{
-    public class DebugMessageLogger : IMessageLogger
-    {
-        public void LogMessage(IConsumerRequest request, IConsumerResponse response)
-        {
-            System.Diagnostics.Debug.WriteLine(string.Format("{0} {1}", request.Context.RequestMethod, request.Context.GenerateUrl()));
-            System.Diagnostics.Debug.WriteLine(string.Format("HTTP {0} {1} Content-Type:{2} Content-Length:{3} Time-Taken:{4:F2}s",
-                (int)response.ResponseCode, response.ResponseCode, response.ContentType, response.ContentLength, response.TimeTaken.TotalSeconds));
-
-            if (!string.IsNullOrEmpty(response.Content))
-            {
-                System.Diagnostics.Debug.WriteLine(string.Concat("Response body starts:", (response.Content.Length > 100) ? response.Content.Substring(0, 100) : response.Content));
-            }
-        }
-    }
-}
diff --git a/source/XeroApi/OAuth/Utility/ReflectionBasedDictionaryAdapter.cs b/source/XeroApi/OAuth/Utility/ReflectionBasedDictionaryAdapter.cs
deleted file mode 100644
index eaf641e..0000000
--- a/source/XeroApi/OAuth/Utility/ReflectionBasedDictionaryAdapter.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright 2004-2008 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace DevDefined.OAuth.Utility
-{
-  /// <summary>
-  /// Pendent
-  /// </summary>
-  public class ReflectionBasedDictionaryAdapter : IDictionary
-  {
-    readonly Dictionary<string, object> _properties = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ReflectionBasedDictionaryAdapter"/> class.
-    /// </summary>
-    /// <param name="target">The target.</param>
-    public ReflectionBasedDictionaryAdapter(object target)
-    {
-      if (target == null)
-      {
-        throw new ArgumentNullException("target");
-      }
-
-      Type targetType = target.GetType();
-
-      foreach (PropertyInfo property in targetType.GetProperties(BindingFlags.Public | BindingFlags.Instance))
-      {
-        if (!property.CanRead) continue;
-        object value = property.GetValue(target, null);
-
-        _properties[property.Name] = value;
-      }
-    }
-
-    /// <summary>
-    /// Determines whether the <see cref="T:System.Collections.IDictionary"/> object contains an element with the specified key.
-    /// </summary>
-    /// <param name="key">The key to locate in the <see cref="T:System.Collections.IDictionary"/> object.</param>
-    /// <returns>
-    /// true if the <see cref="T:System.Collections.IDictionary"/> contains an element with the key; otherwise, false.
-    /// </returns>
-    /// <exception cref="T:System.ArgumentNullException">
-    /// 	<paramref name="key"/> is null. </exception>
-    public bool Contains(object key)
-    {
-      return _properties.ContainsKey(key.ToString());
-    }
-
-    /// <summary>
-    /// Gets or sets the <see cref="System.Object"/> with the specified key.
-    /// </summary>
-    /// <value></value>
-    public object this[object key]
-    {
-      get
-      {
-        object value;
-        _properties.TryGetValue(key.ToString(), out value);
-        return value;
-      }
-      set { throw new NotImplementedException(); }
-    }
-
-    /// <summary>
-    /// Adds an element with the provided key and value to the <see cref="T:System.Collections.IDictionary"/> object.
-    /// </summary>
-    /// <param name="key">The <see cref="T:System.Object"/> to use as the key of the element to add.</param>
-    /// <param name="value">The <see cref="T:System.Object"/> to use as the value of the element to add.</param>
-    /// <exception cref="T:System.ArgumentNullException">
-    /// 	<paramref name="key"/> is null. </exception>
-    /// <exception cref="T:System.ArgumentException">An element with the same key already exists in the <see cref="T:System.Collections.IDictionary"/> object. </exception>
-    /// <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"/> is read-only.-or- The <see cref="T:System.Collections.IDictionary"/> has a fixed size. </exception>
-    public void Add(object key, object value)
-    {
-      throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// Removes all elements from the <see cref="T:System.Collections.IDictionary"/> object.
-    /// </summary>
-    /// <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"/> object is read-only. </exception>
-    public void Clear()
-    {
-      throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// Returns an <see cref="T:System.Collections.IDictionaryEnumerator"/> object for the <see cref="T:System.Collections.IDictionary"/> object.
-    /// </summary>
-    /// <returns>
-    /// An <see cref="T:System.Collections.IDictionaryEnumerator"/> object for the <see cref="T:System.Collections.IDictionary"/> object.
-    /// </returns>
-    IDictionaryEnumerator IDictionary.GetEnumerator()
-    {
-      return new DictionaryEntryEnumeratorAdapter(_properties.GetEnumerator());
-    }
-
-    /// <summary>
-    /// Removes the element with the specified key from the <see cref="T:System.Collections.IDictionary"/> object.
-    /// </summary>
-    /// <param name="key">The key of the element to remove.</param>
-    /// <exception cref="T:System.ArgumentNullException">
-    /// 	<paramref name="key"/> is null. </exception>
-    /// <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"/> object is read-only.-or- The <see cref="T:System.Collections.IDictionary"/> has a fixed size. </exception>
-    public void Remove(object key)
-    {
-    }
-
-    /// <summary>
-    /// Gets an <see cref="T:System.Collections.ICollection"/> object containing the keys of the <see cref="T:System.Collections.IDictionary"/> object.
-    /// </summary>
-    /// <value></value>
-    /// <returns>An <see cref="T:System.Collections.ICollection"/> object containing the keys of the <see cref="T:System.Collections.IDictionary"/> object.</returns>
-    public ICollection Keys
-    {
-      get { return _properties.Keys; }
-    }
-
-    /// <summary>
-    /// Gets an <see cref="T:System.Collections.ICollection"/> object containing the values in the <see cref="T:System.Collections.IDictionary"/> object.
-    /// </summary>
-    /// <value></value>
-    /// <returns>An <see cref="T:System.Collections.ICollection"/> object containing the values in the <see cref="T:System.Collections.IDictionary"/> object.</returns>
-    public ICollection Values
-    {
-      get { return _properties.Values; }
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether the <see cref="T:System.Collections.IDictionary"/> object is read-only.
-    /// </summary>
-    /// <value></value>
-    /// <returns>true if the <see cref="T:System.Collections.IDictionary"/> object is read-only; otherwise, false.</returns>
-    public bool IsReadOnly
-    {
-      get { return true; }
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether the <see cref="T:System.Collections.IDictionary"/> object has a fixed size.
-    /// </summary>
-    /// <value></value>
-    /// <returns>true if the <see cref="T:System.Collections.IDictionary"/> object has a fixed size; otherwise, false.</returns>
-    public bool IsFixedSize
-    {
-      get { throw new NotImplementedException(); }
-    }
-
-    /// <summary>
-    /// Copies the elements of the <see cref="T:System.Collections.ICollection"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
-    /// </summary>
-    /// <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param>
-    /// <param name="index">The zero-based index in <paramref name="array"/> at which copying begins.</param>
-    /// <exception cref="T:System.ArgumentNullException">
-    /// 	<paramref name="array"/> is null. </exception>
-    /// <exception cref="T:System.ArgumentOutOfRangeException">
-    /// 	<paramref name="index"/> is less than zero. </exception>
-    /// <exception cref="T:System.ArgumentException">
-    /// 	<paramref name="array"/> is multidimensional.-or- <paramref name="index"/> is equal to or greater than the length of <paramref name="array"/>.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"/> is greater than the available space from <paramref name="index"/> to the end of the destination <paramref name="array"/>. </exception>
-    /// <exception cref="T:System.ArgumentException">The type of the source <see cref="T:System.Collections.ICollection"/> cannot be cast automatically to the type of the destination <paramref name="array"/>. </exception>
-    public void CopyTo(Array array, int index)
-    {
-      throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
-    /// </summary>
-    /// <value></value>
-    /// <returns>The number of elements contained in the <see cref="T:System.Collections.ICollection"/>.</returns>
-    public int Count
-    {
-      get { return _properties.Count; }
-    }
-
-    /// <summary>
-    /// Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
-    /// </summary>
-    /// <value></value>
-    /// <returns>An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.</returns>
-    public object SyncRoot
-    {
-      get { return _properties; }
-    }
-
-    /// <summary>
-    /// Gets a value indicating whether access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread safe).
-    /// </summary>
-    /// <value></value>
-    /// <returns>true if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread safe); otherwise, false.</returns>
-    public bool IsSynchronized
-    {
-      get { return false; }
-    }
-
-    /// <summary>
-    /// Returns an enumerator that iterates through a collection.
-    /// </summary>
-    /// <returns>
-    /// An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
-    /// </returns>
-    public IEnumerator GetEnumerator()
-    {
-      return new DictionaryEntryEnumeratorAdapter(_properties.GetEnumerator());
-    }
-
-    class DictionaryEntryEnumeratorAdapter : IDictionaryEnumerator
-    {
-      readonly IDictionaryEnumerator _enumerator;
-      KeyValuePair<string, object> _current;
-
-      public DictionaryEntryEnumeratorAdapter(IDictionaryEnumerator enumerator)
-      {
-        _enumerator = enumerator;
-      }
-
-      public object Key
-      {
-        get { return _current.Key; }
-      }
-
-      public object Value
-      {
-        get { return _current.Value; }
-      }
-
-      public DictionaryEntry Entry
-      {
-        get { return new DictionaryEntry(Key, Value); }
-      }
-
-      public bool MoveNext()
-      {
-        bool moved = _enumerator.MoveNext();
-
-        if (moved)
-        {
-          _current = (KeyValuePair<string, object>) _enumerator.Current;
-        }
-
-        return moved;
-      }
-
-      public void Reset()
-      {
-        _enumerator.Reset();
-      }
-
-      public object Current
-      {
-        get { return new DictionaryEntry(Key, Value); }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/Storage/Basic/AccessToken.cs b/source/XeroApi/OAuth/Utility/Storage/Basic/AccessToken.cs
deleted file mode 100644
index 2c6e967..0000000
--- a/source/XeroApi/OAuth/Utility/Storage/Basic/AccessToken.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using DevDefined.OAuth.Framework;
-
-namespace DevDefined.OAuth.Storage.Basic
-{
-  /// <summary>
-  /// Simple access token model, this would hold information required to enforce policies such as expiration, and association
-  /// with a user accout or other information regarding the information the consumer has been granted access to.
-  /// </summary>
-  public class AccessToken : TokenBase
-  {
-	[Obsolete("This parameter is not used", true)]
-    public string UserName { get; set; }
-
-	[Obsolete("This parameter is not used", true)]
-    public string[] Roles { get; set; }
-
-    public string ExpiresIn { get; set; }
-
-    public string SessionHandle { get; set; }
-
-    public string SessionExpiresIn { get; set; }
-
-    public DateTime CreatedDateUtc { get; set; }
-      
-    public TimeSpan TokenTimespan
-    {
-        get
-        {
-            return string.IsNullOrEmpty(ExpiresIn) 
-                ? TimeSpan.Zero 
-                : TimeSpan.FromSeconds(double.Parse(ExpiresIn));
-        }
-    }
-
-      public TimeSpan SessionTimespan
-      {
-          get
-          {
-              return string.IsNullOrEmpty(SessionExpiresIn)
-                  ? TimeSpan.Zero
-                  : TimeSpan.FromSeconds(double.Parse(SessionExpiresIn));              
-          }
-      }
-
-      public DateTime? ExpiryDateUtc
-      {
-          get
-          {
-              if (string.IsNullOrEmpty(ExpiresIn))
-              {
-                  return null;
-              }
-
-              double expiresInSeconds = double.Parse(ExpiresIn);
-              return CreatedDateUtc.AddSeconds(expiresInSeconds);
-          }
-      }
-
-      public DateTime? SessionExpiryDateUtc
-      {
-          get
-          {
-              if (string.IsNullOrEmpty(SessionExpiresIn))
-              {
-                  return null;
-              }
-
-              double expiresInSeconds = double.Parse(SessionExpiresIn);
-              return CreatedDateUtc.AddSeconds(expiresInSeconds);              
-          }
-      }
-
-      public bool? HasExpired()
-      {
-          // By default, the access token should have more than 15 seconds before it has 'expired'.
-          return HasExpired(new TimeSpan(0, 0, 15));
-      }
-
-      public bool? HasExpired(TimeSpan safeMarginTimespan)
-      {
-          // If we don't have an expiry date, we can't determine if the AccessToken has expired or not
-          if (!ExpiryDateUtc.HasValue)
-          {
-              return null;
-          }
-
-          // Take off the safety margin to the token expiry date.
-          DateTime safeExpiryDateUtc = ExpiryDateUtc.Value.Subtract(safeMarginTimespan);
-
-          return (DateTime.UtcNow > safeExpiryDateUtc);
-      }
-
-      public bool CanRefresh
-      {
-          get { return !string.IsNullOrEmpty(SessionHandle); }
-      }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/Storage/Basic/FixedValueTokenRepository.cs b/source/XeroApi/OAuth/Utility/Storage/Basic/FixedValueTokenRepository.cs
deleted file mode 100644
index 4b30014..0000000
--- a/source/XeroApi/OAuth/Utility/Storage/Basic/FixedValueTokenRepository.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-
-namespace DevDefined.OAuth.Storage.Basic
-{
-    public class FixedValueTokenRepository : ITokenRepository
-    {
-        private readonly AccessToken _accessToken;
-        private readonly RequestToken _requestToken;
-
-        public FixedValueTokenRepository(string requestToken, string requestTokenSecret, string accessToken, string accessTokenSecret)
-        {
-            _requestToken = new RequestToken { Token = requestToken, TokenSecret = requestTokenSecret };
-            _accessToken = new AccessToken { Token = accessToken, TokenSecret = accessTokenSecret };
-        }
-
-        public RequestToken GetRequestToken()
-        {
-            return _requestToken;
-        }
-
-        public void SaveRequestToken(RequestToken requestToken)
-        {
-            throw new NotImplementedException("The request token cannot be altered when using the FixedValueTokenRepository");
-        }
-
-        public AccessToken GetAccessToken()
-        {
-            return _accessToken;
-        }
-
-        public void SaveAccessToken(AccessToken accessToken)
-        {
-            throw new NotImplementedException("The access token cannot be altered when using the FixedValueTokenRepository");
-        }
-    }
-}
diff --git a/source/XeroApi/OAuth/Utility/Storage/Basic/ITokenRepository.cs b/source/XeroApi/OAuth/Utility/Storage/Basic/ITokenRepository.cs
deleted file mode 100644
index a4dc1ac..0000000
--- a/source/XeroApi/OAuth/Utility/Storage/Basic/ITokenRepository.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace DevDefined.OAuth.Storage.Basic
-{
-  /// <summary>
-  /// A simplistic repository for access and request of token models.
-  /// </summary>    
-  public interface ITokenRepository
-  {
-      RequestToken GetRequestToken();
-
-      void SaveRequestToken(RequestToken requestToken);
-
-      AccessToken GetAccessToken();
-
-      void SaveAccessToken(AccessToken accessToken);
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/Storage/Basic/InMemoryTokenRepository.cs b/source/XeroApi/OAuth/Utility/Storage/Basic/InMemoryTokenRepository.cs
deleted file mode 100644
index 7f8fc69..0000000
--- a/source/XeroApi/OAuth/Utility/Storage/Basic/InMemoryTokenRepository.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace DevDefined.OAuth.Storage.Basic
-{
-    /// <summary>
-    /// In-Memory implementation of a token repository
-    /// </summary>
-    public class InMemoryTokenRepository : ITokenRepository
-    {
-        private RequestToken _requestToken;
-        private AccessToken _accessToken;
-
-        public RequestToken GetRequestToken()
-        {
-            return _requestToken;
-        }
-
-        public void SaveRequestToken(RequestToken requestToken)
-        {
-            _requestToken = requestToken;
-        }
-
-        public AccessToken GetAccessToken()
-        {
-            return _accessToken;
-        }
-
-        public void SaveAccessToken(AccessToken accessToken)
-        {
-            _accessToken = accessToken;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/Storage/Basic/InMemoryTokenStore.cs b/source/XeroApi/OAuth/Utility/Storage/Basic/InMemoryTokenStore.cs
deleted file mode 100644
index a46b78d..0000000
--- a/source/XeroApi/OAuth/Utility/Storage/Basic/InMemoryTokenStore.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using DevDefined.OAuth.Framework;
-
-namespace DevDefined.OAuth.Storage.Basic
-{
-  public class SimpleTokenStore : ITokenStore
-  {
-    readonly ITokenRepository<AccessToken> _accessTokenRepository;
-    readonly ITokenRepository<RequestToken> _requestTokenRepository;
-
-    public SimpleTokenStore(ITokenRepository<AccessToken> accessTokenRepository, ITokenRepository<RequestToken> requestTokenRepository)
-    {
-      if (accessTokenRepository == null) throw new ArgumentNullException("accessTokenRepository");
-      if (requestTokenRepository == null) throw new ArgumentNullException("requestTokenRepository");
-      _accessTokenRepository = accessTokenRepository;
-      _requestTokenRepository = requestTokenRepository;
-    }
-
-    public IToken CreateRequestToken(IOAuthContext context)
-    {
-      if (context == null) throw new ArgumentNullException("context");
-
-      var token = new RequestToken
-        {
-          ConsumerKey = context.ConsumerKey,
-          Realm = context.Realm,
-          Token = Guid.NewGuid().ToString(),
-          TokenSecret = Guid.NewGuid().ToString(),
-          CallbackUrl = context.CallbackUrl
-        };
-
-      _requestTokenRepository.SaveToken(token);
-
-      return token;
-    }
-
-    public void ConsumeRequestToken(IOAuthContext requestContext)
-    {
-      if (requestContext == null) throw new ArgumentNullException("requestContext");
-      
-      RequestToken requestToken = GetRequestToken(requestContext);
-
-      UseUpRequestToken(requestContext, requestToken);
-
-      _requestTokenRepository.SaveToken(requestToken);
-    }
-
-    RequestToken GetRequestToken(IOAuthContext context)
-    {
-      try
-      {
-        return _requestTokenRepository.GetToken(context.Token);
-      }
-      catch (Exception exception)
-      {
-        // TODO: log exception
-        throw Error.UnknownToken(context, context.Token, exception);
-      }
-    }
-
-    AccessToken GetAccessToken(IOAuthContext context)
-    {
-      try
-      {
-        return _accessTokenRepository.GetToken(context.Token);
-      }
-      catch (Exception exception)
-      {
-        // TODO: log exception
-        throw Error.UnknownToken(context, context.Token, exception);
-      }
-    }
-
-    public void ConsumeAccessToken(IOAuthContext accessContext)
-    {
-      AccessToken accessToken = GetAccessToken(accessContext);
-
-      if (accessToken.ExpiryDateUtc < DateTime.UtcNow)
-      {
-        throw new OAuthException(accessContext, OAuthProblems.TokenExpired,
-                                 "Token has expired (they're only valid for 1 minute)");
-      }
-    }
-
-    public IToken GetAccessTokenAssociatedWithRequestToken(IOAuthContext requestContext)
-    {
-      RequestToken requestToken = GetRequestToken(requestContext);
-      return requestToken.AccessToken;
-    }
-
-    public RequestForAccessStatus GetStatusOfRequestForAccess(IOAuthContext accessContext)
-    {
-      RequestToken request = GetRequestToken(accessContext);
-
-      if (request.AccessDenied) return RequestForAccessStatus.Denied;
-
-      if (request.AccessToken == null) return RequestForAccessStatus.Unknown;
-
-      return RequestForAccessStatus.Granted;
-    }
-
-    public string GetCallbackUrlForToken(IOAuthContext requestContext)
-    {
-      RequestToken requestToken = GetRequestToken(requestContext);
-      return requestToken.CallbackUrl;
-    }
-
-    public string GetVerificationCodeForRequestToken(IOAuthContext requestContext)
-    {
-      RequestToken requestToken = GetRequestToken(requestContext);
-
-      return requestToken.Verifier;
-    }
-
-    public string GetRequestTokenSecret(IOAuthContext context)
-    {
-      RequestToken requestToken = GetRequestToken(context);
-
-      return requestToken.TokenSecret;
-    }
-
-    public string GetAccessTokenSecret(IOAuthContext context)
-    {
-      AccessToken token = GetAccessToken(context);
-
-      return token.TokenSecret;
-    }
-
-      public AccessToken RenewAccessToken(IOAuthContext requestContext)
-      {
-          throw new NotImplementedException();
-      }
-
-    public IToken GetToken(IOAuthContext context)
-    {
-      var token = (IToken) null;
-      if (!string.IsNullOrEmpty(context.Token))
-      {
-        try
-        {
-          token = _accessTokenRepository.GetToken(context.Token) ??
-                  (IToken)_requestTokenRepository.GetToken(context.Token);
-        }
-        catch (Exception ex)
-        {
-          // TODO: log exception
-          throw Error.UnknownToken(context, context.Token, ex);
-        }
-       
-      }
-      return token;
-    }
-
-    static void UseUpRequestToken(IOAuthContext requestContext, RequestToken requestToken)
-    {
-      if (requestToken.UsedUp)
-      {
-        throw new OAuthException(requestContext, OAuthProblems.TokenRejected,
-                                 "The request token has already be consumed.");
-      }
-
-      requestToken.UsedUp = true;
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/Storage/Basic/RequestToken.cs b/source/XeroApi/OAuth/Utility/Storage/Basic/RequestToken.cs
deleted file mode 100644
index 547f1de..0000000
--- a/source/XeroApi/OAuth/Utility/Storage/Basic/RequestToken.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using System;
-using DevDefined.OAuth.Framework;
-
-namespace DevDefined.OAuth.Storage.Basic
-{
-    /// <summary>
-    /// Simple request token model, this provides information about a request token which has been issued, including
-    /// who it was issued to, if the token has been used up (a request token should only be presented once), and 
-    /// the associated access token (if a user has granted access to a consumer i.e. given them access).
-    /// </summary>
-    public class RequestToken : TokenBase
-    {
-        [Obsolete("This parameter is not used", true)]
-        public bool AccessDenied { get; set; }
-
-		[Obsolete("This parameter is not used", true)]
-        public bool UsedUp { get; set; }
-
-        public AccessToken AccessToken { get; set; }
-
-        public string CallbackUrl { get; set; }
-
-        public string Verifier { get; set; }
-
-        public override string ToString()
-        {
-            string formattedToken = base.ToString();
-
-            formattedToken += "&" + Parameters.OAuth_Callback_Confirmed + "=true";
-
-            return formattedToken;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/Storage/IConsumerStore.cs b/source/XeroApi/OAuth/Utility/Storage/IConsumerStore.cs
deleted file mode 100644
index a3de3e6..0000000
Binary files a/source/XeroApi/OAuth/Utility/Storage/IConsumerStore.cs and /dev/null differ
diff --git a/source/XeroApi/OAuth/Utility/Storage/INonceStore.cs b/source/XeroApi/OAuth/Utility/Storage/INonceStore.cs
deleted file mode 100644
index 65db3b6..0000000
Binary files a/source/XeroApi/OAuth/Utility/Storage/INonceStore.cs and /dev/null differ
diff --git a/source/XeroApi/OAuth/Utility/Storage/ITokenStore.cs b/source/XeroApi/OAuth/Utility/Storage/ITokenStore.cs
deleted file mode 100644
index 82cdaf3..0000000
--- a/source/XeroApi/OAuth/Utility/Storage/ITokenStore.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Storage.Basic;
-
-namespace DevDefined.OAuth.Storage
-{
-  public interface ITokenStore
-  {
-    /// <summary>
-    /// Creates a request token for the consumer.
-    /// </summary>
-    /// <param name="context"></param>
-    /// <returns></returns>
-    IToken CreateRequestToken(IOAuthContext context);
-
-    /// <summary>
-    /// Should consume a use of the request token, throwing a <see cref="OAuthException" /> on failure.
-    /// </summary>
-    /// <param name="requestContext"></param>
-    void ConsumeRequestToken(IOAuthContext requestContext);
-
-    /// <summary>
-    /// Should consume a use of an access token, throwing a <see cref="OAuthException" /> on failure.
-    /// </summary>
-    /// <param name="accessContext"></param>
-    void ConsumeAccessToken(IOAuthContext accessContext);
-
-    /// <summary>
-    /// Get the access token associated with a request token.
-    /// </summary>
-    /// <param name="requestContext"></param>
-    /// <returns></returns>
-    IToken GetAccessTokenAssociatedWithRequestToken(IOAuthContext requestContext);
-
-    /// <summary>
-    /// Returns the status for a request to access a consumers resources.
-    /// </summary>
-    /// <param name="requestContext"></param>
-    /// <returns></returns>
-    RequestForAccessStatus GetStatusOfRequestForAccess(IOAuthContext requestContext);
-
-    /// <summary>
-    /// Returns the callback url that is stored against this token.
-    /// </summary>
-    /// <param name="requestContext"></param>
-    /// <returns></returns>
-    string GetCallbackUrlForToken(IOAuthContext requestContext);
-
-    /// <summary>
-    /// Retrieves the verification code for a token
-    /// </summary>
-    /// <param name="requestContext"></param>
-    /// <returns>verification code</returns>
-    string GetVerificationCodeForRequestToken(IOAuthContext requestContext);
-
-    /// <summary>
-    /// Gets the token secret for the supplied request token
-    /// </summary>
-    /// <param name="context"></param>
-    /// <returns>token secret</returns>
-    string GetRequestTokenSecret(IOAuthContext context);
-
-    /// <summary>
-    /// Gets the token secret for the supplied access token
-    /// </summary>
-    /// <param name="context"></param>
-    /// <returns>token secret</returns>
-    string GetAccessTokenSecret(IOAuthContext context);
-      
-    /// <summary>
-    /// Renews the access token.
-    /// </summary>
-    /// <param name="requestContext">The request context.</param>
-    /// <returns>Return a new access token with the same oauth_session_handle as the near-expired session token</returns>
-    AccessToken RenewAccessToken(IOAuthContext requestContext);
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/Storage/RequestForAccessStatus.cs b/source/XeroApi/OAuth/Utility/Storage/RequestForAccessStatus.cs
deleted file mode 100644
index 89a9050..0000000
--- a/source/XeroApi/OAuth/Utility/Storage/RequestForAccessStatus.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-#region License
-
-// The MIT License
-//
-// Copyright (c) 2006-2008 DevDefined Limited.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#endregion
-
-namespace DevDefined.OAuth.Storage
-{
-  public enum RequestForAccessStatus
-  {
-    Unknown = 0,
-    Denied = 2,
-    Granted = 3
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/StreamExtensions.cs b/source/XeroApi/OAuth/Utility/StreamExtensions.cs
deleted file mode 100644
index 5eb6572..0000000
--- a/source/XeroApi/OAuth/Utility/StreamExtensions.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.IO;
-using System.Net;
-
-namespace DevDefined.OAuth.Utility
-{
-  public static class StreamExtensions
-  {
-    public static string ReadToEnd(this Stream stream)
-    {
-        if (!stream.CanRead)
-        {
-            throw new EndOfStreamException("The stream cannot be read");
-        }
-
-        if (stream.CanSeek)
-        {
-            stream.Seek(0, 0);
-        }
-
-        var reader = new StreamReader(stream);
-        return reader.ReadToEnd();
-    }
-
-    public static string ReadToEnd(this WebResponse response)
-    {
-      return response.GetResponseStream().ReadToEnd();
-    }
-
-    public static void CopyTo(this Stream fromStream, Stream toStream)
-    {
-        // Implementation taken from http://stackoverflow.com/questions/230128/best-way-to-copy-between-two-stream-instances-c
-
-        // 1k buffer
-        byte[] buffer = new byte[1024];
-
-        while (true)
-        {
-            int read = fromStream.Read(buffer, 0, buffer.Length);
-
-            if (read <= 0)
-                return;
-
-            toStream.Write(buffer, 0, read);
-        }
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/Utility/UnguessableGenerator.cs b/source/XeroApi/OAuth/Utility/UnguessableGenerator.cs
deleted file mode 100644
index 9508ffc..0000000
--- a/source/XeroApi/OAuth/Utility/UnguessableGenerator.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-
-namespace DevDefined.OAuth.Utility
-{
-  /// <summary>
-  /// A simple class which can be used to generate "unguessable" verifier values.
-  /// </summary>
-  public class UnguessableGenerator
-  {
-    const string AllowableCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789/^()";
-
-    /// <summary>
-    /// Generates an unguessable string sequence of a certain length
-    /// </summary>
-    /// <param name="length"></param>
-    /// <returns></returns>
-    public static string GenerateUnguessable(int length)
-    {
-      var random = new Random();
-
-      var chars = new char[length];
-
-      int allowableLength = AllowableCharacters.Length;
-
-      for (int i = 0; i < length; i++)
-      {
-        chars[i] = AllowableCharacters[random.Next(allowableLength)];
-      }
-
-      return new string(chars);
-    }
-
-    /// <summary>
-    /// Generates an ungessable string, defaults the length to what google uses (24 characters)
-    /// </summary>
-    /// <returns></returns>
-    public static string GenerateUnguessable()
-    {
-      return GenerateUnguessable(24);
-    }
-  }
-}
\ No newline at end of file
diff --git a/source/XeroApi/OAuth/XeroApiPartnerSession.cs b/source/XeroApi/OAuth/XeroApiPartnerSession.cs
index 280c45b..85f3bfe 100644
--- a/source/XeroApi/OAuth/XeroApiPartnerSession.cs
+++ b/source/XeroApi/OAuth/XeroApiPartnerSession.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Storage.Basic;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Framework;
+using Booyami.DevDefined.OAuth.Storage.Basic;
 
 namespace XeroApi.OAuth
 {
diff --git a/source/XeroApi/OAuth/XeroApiPrivateSession.cs b/source/XeroApi/OAuth/XeroApiPrivateSession.cs
index c1fb67e..b3dc7a6 100644
--- a/source/XeroApi/OAuth/XeroApiPrivateSession.cs
+++ b/source/XeroApi/OAuth/XeroApiPrivateSession.cs
@@ -1,7 +1,7 @@
 using System.Security.Cryptography.X509Certificates;
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Storage.Basic;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Framework;
+using Booyami.DevDefined.OAuth.Storage.Basic;
 
 namespace XeroApi.OAuth
 {
diff --git a/source/XeroApi/OAuth/XeroApiPublicSession.cs b/source/XeroApi/OAuth/XeroApiPublicSession.cs
index 9d9c213..6f7fb01 100644
--- a/source/XeroApi/OAuth/XeroApiPublicSession.cs
+++ b/source/XeroApi/OAuth/XeroApiPublicSession.cs
@@ -1,19 +1,12 @@
 using System;
-using DevDefined.OAuth.Consumer;
-using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Storage.Basic;
+using Booyami.DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Framework;
+using Booyami.DevDefined.OAuth.Storage.Basic;
 
 namespace XeroApi.OAuth
 {
     public class XeroApiPublicSession : OAuthSession   
     {
-        [Obsolete("Use the constructor with ITokenRepository")]
-        public XeroApiPublicSession(string userAgent, string consumerKey, string consumerSecret)
-            : base(CreateConsumerContext(userAgent, consumerKey, consumerSecret))
-        {
-        }
-
-
         public XeroApiPublicSession(string userAgent, string consumerKey, string consumerSecret, ITokenRepository tokenRepository)
             : base(CreateConsumerContext(userAgent, consumerKey, consumerSecret), tokenRepository)
         {
diff --git a/source/XeroApi/Repository.cs b/source/XeroApi/Repository.cs
index 3cd9642..c722454 100644
--- a/source/XeroApi/Repository.cs
+++ b/source/XeroApi/Repository.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using DevDefined.OAuth.Consumer;
+using Booyami.DevDefined.OAuth.Consumer;
 
 using XeroApi.Integration;
 using XeroApi.Linq;
diff --git a/source/XeroApi/XeroApi.csproj b/source/XeroApi/XeroApi.csproj
index c92783e..1ed4c86 100644
--- a/source/XeroApi/XeroApi.csproj
+++ b/source/XeroApi/XeroApi.csproj
@@ -32,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <Import Project="$(MSBuildProjectDirectory)\..\..\..\..\src\BooyamiCommon.props" />
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
@@ -39,6 +40,9 @@
     <AssemblyOriginatorKeyFile>XeroAPI.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Booyami.DevDefined.OAuth, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a3261f5b4697e67d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Booyami.DevDefined.OAuth.1.0.1\lib\Booyami.DevDefined.OAuth.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
@@ -108,16 +112,6 @@
     <Compile Include="Model\TaxRate.cs" />
     <Compile Include="Model\TrackingCategory.cs" />
     <Compile Include="Model\User.cs" />
-    <Compile Include="OAuth\Consumer\ConsumerRequestRunner.cs" />
-    <Compile Include="OAuth\Consumer\IMessageLogger.cs" />
-    <Compile Include="OAuth\Framework\MissingTokenException.cs" />
-    <Compile Include="OAuth\Logging\DebugMessageLogger.cs" />
-    <Compile Include="OAuth\Utility\Storage\Basic\FixedValueTokenRepository.cs" />
-    <Compile Include="OAuth\Utility\Storage\Basic\InMemoryTokenRepository.cs" />
-    <Compile Include="OAuth\Utility\Storage\Basic\ITokenRepository.cs" />
-    <Compile Include="OAuth\Utility\StreamExtensions.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="ReportRepository.cs" />
     <Compile Include="Repository.cs" />
     <Compile Include="Linq\ExpressionVisitor.cs" />
@@ -131,54 +125,6 @@
     <Compile Include="Model\ModelTypeHelper.cs" />
     <Compile Include="Model\Organisation.cs" />
     <Compile Include="Model\Response.cs" />
-    <Compile Include="OAuth\Consumer\ConsumerRequest.cs" />
-    <Compile Include="OAuth\Consumer\ConsumerRequestExtensions.cs" />
-    <Compile Include="OAuth\Consumer\ConsumerResponse.cs" />
-    <Compile Include="OAuth\Consumer\DefaultConsumerRequestFactory.cs" />
-    <Compile Include="OAuth\Consumer\ICertificateFactory.cs" />
-    <Compile Include="OAuth\Consumer\IConsumerRequest.cs" />
-    <Compile Include="OAuth\Consumer\IConsumerRequestFactory.cs" />
-    <Compile Include="OAuth\Consumer\IOAuthConsumerContext.cs" />
-    <Compile Include="OAuth\Consumer\IOAuthSession.cs" />
-    <Compile Include="OAuth\Consumer\LocalFileCertificateFactory.cs" />
-    <Compile Include="OAuth\Consumer\LocalMachineCertificateFactory.cs" />
-    <Compile Include="OAuth\Consumer\NullCertificateFactory.cs" />
-    <Compile Include="OAuth\Consumer\OAuthConsumerContext.cs" />
-    <Compile Include="OAuth\Consumer\OAuthSession.cs" />
-    <Compile Include="OAuth\Consumer\RequestDescription.cs" />
-    <Compile Include="OAuth\Consumer\SimpleCertificateFactory.cs" />
-    <Compile Include="OAuth\Consumer\WebExceptionHelper.cs" />
-    <Compile Include="OAuth\Framework\BoundParameter.cs" />
-    <Compile Include="OAuth\Framework\DateTimeUtility.cs" />
-    <Compile Include="OAuth\Framework\Error.cs" />
-    <Compile Include="OAuth\Framework\IConsumer.cs" />
-    <Compile Include="OAuth\Framework\INonceGenerator.cs" />
-    <Compile Include="OAuth\Framework\IOAuthContext.cs" />
-    <Compile Include="OAuth\Framework\IToken.cs" />
-    <Compile Include="OAuth\Framework\NonceGenerator.cs" />
-    <Compile Include="OAuth\Framework\OAuthContext.cs" />
-    <Compile Include="OAuth\Framework\OAuthException.cs" />
-    <Compile Include="OAuth\Framework\OAuthProblemReport.cs" />
-    <Compile Include="OAuth\Framework\OAuthProblems.cs" />
-    <Compile Include="OAuth\Framework\Parameters.cs" />
-    <Compile Include="OAuth\Framework\SignatureMethod.cs" />
-    <Compile Include="OAuth\Framework\SigningContext.cs" />
-    <Compile Include="OAuth\Framework\Signing\HmacSha1SignatureImplementation.cs" />
-    <Compile Include="OAuth\Framework\Signing\IContextSignatureImplementation.cs" />
-    <Compile Include="OAuth\Framework\Signing\IOAuthContextSigner.cs" />
-    <Compile Include="OAuth\Framework\Signing\OAuthContextSigner.cs" />
-    <Compile Include="OAuth\Framework\Signing\PlainTextSignatureImplementation.cs" />
-    <Compile Include="OAuth\Framework\Signing\RsaSha1SignatureImplementation.cs" />
-    <Compile Include="OAuth\Framework\TokenBase.cs" />
-    <Compile Include="OAuth\Framework\UriUtility.cs" />
-    <Compile Include="OAuth\Framework\With.cs" />
-    <Compile Include="OAuth\Utility\Storage\Basic\AccessToken.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OAuth\Utility\Storage\Basic\RequestToken.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OAuth\Utility\ReflectionBasedDictionaryAdapter.cs" />
     <Compile Include="OAuth\XeroApiPartnerSession.cs" />
     <Compile Include="OAuth\XeroApiPrivateSession.cs" />
     <Compile Include="OAuth\XeroApiEndpoints.cs" />
@@ -189,6 +135,7 @@
     <Compile Include="Linq\TypeSystem.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="XeroAPI.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/source/XeroApi/packages.config b/source/XeroApi/packages.config
new file mode 100644
index 0000000..61d2988
--- /dev/null
+++ b/source/XeroApi/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Booyami.DevDefined.OAuth" version="1.0.1" targetFramework="net35-client" />
+</packages>
\ No newline at end of file