Moved all the OAuth classes into its own namespace in preparation to receiving DotNetOpenId merge.

57 files changed, 150 insertions, 211 deletions

diff --git a/src/DotNetOAuth.Test/DotNetOAuth.Test.csproj b/src/DotNetOAuth.Test/DotNetOAuth.Test.csproj
index 14a1a39..c2aa409 100644
--- a/src/DotNetOAuth.Test/DotNetOAuth.Test.csproj
+++ b/src/DotNetOAuth.Test/DotNetOAuth.Test.csproj
@@ -58,9 +58,9 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="ChannelElements\SigningBindingElementBaseTests.cs" />

-    <Compile Include="ChannelElements\HmacSha1SigningBindingElementTests.cs" />

-    <Compile Include="ConsumerDescription.cs" />

+    <Compile Include="OAuth\ChannelElements\SigningBindingElementBaseTests.cs" />

+    <Compile Include="OAuth\ChannelElements\HmacSha1SigningBindingElementTests.cs" />

+    <Compile Include="OAuth\ConsumerDescription.cs" />

     <Compile Include="Messaging\CollectionAssert.cs" />

     <Compile Include="Messaging\MessageSerializerTests.cs" />

     <Compile Include="Messaging\Reflection\MessageDescriptionTests.cs" />

@@ -85,18 +85,18 @@
     <Compile Include="Mocks\TestSignedDirectedMessage.cs" />

     <Compile Include="Mocks\MockSigningBindingElement.cs" />

     <Compile Include="Mocks\TestWebRequestHandler.cs" />

-    <Compile Include="ChannelElements\OAuthChannelTests.cs" />

+    <Compile Include="OAuth\ChannelElements\OAuthChannelTests.cs" />

     <Compile Include="Mocks\TestChannel.cs" />

     <Compile Include="Mocks\TestMessage.cs" />

     <Compile Include="Mocks\TestMessageTypeProvider.cs" />

-    <Compile Include="ChannelElements\PlaintextSigningBindingElementTest.cs" />

+    <Compile Include="OAuth\ChannelElements\PlaintextSigningBindingElementTest.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

     <Compile Include="Messaging\ResponseTests.cs" />

-    <Compile Include="ProtocolTests.cs" />

+    <Compile Include="OAuth\ProtocolTests.cs" />

     <Compile Include="Scenarios\AppendixScenarios.cs" />

     <Compile Include="Scenarios\CoordinatingOAuthChannel.cs" />

     <Compile Include="Scenarios\Coordinator.cs" />

-    <Compile Include="ServiceProviderDescriptionTests.cs" />

+    <Compile Include="OAuth\ServiceProviderDescriptionTests.cs" />

     <Compile Include="TestBase.cs" />

     <Compile Include="UriUtilTests.cs" />

   </ItemGroup>

diff --git a/src/DotNetOAuth.Test/Mocks/InMemoryTokenManager.cs b/src/DotNetOAuth.Test/Mocks/InMemoryTokenManager.cs
index dffc098..a39fd81 100644
--- a/src/DotNetOAuth.Test/Mocks/InMemoryTokenManager.cs
+++ b/src/DotNetOAuth.Test/Mocks/InMemoryTokenManager.cs
@@ -8,8 +8,9 @@ namespace DotNetOAuth.Test.Mocks {
 	using System;

 	using System.Collections.Generic;

 	using System.Diagnostics;

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

+	using DotNetOAuth.Test.OAuth;

 

 	internal class InMemoryTokenManager : ITokenManager {

 		private Dictionary<string, string> consumersAndSecrets = new Dictionary<string, string>();

diff --git a/src/DotNetOAuth.Test/Mocks/TestDirectedMessage.cs b/src/DotNetOAuth.Test/Mocks/TestDirectedMessage.cs
index 1973463..39aa6f3 100644
--- a/src/DotNetOAuth.Test/Mocks/TestDirectedMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestDirectedMessage.cs
@@ -6,8 +6,8 @@
 

 namespace DotNetOAuth.Test.Mocks {

 	using System;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	internal class TestDirectedMessage : TestMessage, IOAuthDirectedMessage {

 		internal TestDirectedMessage() {

diff --git a/src/DotNetOAuth.Test/Mocks/TestWebRequestHandler.cs b/src/DotNetOAuth.Test/Mocks/TestWebRequestHandler.cs
index 751bf0e..f0e1b62 100644
--- a/src/DotNetOAuth.Test/Mocks/TestWebRequestHandler.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestWebRequestHandler.cs
@@ -9,8 +9,8 @@ namespace DotNetOAuth.Test.Mocks {
 	using System.IO;

 	using System.Net;

 	using System.Text;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	internal class TestWebRequestHandler : IWebRequestHandler {

 		private StringBuilder postEntity;

diff --git a/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs b/src/DotNetOAuth.Test/OAuth/ChannelElements/HmacSha1SigningBindingElementTests.cs
index 02e11f8..d98e6be 100644
--- a/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs
+++ b/src/DotNetOAuth.Test/OAuth/ChannelElements/HmacSha1SigningBindingElementTests.cs
@@ -4,9 +4,9 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Test.ChannelElements {

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

+namespace DotNetOAuth.Test.OAuth.ChannelElements {

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 	[TestClass]

diff --git a/src/DotNetOAuth.Test/ChannelElements/OAuthChannelTests.cs b/src/DotNetOAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
index 6cc9a85..6a58bfa 100644
--- a/src/DotNetOAuth.Test/ChannelElements/OAuthChannelTests.cs
+++ b/src/DotNetOAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Test.ChannelElements {

+namespace DotNetOAuth.Test.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

 	using System.Collections.Specialized;

@@ -13,9 +13,9 @@ namespace DotNetOAuth.Test.ChannelElements {
 	using System.Text;

 	using System.Web;

 	using System.Xml;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Bindings;

+	using DotNetOAuth.OAuth.ChannelElements;

 	using DotNetOAuth.Test.Mocks;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

diff --git a/src/DotNetOAuth.Test/ChannelElements/PlaintextSigningBindingElementTest.cs b/src/DotNetOAuth.Test/OAuth/ChannelElements/PlaintextSigningBindingElementTest.cs
index 2dea446..151f00d 100644
--- a/src/DotNetOAuth.Test/ChannelElements/PlaintextSigningBindingElementTest.cs
+++ b/src/DotNetOAuth.Test/OAuth/ChannelElements/PlaintextSigningBindingElementTest.cs
@@ -4,11 +4,11 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Test.ChannelElements

+namespace DotNetOAuth.Test.OAuth.ChannelElements

 {

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 	[TestClass]

diff --git a/src/DotNetOAuth.Test/ChannelElements/SigningBindingElementBaseTests.cs b/src/DotNetOAuth.Test/OAuth/ChannelElements/SigningBindingElementBaseTests.cs
index 4d1f8f0..e764322 100644
--- a/src/DotNetOAuth.Test/ChannelElements/SigningBindingElementBaseTests.cs
+++ b/src/DotNetOAuth.Test/OAuth/ChannelElements/SigningBindingElementBaseTests.cs
@@ -4,11 +4,11 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Test.ChannelElements {

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

+namespace DotNetOAuth.Test.OAuth.ChannelElements {

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Reflection;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 	[TestClass]

diff --git a/src/DotNetOAuth.Test/ConsumerDescription.cs b/src/DotNetOAuth.Test/OAuth/ConsumerDescription.cs
index c7158a4..7043a2f 100644
--- a/src/DotNetOAuth.Test/ConsumerDescription.cs
+++ b/src/DotNetOAuth.Test/OAuth/ConsumerDescription.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Test {

+namespace DotNetOAuth.Test.OAuth {

 	/// <summary>

 	/// Information necessary to initialize a <see cref="Consumer"/>,

 	/// and to tell a <see cref="ServiceProvider"/> about it.

diff --git a/src/DotNetOAuth.Test/ProtocolTests.cs b/src/DotNetOAuth.Test/OAuth/ProtocolTests.cs
index 0a782d1..d72fcba 100644
--- a/src/DotNetOAuth.Test/ProtocolTests.cs
+++ b/src/DotNetOAuth.Test/OAuth/ProtocolTests.cs
@@ -4,11 +4,8 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Test {

-	using System;

-	using System.Collections.Generic;

-	using System.Linq;

-	using System.Text;

+namespace DotNetOAuth.Test.OAuth {

+	using DotNetOAuth.OAuth;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 	[TestClass]

diff --git a/src/DotNetOAuth.Test/ServiceProviderDescriptionTests.cs b/src/DotNetOAuth.Test/OAuth/ServiceProviderDescriptionTests.cs
index 28b1593..e3cba68 100644
--- a/src/DotNetOAuth.Test/ServiceProviderDescriptionTests.cs
+++ b/src/DotNetOAuth.Test/OAuth/ServiceProviderDescriptionTests.cs
@@ -4,9 +4,10 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Test {

+namespace DotNetOAuth.Test.OAuth {

 	using System;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 	/// <summary>

diff --git a/src/DotNetOAuth.Test/Scenarios/AppendixScenarios.cs b/src/DotNetOAuth.Test/Scenarios/AppendixScenarios.cs
index 40cd023..a9c8b33 100644
--- a/src/DotNetOAuth.Test/Scenarios/AppendixScenarios.cs
+++ b/src/DotNetOAuth.Test/Scenarios/AppendixScenarios.cs
@@ -4,14 +4,15 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Test {

+namespace DotNetOAuth.OAuth.Test {

 	using System;

 	using System.IO;

-	using System.Linq;

 	using System.Net;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.Test;

 	using DotNetOAuth.Test.Mocks;

+	using DotNetOAuth.Test.OAuth;

 	using DotNetOAuth.Test.Scenarios;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

diff --git a/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs b/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs
index d053a11..ff23639 100644
--- a/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs
+++ b/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs
@@ -6,13 +6,11 @@
 

 namespace DotNetOAuth.Test.Scenarios {

 	using System;

-	using System.Reflection;

 	using System.Threading;

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Bindings;

-	using DotNetOAuth.Messaging.Reflection;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 	using DotNetOAuth.Test.Mocks;

 

 	/// <summary>

diff --git a/src/DotNetOAuth.Test/Scenarios/Coordinator.cs b/src/DotNetOAuth.Test/Scenarios/Coordinator.cs
index 3058df9..02f0721 100644
--- a/src/DotNetOAuth.Test/Scenarios/Coordinator.cs
+++ b/src/DotNetOAuth.Test/Scenarios/Coordinator.cs
@@ -6,10 +6,10 @@
 

 namespace DotNetOAuth.Test.Scenarios {

 	using System;

-	using System.Linq;

 	using System.Threading;

-	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth;

 	using DotNetOAuth.Test.Mocks;

+	using DotNetOAuth.Test.OAuth;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

 	/// <summary>

diff --git a/src/DotNetOAuth.Test/TestBase.cs b/src/DotNetOAuth.Test/TestBase.cs
index 55d1858..997841c 100644
--- a/src/DotNetOAuth.Test/TestBase.cs
+++ b/src/DotNetOAuth.Test/TestBase.cs
@@ -6,7 +6,7 @@
 

 namespace DotNetOAuth.Test {

 	using System.Reflection;

-	using DotNetOAuth.Messages;

+	using DotNetOAuth.OAuth.Messages;

 	using log4net;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

 

diff --git a/src/DotNetOAuth/ChannelElements/PlainTextSigningBindingElement.cs b/src/DotNetOAuth/ChannelElements/PlainTextSigningBindingElement.cs
deleted file mode 100644
index f0bbd43..0000000
--- a/src/DotNetOAuth/ChannelElements/PlainTextSigningBindingElement.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//-----------------------------------------------------------------------

-// <copyright file="PlaintextSigningBindingElement.cs" company="Andrew Arnott">

-//     Copyright (c) Andrew Arnott. All rights reserved.

-// </copyright>

-//-----------------------------------------------------------------------

-

-namespace DotNetOAuth.ChannelElements {

-	using System;

-	using System.Collections.Generic;

-	using System.Linq;

-	using System.Text;

-	using DotNetOAuth.Messaging;

-	using DotNetOAuth.Messaging.Bindings;

-

-	/// <summary>

-	/// A binding element that signs outgoing messages and verifies the signature on incoming messages.

-	/// </summary>

-	public class PlaintextSigningBindingElement : SigningBindingElementBase {

-		/// <summary>

-		/// Initializes a new instance of the <see cref="PlaintextSigningBindingElement"/> class.

-		/// </summary>

-		public PlaintextSigningBindingElement()

-			: base("PLAINTEXT") {

-		}

-

-		/// <summary>

-		/// Calculates a signature for a given message.

-		/// </summary>

-		/// <param name="message">The message to sign.</param>

-		/// <returns>The signature for the message.</returns>

-		/// <remarks>

-		/// This method signs the message according to OAuth 1.0 section 9.4.1.

-		/// </remarks>

-		protected override string GetSignature(ITamperResistantOAuthMessage message) {

-			return GetConsumerAndTokenSecretString(message);

-		}

-

-		/// <summary>

-		/// Checks whether this binding element applies to this message.

-		/// </summary>

-		/// <param name="message">The message that needs to be signed.</param>

-		/// <returns>True if this binding element can be used to sign the message.  False otherwise.</returns>

-		protected override bool IsMessageApplicable(ITamperResistantOAuthMessage message) {

-			return string.Equals(message.Recipient.Scheme, "https", StringComparison.OrdinalIgnoreCase);

-		}

-

-		/// <summary>

-		/// Clones this instance.

-		/// </summary>

-		/// <returns>A new instance of the binding element.</returns>

-		protected override ITamperProtectionChannelBindingElement Clone() {

-			return new PlaintextSigningBindingElement();

-		}

-	}

-}

diff --git a/src/DotNetOAuth/DotNetOAuth.csproj b/src/DotNetOAuth/DotNetOAuth.csproj
index 5447fd2..807f73e 100644
--- a/src/DotNetOAuth/DotNetOAuth.csproj
+++ b/src/DotNetOAuth/DotNetOAuth.csproj
@@ -63,31 +63,31 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="ChannelElements\OAuthConsumerMessageTypeProvider.cs" />

-    <Compile Include="ChannelElements\ITokenGenerator.cs" />

-    <Compile Include="ChannelElements\ITokenManager.cs" />

-    <Compile Include="ChannelElements\OAuthHttpMethodBindingElement.cs" />

-    <Compile Include="ChannelElements\PlaintextSigningBindingElement.cs" />

-    <Compile Include="ChannelElements\HmacSha1SigningBindingElement.cs" />

-    <Compile Include="ChannelElements\SigningBindingElementChain.cs" />

-    <Compile Include="ChannelElements\StandardTokenGenerator.cs" />

-    <Compile Include="ChannelElements\TokenType.cs" />

-    <Compile Include="ConsumerBase.cs" />

-    <Compile Include="DesktopConsumer.cs" />

+    <Compile Include="OAuth\ChannelElements\OAuthConsumerMessageTypeProvider.cs" />

+    <Compile Include="OAuth\ChannelElements\ITokenGenerator.cs" />

+    <Compile Include="OAuth\ChannelElements\ITokenManager.cs" />

+    <Compile Include="OAuth\ChannelElements\OAuthHttpMethodBindingElement.cs" />

+    <Compile Include="OAuth\ChannelElements\PlaintextSigningBindingElement.cs" />

+    <Compile Include="OAuth\ChannelElements\HmacSha1SigningBindingElement.cs" />

+    <Compile Include="OAuth\ChannelElements\SigningBindingElementChain.cs" />

+    <Compile Include="OAuth\ChannelElements\StandardTokenGenerator.cs" />

+    <Compile Include="OAuth\ChannelElements\TokenType.cs" />

+    <Compile Include="OAuth\ConsumerBase.cs" />

+    <Compile Include="OAuth\DesktopConsumer.cs" />

     <Compile Include="GlobalSuppressions.cs" />

-    <Compile Include="Messages\ITokenSecretContainingMessage.cs" />

+    <Compile Include="OAuth\Messages\ITokenSecretContainingMessage.cs" />

     <Compile Include="Messaging\ChannelEventArgs.cs" />

     <Compile Include="Messaging\ITamperProtectionChannelBindingElement.cs" />

-    <Compile Include="ServiceProviderDescription.cs" />

-    <Compile Include="Messages\ITokenContainingMessage.cs" />

-    <Compile Include="Messages\SignedMessageBase.cs" />

+    <Compile Include="OAuth\ServiceProviderDescription.cs" />

+    <Compile Include="OAuth\Messages\ITokenContainingMessage.cs" />

+    <Compile Include="OAuth\Messages\SignedMessageBase.cs" />

     <Compile Include="Messaging\Bindings\NonceMemoryStore.cs" />

-    <Compile Include="ChannelElements\SigningBindingElementBase.cs" />

-    <Compile Include="WebConsumer.cs" />

-    <Compile Include="ChannelElements\IWebRequestHandler.cs" />

-    <Compile Include="ChannelElements\ITamperResistantOAuthMessage.cs" />

-    <Compile Include="Messages\MessageBase.cs" />

-    <Compile Include="Messages\AuthorizedTokenRequest.cs" />

+    <Compile Include="OAuth\ChannelElements\SigningBindingElementBase.cs" />

+    <Compile Include="OAuth\WebConsumer.cs" />

+    <Compile Include="OAuth\ChannelElements\IWebRequestHandler.cs" />

+    <Compile Include="OAuth\ChannelElements\ITamperResistantOAuthMessage.cs" />

+    <Compile Include="OAuth\Messages\MessageBase.cs" />

+    <Compile Include="OAuth\Messages\AuthorizedTokenRequest.cs" />

     <Compile Include="Messaging\Bindings\INonceStore.cs" />

     <Compile Include="Messaging\Bindings\StandardReplayProtectionBindingElement.cs" />

     <Compile Include="Messaging\MessagePartAttribute.cs" />

@@ -98,12 +98,12 @@
     <Compile Include="Messaging\Bindings\InvalidSignatureException.cs" />

     <Compile Include="Messaging\Bindings\IReplayProtectedProtocolMessage.cs" />

     <Compile Include="Messaging\Bindings\IExpiringProtocolMessage.cs" />

-    <Compile Include="Messages\AccessProtectedResourceRequest.cs" />

-    <Compile Include="Messages\AuthorizedTokenResponse.cs" />

-    <Compile Include="ChannelElements\IOAuthDirectedMessage.cs" />

-    <Compile Include="Messages\UserAuthorizationResponse.cs" />

-    <Compile Include="Messages\UserAuthorizationRequest.cs" />

-    <Compile Include="Messages\UnauthorizedTokenResponse.cs" />

+    <Compile Include="OAuth\Messages\AccessProtectedResourceRequest.cs" />

+    <Compile Include="OAuth\Messages\AuthorizedTokenResponse.cs" />

+    <Compile Include="OAuth\ChannelElements\IOAuthDirectedMessage.cs" />

+    <Compile Include="OAuth\Messages\UserAuthorizationResponse.cs" />

+    <Compile Include="OAuth\Messages\UserAuthorizationRequest.cs" />

+    <Compile Include="OAuth\Messages\UnauthorizedTokenResponse.cs" />

     <Compile Include="Messaging\Channel.cs" />

     <Compile Include="Messaging\HttpRequestInfo.cs" />

     <Compile Include="Messaging\IDirectedProtocolMessage.cs" />

@@ -122,7 +122,7 @@
     <Compile Include="Messaging\Reflection\MessageDictionary.cs" />

     <Compile Include="Messaging\Reflection\MessagePart.cs" />

     <Compile Include="Messaging\UnprotectedMessageException.cs" />

-    <Compile Include="ChannelElements\OAuthChannel.cs" />

+    <Compile Include="OAuth\ChannelElements\OAuthChannel.cs" />

     <Compile Include="Messaging\Response.cs" />

     <Compile Include="Messaging\IProtocolMessage.cs" />

     <Compile Include="Logger.cs" />

@@ -132,16 +132,16 @@
     <Compile Include="Loggers\TraceLogger.cs" />

     <Compile Include="Messaging\HttpDeliveryMethods.cs" />

     <Compile Include="Messaging\MessageTransport.cs" />

-    <Compile Include="ChannelElements\OAuthServiceProviderMessageTypeProvider.cs" />

+    <Compile Include="OAuth\ChannelElements\OAuthServiceProviderMessageTypeProvider.cs" />

     <Compile Include="Messaging\ProtocolException.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="Messages\UnauthorizedTokenRequest.cs" />

-    <Compile Include="ChannelElements\RsaSha1SigningBindingElement.cs" />

-    <Compile Include="ChannelElements\StandardWebRequestHandler.cs" />

+    <Compile Include="OAuth\Messages\UnauthorizedTokenRequest.cs" />

+    <Compile Include="OAuth\ChannelElements\RsaSha1SigningBindingElement.cs" />

+    <Compile Include="OAuth\ChannelElements\StandardWebRequestHandler.cs" />

     <Compile Include="Messaging\MessageReceivingEndpoint.cs" />

     <Compile Include="Util.cs" />

-    <Compile Include="Protocol.cs" />

-    <Compile Include="ServiceProvider.cs" />

+    <Compile Include="OAuth\Protocol.cs" />

+    <Compile Include="OAuth\ServiceProvider.cs" />

     <Compile Include="Strings.Designer.cs">

       <AutoGen>True</AutoGen>

       <DesignTime>True</DesignTime>

@@ -151,7 +151,7 @@
   </ItemGroup>

   <ItemGroup>

     <None Include="ClassDiagram.cd" />

-    <None Include="Messages\OAuth Messages.cd" />

+    <None Include="OAuth\Messages\OAuth Messages.cd" />

     <None Include="Messaging\Bindings\Bindings.cd" />

     <None Include="Messaging\Exceptions.cd" />

     <None Include="Messaging\Messaging.cd" />

diff --git a/src/DotNetOAuth/GlobalSuppressions.cs b/src/DotNetOAuth/GlobalSuppressions.cs
index e252c76..ce8a2ef 100644
--- a/src/DotNetOAuth/GlobalSuppressions.cs
+++ b/src/DotNetOAuth/GlobalSuppressions.cs
@@ -9,7 +9,7 @@
 // "In Project Suppression File". 

 // You do not need to add suppressions to this file manually. 

 

-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sha", Scope = "type", Target = "DotNetOAuth.ChannelElements.HmacSha1SigningBindingElement")]

-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Hmac", Scope = "type", Target = "DotNetOAuth.ChannelElements.HmacSha1SigningBindingElement")]

-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Rsa", Scope = "type", Target = "DotNetOAuth.ChannelElements.RsaSha1SigningBindingElement")]

-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sha", Scope = "type", Target = "DotNetOAuth.ChannelElements.RsaSha1SigningBindingElement")]

+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sha", Scope = "type", Target = "DotNetOAuth.OAuth.ChannelElements.HmacSha1SigningBindingElement")]

+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Hmac", Scope = "type", Target = "DotNetOAuth.OAuth.ChannelElements.HmacSha1SigningBindingElement")]

+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Rsa", Scope = "type", Target = "DotNetOAuth.OAuth.ChannelElements.RsaSha1SigningBindingElement")]

+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sha", Scope = "type", Target = "DotNetOAuth.OAuth.ChannelElements.RsaSha1SigningBindingElement")]

diff --git a/src/DotNetOAuth/Messaging/ITamperProtectionChannelBindingElement.cs b/src/DotNetOAuth/Messaging/ITamperProtectionChannelBindingElement.cs
index e00d206..03478c3 100644
--- a/src/DotNetOAuth/Messaging/ITamperProtectionChannelBindingElement.cs
+++ b/src/DotNetOAuth/Messaging/ITamperProtectionChannelBindingElement.cs
@@ -6,7 +6,7 @@
 

 namespace DotNetOAuth.Messaging {

 	using System;

-	using DotNetOAuth.ChannelElements;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	/// <summary>

 	/// An interface that must be implemented by message transforms/validators in order

diff --git a/src/DotNetOAuth/Messaging/MessageSerializer.cs b/src/DotNetOAuth/Messaging/MessageSerializer.cs
index 1239dd0..837b582 100644
--- a/src/DotNetOAuth/Messaging/MessageSerializer.cs
+++ b/src/DotNetOAuth/Messaging/MessageSerializer.cs
@@ -10,8 +10,8 @@ namespace DotNetOAuth.Messaging {
 	using System.Diagnostics;

 	using System.Globalization;

 	using System.Reflection;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging.Reflection;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	/// <summary>

 	/// Serializes/deserializes OAuth messages for/from transit.

diff --git a/src/DotNetOAuth/Messaging/MessagingUtilities.cs b/src/DotNetOAuth/Messaging/MessagingUtilities.cs
index 374855d..8a4034e 100644
--- a/src/DotNetOAuth/Messaging/MessagingUtilities.cs
+++ b/src/DotNetOAuth/Messaging/MessagingUtilities.cs
@@ -13,7 +13,6 @@ namespace DotNetOAuth.Messaging {
 	using System.Net;

 	using System.Text;

 	using System.Web;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging.Reflection;

 

 	/// <summary>

diff --git a/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs b/src/DotNetOAuth/OAuth/ChannelElements/HmacSha1SigningBindingElement.cs
index 6f01a40..a0878aa 100644
--- a/src/DotNetOAuth/ChannelElements/HmacSha1SigningBindingElement.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/HmacSha1SigningBindingElement.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Security.Cryptography;

 	using System.Text;

diff --git a/src/DotNetOAuth/ChannelElements/IOAuthDirectedMessage.cs b/src/DotNetOAuth/OAuth/ChannelElements/IOAuthDirectedMessage.cs
index 012701f..9151464 100644
--- a/src/DotNetOAuth/ChannelElements/IOAuthDirectedMessage.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/IOAuthDirectedMessage.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using DotNetOAuth.Messaging;

 

diff --git a/src/DotNetOAuth/ChannelElements/ITamperResistantOAuthMessage.cs b/src/DotNetOAuth/OAuth/ChannelElements/ITamperResistantOAuthMessage.cs
index 961daef..aaba53b 100644
--- a/src/DotNetOAuth/ChannelElements/ITamperResistantOAuthMessage.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/ITamperResistantOAuthMessage.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System.Collections.Generic;

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Bindings;

diff --git a/src/DotNetOAuth/ChannelElements/ITokenGenerator.cs b/src/DotNetOAuth/OAuth/ChannelElements/ITokenGenerator.cs
index c1e3494..888ba05 100644
--- a/src/DotNetOAuth/ChannelElements/ITokenGenerator.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/ITokenGenerator.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	/// <summary>

 	/// An interface allowing OAuth hosts to inject their own algorithm for generating tokens and secrets.

 	/// </summary>

diff --git a/src/DotNetOAuth/ChannelElements/ITokenManager.cs b/src/DotNetOAuth/OAuth/ChannelElements/ITokenManager.cs
index af22d7c..257e44e 100644
--- a/src/DotNetOAuth/ChannelElements/ITokenManager.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/ITokenManager.cs
@@ -4,12 +4,12 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

 	using System.Linq;

 	using System.Text;

-	using DotNetOAuth.Messages;

+	using DotNetOAuth.OAuth.Messages;

 

 	/// <summary>

 	/// An interface OAuth hosts must implement for persistent storage and recall of tokens and secrets.

diff --git a/src/DotNetOAuth/ChannelElements/IWebRequestHandler.cs b/src/DotNetOAuth/OAuth/ChannelElements/IWebRequestHandler.cs
index 13b57c7..d4a56f3 100644
--- a/src/DotNetOAuth/ChannelElements/IWebRequestHandler.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/IWebRequestHandler.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System.IO;

 	using System.Net;

 	using DotNetOAuth.Messaging;

diff --git a/src/DotNetOAuth/ChannelElements/OAuthChannel.cs b/src/DotNetOAuth/OAuth/ChannelElements/OAuthChannel.cs
index 46c227e..4be38a0 100644
--- a/src/DotNetOAuth/ChannelElements/OAuthChannel.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/OAuthChannel.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

 	using System.Globalization;

@@ -12,10 +12,10 @@ namespace DotNetOAuth.ChannelElements {
 	using System.Net;

 	using System.Text;

 	using System.Web;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Bindings;

 	using DotNetOAuth.Messaging.Reflection;

+	using DotNetOAuth.OAuth.Messages;

 

 	/// <summary>

 	/// An OAuth-specific implementation of the <see cref="Channel"/> class.

diff --git a/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs b/src/DotNetOAuth/OAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs
index b628527..123d657 100644
--- a/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs
@@ -4,11 +4,11 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth.Messages;

 

 	/// <summary>

 	/// An OAuth-protocol specific implementation of the <see cref="IMessageTypeProvider"/>

diff --git a/src/DotNetOAuth/ChannelElements/OAuthHttpMethodBindingElement.cs b/src/DotNetOAuth/OAuth/ChannelElements/OAuthHttpMethodBindingElement.cs
index 10a845d..e026c02 100644
--- a/src/DotNetOAuth/ChannelElements/OAuthHttpMethodBindingElement.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/OAuthHttpMethodBindingElement.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

 	using System.Linq;

diff --git a/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs b/src/DotNetOAuth/OAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs
index d056475..570cdc1 100644
--- a/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs
@@ -4,11 +4,11 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth.Messages;

 

 	/// <summary>

 	/// An OAuth-protocol specific implementation of the <see cref="IMessageTypeProvider"/>

diff --git a/src/DotNetOAuth/ChannelElements/PlaintextSigningBindingElement.cs b/src/DotNetOAuth/OAuth/ChannelElements/PlaintextSigningBindingElement.cs
index f0bbd43..e7d44d2 100644
--- a/src/DotNetOAuth/ChannelElements/PlaintextSigningBindingElement.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/PlaintextSigningBindingElement.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

 	using System.Linq;

diff --git a/src/DotNetOAuth/ChannelElements/RsaSha1SigningBindingElement.cs b/src/DotNetOAuth/OAuth/ChannelElements/RsaSha1SigningBindingElement.cs
index 4862a54..07a72f3 100644
--- a/src/DotNetOAuth/ChannelElements/RsaSha1SigningBindingElement.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/RsaSha1SigningBindingElement.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Security.Cryptography;

 	using System.Text;

diff --git a/src/DotNetOAuth/ChannelElements/SigningBindingElementBase.cs b/src/DotNetOAuth/OAuth/ChannelElements/SigningBindingElementBase.cs
index 04c6d60..fb3ca45 100644
--- a/src/DotNetOAuth/ChannelElements/SigningBindingElementBase.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/SigningBindingElementBase.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

 	using System.Globalization;

diff --git a/src/DotNetOAuth/ChannelElements/SigningBindingElementChain.cs b/src/DotNetOAuth/OAuth/ChannelElements/SigningBindingElementChain.cs
index 477e542..88119f1 100644
--- a/src/DotNetOAuth/ChannelElements/SigningBindingElementChain.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/SigningBindingElementChain.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Collections.Generic;

 	using System.Linq;

diff --git a/src/DotNetOAuth/ChannelElements/StandardTokenGenerator.cs b/src/DotNetOAuth/OAuth/ChannelElements/StandardTokenGenerator.cs
index fb2590a..a1bc36a 100644
--- a/src/DotNetOAuth/ChannelElements/StandardTokenGenerator.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/StandardTokenGenerator.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.Security.Cryptography;

 

diff --git a/src/DotNetOAuth/ChannelElements/StandardWebRequestHandler.cs b/src/DotNetOAuth/OAuth/ChannelElements/StandardWebRequestHandler.cs
index fa91990..12fcd28 100644
--- a/src/DotNetOAuth/ChannelElements/StandardWebRequestHandler.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/StandardWebRequestHandler.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	using System;

 	using System.IO;

 	using System.Net;

diff --git a/src/DotNetOAuth/ChannelElements/TokenType.cs b/src/DotNetOAuth/OAuth/ChannelElements/TokenType.cs
index 7aac92f..bebdca2 100644
--- a/src/DotNetOAuth/ChannelElements/TokenType.cs
+++ b/src/DotNetOAuth/OAuth/ChannelElements/TokenType.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.ChannelElements {

+namespace DotNetOAuth.OAuth.ChannelElements {

 	/// <summary>

 	/// The two types of tokens that exist in the OAuth protocol.

 	/// </summary>

diff --git a/src/DotNetOAuth/ConsumerBase.cs b/src/DotNetOAuth/OAuth/ConsumerBase.cs
index 651a352..6b3a4b9 100644
--- a/src/DotNetOAuth/ConsumerBase.cs
+++ b/src/DotNetOAuth/OAuth/ConsumerBase.cs
@@ -4,15 +4,15 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth {

+namespace DotNetOAuth.OAuth {

 	using System;

 	using System.Collections.Generic;

 	using System.Diagnostics.CodeAnalysis;

 	using System.Net;

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Bindings;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 

 	/// <summary>

 	/// Base class for <see cref="WebConsumer"/> and <see cref="DesktopConsumer"/> types.

diff --git a/src/DotNetOAuth/DesktopConsumer.cs b/src/DotNetOAuth/OAuth/DesktopConsumer.cs
index f98b4b4..62d64f2 100644
--- a/src/DotNetOAuth/DesktopConsumer.cs
+++ b/src/DotNetOAuth/OAuth/DesktopConsumer.cs
@@ -4,13 +4,13 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth {

+namespace DotNetOAuth.OAuth {

 	using System;

 	using System.Collections.Generic;

 	using System.Diagnostics.CodeAnalysis;

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 

 	/// <summary>

 	/// Used by a desktop application to use OAuth to access the Service Provider on behalf of the User.

diff --git a/src/DotNetOAuth/Messages/AccessProtectedResourceRequest.cs b/src/DotNetOAuth/OAuth/Messages/AccessProtectedResourceRequest.cs
index e29f710..2704dd5 100644
--- a/src/DotNetOAuth/Messages/AccessProtectedResourceRequest.cs
+++ b/src/DotNetOAuth/OAuth/Messages/AccessProtectedResourceRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System.Diagnostics.CodeAnalysis;

 	using DotNetOAuth.Messaging;

 

diff --git a/src/DotNetOAuth/Messages/AuthorizedTokenRequest.cs b/src/DotNetOAuth/OAuth/Messages/AuthorizedTokenRequest.cs
index 94ec6ff..8f76046 100644
--- a/src/DotNetOAuth/Messages/AuthorizedTokenRequest.cs
+++ b/src/DotNetOAuth/OAuth/Messages/AuthorizedTokenRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System.Globalization;

 	using DotNetOAuth.Messaging;

 

diff --git a/src/DotNetOAuth/Messages/AuthorizedTokenResponse.cs b/src/DotNetOAuth/OAuth/Messages/AuthorizedTokenResponse.cs
index 5d0af27..4c28edd 100644
--- a/src/DotNetOAuth/Messages/AuthorizedTokenResponse.cs
+++ b/src/DotNetOAuth/OAuth/Messages/AuthorizedTokenResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System.Collections.Generic;

 	using System.Diagnostics.CodeAnalysis;

 	using DotNetOAuth.Messaging;

diff --git a/src/DotNetOAuth/Messages/ITokenContainingMessage.cs b/src/DotNetOAuth/OAuth/Messages/ITokenContainingMessage.cs
index 1c7b39d..57ee86d 100644
--- a/src/DotNetOAuth/Messages/ITokenContainingMessage.cs
+++ b/src/DotNetOAuth/OAuth/Messages/ITokenContainingMessage.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	/// <summary>

 	/// An interface implemented by all OAuth messages that have a request or access token property.

 	/// </summary>

diff --git a/src/DotNetOAuth/Messages/ITokenSecretContainingMessage.cs b/src/DotNetOAuth/OAuth/Messages/ITokenSecretContainingMessage.cs
index 41fcae9..98d09ee 100644
--- a/src/DotNetOAuth/Messages/ITokenSecretContainingMessage.cs
+++ b/src/DotNetOAuth/OAuth/Messages/ITokenSecretContainingMessage.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	/// <summary>

 	/// An interface implemented by all OAuth messages that have a request or access token and secret properties.

 	/// </summary>

diff --git a/src/DotNetOAuth/Messages/MessageBase.cs b/src/DotNetOAuth/OAuth/Messages/MessageBase.cs
index 76308be..a74b9f2 100644
--- a/src/DotNetOAuth/Messages/MessageBase.cs
+++ b/src/DotNetOAuth/OAuth/Messages/MessageBase.cs
@@ -4,14 +4,14 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System;

 	using System.Collections.Generic;

 	using System.Globalization;

 	using System.Text;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Reflection;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	/// <summary>

 	/// A base class for all OAuth messages.

diff --git a/src/DotNetOAuth/Messages/OAuth Messages.cd b/src/DotNetOAuth/OAuth/Messages/OAuth Messages.cd
index 5c5bfcc..414644a 100644
--- a/src/DotNetOAuth/Messages/OAuth Messages.cd
+++ b/src/DotNetOAuth/OAuth/Messages/OAuth Messages.cd
@@ -6,12 +6,12 @@
   <Comment CommentText="Messages from Consumer">

     <Position X="4.36" Y="0.683" Height="0.291" Width="2.02" />

   </Comment>

-  <Class Name="DotNetOAuth.Messages.AccessProtectedResourceRequest">

+  <Class Name="DotNetOAuth.OAuth.Messages.AccessProtectedResourceRequest">

     <Position X="4.25" Y="7.75" Width="3" />

     <Members>

       <Property Name="ITokenContainingMessage.Token" Hidden="true" />

     </Members>

-    <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">

+    <InheritanceLine Type="DotNetOAuth.OAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">

       <Path>

         <Point X="3.5" Y="5.626" />

         <Point X="3.5" Y="8.25" />

@@ -24,7 +24,7 @@
     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Class Name="DotNetOAuth.Messages.UnauthorizedTokenResponse">

+  <Class Name="DotNetOAuth.OAuth.Messages.UnauthorizedTokenResponse">

     <Position X="7.5" Y="1.5" Width="3" />

     <Members>

       <Property Name="ITokenContainingMessage.Token" Hidden="true" />

@@ -39,7 +39,7 @@
     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Class Name="DotNetOAuth.Messages.UserAuthorizationResponse">

+  <Class Name="DotNetOAuth.OAuth.Messages.UserAuthorizationResponse">

     <Position X="7.5" Y="4.5" Width="3" />

     <Members>

       <Property Name="ITokenContainingMessage.Token" Hidden="true" />

@@ -47,7 +47,7 @@
     <Compartments>

       <Compartment Name="Methods" Collapsed="true" />

     </Compartments>

-    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">

+    <InheritanceLine Type="DotNetOAuth.OAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">

       <Path>

         <Point X="10.75" Y="4.688" />

         <Point X="10.5" Y="4.688" />

@@ -59,7 +59,7 @@
     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Class Name="DotNetOAuth.Messages.UserAuthorizationRequest">

+  <Class Name="DotNetOAuth.OAuth.Messages.UserAuthorizationRequest">

     <Position X="4.25" Y="3" Width="3" />

     <Members>

       <Property Name="ITokenContainingMessage.Token" Hidden="true" />

@@ -67,7 +67,7 @@
     <Compartments>

       <Compartment Name="Methods" Collapsed="true" />

     </Compartments>

-    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">

+    <InheritanceLine Type="DotNetOAuth.OAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">

       <Path>

         <Point X="10.75" Y="4.125" />

         <Point X="7.25" Y="4.125" />

@@ -79,7 +79,7 @@
     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Class Name="DotNetOAuth.Messages.AuthorizedTokenResponse">

+  <Class Name="DotNetOAuth.OAuth.Messages.AuthorizedTokenResponse">

     <Position X="7.5" Y="6.25" Width="3" />

     <Members>

       <Property Name="ITokenContainingMessage.Token" Hidden="true" />

@@ -88,7 +88,7 @@
     <Compartments>

       <Compartment Name="Methods" Collapsed="true" />

     </Compartments>

-    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">

+    <InheritanceLine Type="DotNetOAuth.OAuth.Messages.MessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">

       <Path>

         <Point X="11" Y="4.805" />

         <Point X="11" Y="7.013" />

@@ -101,7 +101,7 @@
     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Class Name="DotNetOAuth.Messages.MessageBase">

+  <Class Name="DotNetOAuth.OAuth.Messages.MessageBase">

     <Position X="10.75" Y="1" Width="3.5" />

     <Members>

       <Field Name="extraData" Hidden="true" />

@@ -126,7 +126,7 @@
     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Class Name="DotNetOAuth.Messages.AuthorizedTokenRequest">

+  <Class Name="DotNetOAuth.OAuth.Messages.AuthorizedTokenRequest">

     <Position X="4.25" Y="5.5" Width="3" />

     <Members>

       <Property Name="ITokenContainingMessage.Token" Hidden="true" />

@@ -134,7 +134,7 @@
     <Compartments>

       <Compartment Name="Methods" Collapsed="true" />

     </Compartments>

-    <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">

+    <InheritanceLine Type="DotNetOAuth.OAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">

       <Path>

         <Point X="4" Y="4.947" />

         <Point X="4.123" Y="4.947" />

@@ -148,14 +148,14 @@
     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Class Name="DotNetOAuth.Messages.UnauthorizedTokenRequest">

+  <Class Name="DotNetOAuth.OAuth.Messages.UnauthorizedTokenRequest">

     <Position X="4.25" Y="1" Width="3" />

     <Compartments>

       <Compartment Name="Internal" Collapsed="true" />

       <Compartment Name="Private" Collapsed="true" />

       <Compartment Name="Methods" Collapsed="true" />

     </Compartments>

-    <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" FixedFromPoint="true">

+    <InheritanceLine Type="DotNetOAuth.OAuth.Messages.SignedMessageBase" FixedFromPoint="true">

       <Path>

         <Point X="4" Y="1.855" />

         <Point X="4.25" Y="1.855" />

@@ -166,7 +166,7 @@
       <FileName>Messages\UnauthorizedTokenRequest.cs</FileName>

     </TypeIdentifier>

   </Class>

-  <Class Name="DotNetOAuth.Messages.SignedMessageBase">

+  <Class Name="DotNetOAuth.OAuth.Messages.SignedMessageBase">

     <Position X="0.5" Y="1.5" Width="3.5" />

     <Members>

       <Property Name="ITamperResistantOAuthMessage.ConsumerSecret" Hidden="true" />

@@ -175,7 +175,7 @@
       <Property Name="ITamperResistantOAuthMessage.TokenSecret" Hidden="true" />

       <Property Name="ITamperResistantProtocolMessage.Signature" Hidden="true" />

     </Members>

-    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">

+    <InheritanceLine Type="DotNetOAuth.OAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">

       <Path>

         <Point X="12.875" Y="1" />

         <Point X="12.875" Y="0.625" />

@@ -189,14 +189,14 @@
     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Interface Name="DotNetOAuth.ChannelElements.ITamperResistantOAuthMessage">

+  <Interface Name="DotNetOAuth.OAuth.ChannelElements.ITamperResistantOAuthMessage">

     <Position X="11.25" Y="5.25" Width="2.5" />

     <TypeIdentifier>

       <HashCode>AIAAAAAAAAAAAAAAAIAAAgAAAAAAIAQAAAAAAAAAAAA=</HashCode>

       <FileName>ChannelElements\ITamperResistantOAuthMessage.cs</FileName>

     </TypeIdentifier>

   </Interface>

-  <Interface Name="DotNetOAuth.Messages.ITokenSecretContainingMessage">

+  <Interface Name="DotNetOAuth.OAuth.Messages.ITokenSecretContainingMessage">

     <Position X="1" Y="7.5" Width="2" />

     <TypeIdentifier>

       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAA=</HashCode>

@@ -204,7 +204,7 @@
       <NewMemberFileName>Messages\ITokenContainingMessage.cs</NewMemberFileName>

     </TypeIdentifier>

   </Interface>

-  <Interface Name="DotNetOAuth.Messages.ITokenContainingMessage">

+  <Interface Name="DotNetOAuth.OAuth.Messages.ITokenContainingMessage">

     <Position X="1" Y="6" Width="2" />

     <TypeIdentifier>

       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=</HashCode>

diff --git a/src/DotNetOAuth/Messages/SignedMessageBase.cs b/src/DotNetOAuth/OAuth/Messages/SignedMessageBase.cs
index 9b05c2c..5d94013 100644
--- a/src/DotNetOAuth/Messages/SignedMessageBase.cs
+++ b/src/DotNetOAuth/OAuth/Messages/SignedMessageBase.cs
@@ -4,12 +4,12 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System;

 	using System.Diagnostics.CodeAnalysis;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Bindings;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	/// <summary>

 	/// A base class for all signed OAuth messages.

diff --git a/src/DotNetOAuth/Messages/UnauthorizedTokenRequest.cs b/src/DotNetOAuth/OAuth/Messages/UnauthorizedTokenRequest.cs
index cdac36f..7d83135 100644
--- a/src/DotNetOAuth/Messages/UnauthorizedTokenRequest.cs
+++ b/src/DotNetOAuth/OAuth/Messages/UnauthorizedTokenRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System.Collections.Generic;

 	using DotNetOAuth.Messaging;

 

diff --git a/src/DotNetOAuth/Messages/UnauthorizedTokenResponse.cs b/src/DotNetOAuth/OAuth/Messages/UnauthorizedTokenResponse.cs
index c875ed7..f527943 100644
--- a/src/DotNetOAuth/Messages/UnauthorizedTokenResponse.cs
+++ b/src/DotNetOAuth/OAuth/Messages/UnauthorizedTokenResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System;

 	using System.Collections.Generic;

 	using System.Diagnostics.CodeAnalysis;

diff --git a/src/DotNetOAuth/Messages/UserAuthorizationRequest.cs b/src/DotNetOAuth/OAuth/Messages/UserAuthorizationRequest.cs
index 4dfa80b..79dd966 100644
--- a/src/DotNetOAuth/Messages/UserAuthorizationRequest.cs
+++ b/src/DotNetOAuth/OAuth/Messages/UserAuthorizationRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System;

 	using System.Collections.Generic;

 	using System.Diagnostics.CodeAnalysis;

diff --git a/src/DotNetOAuth/Messages/UserAuthorizationResponse.cs b/src/DotNetOAuth/OAuth/Messages/UserAuthorizationResponse.cs
index c5312e8..ab66dfe 100644
--- a/src/DotNetOAuth/Messages/UserAuthorizationResponse.cs
+++ b/src/DotNetOAuth/OAuth/Messages/UserAuthorizationResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messages {

+namespace DotNetOAuth.OAuth.Messages {

 	using System;

 	using DotNetOAuth.Messaging;

 

diff --git a/src/DotNetOAuth/Protocol.cs b/src/DotNetOAuth/OAuth/Protocol.cs
index 7d91b6c..c738fc2 100644
--- a/src/DotNetOAuth/Protocol.cs
+++ b/src/DotNetOAuth/OAuth/Protocol.cs
@@ -4,7 +4,7 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth {

+namespace DotNetOAuth.OAuth {

 	using System;

 	using System.Collections.Generic;

 	using System.Linq;

diff --git a/src/DotNetOAuth/ServiceProvider.cs b/src/DotNetOAuth/OAuth/ServiceProvider.cs
index c4d8f33..2dc1609 100644
--- a/src/DotNetOAuth/ServiceProvider.cs
+++ b/src/DotNetOAuth/OAuth/ServiceProvider.cs
@@ -4,16 +4,15 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth {

+namespace DotNetOAuth.OAuth {

 	using System;

-	using System.Collections.Generic;

 	using System.Globalization;

 	using System.ServiceModel.Channels;

 	using System.Web;

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Bindings;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 

 	/// <summary>

 	/// A web application that allows access via OAuth.

diff --git a/src/DotNetOAuth/ServiceProviderDescription.cs b/src/DotNetOAuth/OAuth/ServiceProviderDescription.cs
index be7db5b..7e7e2d0 100644
--- a/src/DotNetOAuth/ServiceProviderDescription.cs
+++ b/src/DotNetOAuth/OAuth/ServiceProviderDescription.cs
@@ -4,13 +4,13 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth {

+namespace DotNetOAuth.OAuth {

 	using System;

 	using System.Diagnostics;

 	using System.Diagnostics.CodeAnalysis;

 	using System.Linq;

-	using DotNetOAuth.ChannelElements;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.OAuth.ChannelElements;

 

 	/// <summary>

 	/// A description of the endpoints on a Service Provider.

@@ -34,7 +34,7 @@ namespace DotNetOAuth {
 		/// </summary>

 		/// <remarks>

 		/// The request URL query MUST NOT contain any OAuth Protocol Parameters.

-		/// This is the URL that <see cref="Messages.UnauthorizedTokenRequest"/> messages are directed to.

+		/// This is the URL that <see cref="OAuth.Messages.UnauthorizedTokenRequest"/> messages are directed to.

 		/// </remarks>

 		/// <exception cref="ArgumentException">Thrown if this property is set to a URI with OAuth protocol parameters.</exception>

 		public MessageReceivingEndpoint RequestTokenEndpoint {

@@ -56,7 +56,7 @@ namespace DotNetOAuth {
 		/// described in Section 6.2 (Obtaining User Authorization).

 		/// </summary>

 		/// <remarks>

-		/// This is the URL that <see cref="Messages.UserAuthorizationRequest"/> messages are

+		/// This is the URL that <see cref="OAuth.Messages.UserAuthorizationRequest"/> messages are

 		/// indirectly (via the user agent) sent to.

 		/// </remarks>

 		public MessageReceivingEndpoint UserAuthorizationEndpoint { get; set; }

@@ -66,7 +66,7 @@ namespace DotNetOAuth {
 		/// for an Access Token, described in Section 6.3 (Obtaining an Access Token).

 		/// </summary>

 		/// <remarks>

-		/// This is the URL that <see cref="Messages.AuthorizedTokenRequest"/> messages are directed to.

+		/// This is the URL that <see cref="OAuth.Messages.AuthorizedTokenRequest"/> messages are directed to.

 		/// </remarks>

 		public MessageReceivingEndpoint AccessTokenEndpoint { get; set; }

 

diff --git a/src/DotNetOAuth/WebConsumer.cs b/src/DotNetOAuth/OAuth/WebConsumer.cs
index 12e8973..eed2168 100644
--- a/src/DotNetOAuth/WebConsumer.cs
+++ b/src/DotNetOAuth/OAuth/WebConsumer.cs
@@ -4,15 +4,13 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth {

+namespace DotNetOAuth.OAuth {

 	using System;

 	using System.Collections.Generic;

-	using System.Net;

 	using System.Web;

-	using DotNetOAuth.ChannelElements;

-	using DotNetOAuth.Messages;

 	using DotNetOAuth.Messaging;

-	using DotNetOAuth.Messaging.Bindings;

+	using DotNetOAuth.OAuth.ChannelElements;

+	using DotNetOAuth.OAuth.Messages;

 

 	/// <summary>

 	/// A website or application that uses OAuth to access the Service Provider on behalf of the User.

diff --git a/src/DotNetOAuth/UriUtil.cs b/src/DotNetOAuth/UriUtil.cs
index 10a42ad..bec3561 100644
--- a/src/DotNetOAuth/UriUtil.cs
+++ b/src/DotNetOAuth/UriUtil.cs
@@ -25,7 +25,7 @@ namespace DotNetOAuth {
 			}

 

 			NameValueCollection nvc = HttpUtility.ParseQueryString(uri.Query);

-			return nvc.Keys.OfType<string>().Any(key => key.StartsWith(Protocol.V10.ParameterPrefix, StringComparison.Ordinal));

+			return nvc.Keys.OfType<string>().Any(key => key.StartsWith(OAuth.Protocol.V10.ParameterPrefix, StringComparison.Ordinal));

 		}

 	}

 }