Updated class diagrams.

6 files changed, 222 insertions, 281 deletions

diff --git a/src/DotNetOpenAuth/ClassDiagram.cd b/src/DotNetOpenAuth/ClassDiagram.cd
deleted file mode 100644
index f00414c..0000000
--- a/src/DotNetOpenAuth/ClassDiagram.cd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1" MembersFormat="NameAndType">
-  <Class Name="DotNetOpenAuth.ServiceProvider">
-    <Position X="0.5" Y="0.5" Width="5.75" />
-    <Members>
-      <Field Name="channel" Hidden="true" />
-    </Members>
-    <TypeIdentifier>
-      <HashCode>EAoAAAsgAAAAIAAAEAAAAAAAAAAIAAEAAQAIAAwAAAA=</HashCode>
-      <FileName>ServiceProvider.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.DesktopConsumer">
-    <Position X="11.5" Y="4.5" Width="4.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAEAAAAAAABAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>DesktopConsumer.cs</FileName>
-      <NewMemberFileName>WebConsumer.cs</NewMemberFileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.ServiceProviderDescription">
-    <Position X="1.25" Y="5.25" Width="4.75" />
-    <Compartments>
-      <Compartment Name="Fields" Collapsed="true" />
-    </Compartments>
-    <TypeIdentifier>
-      <HashCode>AAACAAgAAAAEAAAQAAAAAAAAAAAAACAAAAAgAAAAAAA=</HashCode>
-      <FileName>ServiceProviderDescription.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.WebConsumer">
-    <Position X="6.5" Y="4.5" Width="4.75" />
-    <InheritanceLine Type="DotNetOpenAuth.ConsumerBase" FixedToPoint="true">
-      <Path>
-        <Point X="11.375" Y="3.978" />
-        <Point X="11.375" Y="4.125" />
-        <Point X="8.125" Y="4.125" />
-        <Point X="8.125" Y="4.5" />
-      </Path>
-    </InheritanceLine>
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAA=</HashCode>
-      <FileName>WebConsumer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.ConsumerBase">
-    <Position X="9" Y="0.5" Width="4.75" />
-    <TypeIdentifier>
-      <HashCode>ACAAAAEgAAABAAAAAAAABgAAAAAIAAAAAQAAAAABABA=</HashCode>
-      <FileName>ConsumerBase.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Font Name="Segoe UI" Size="9" />
-</ClassDiagram>
\ No newline at end of file
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
index c01a923..583abd2 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
@@ -274,7 +274,7 @@
     <Compile Include="Yadis\Yadis.cs" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="ClassDiagram.cd" />

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

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

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

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

diff --git a/src/DotNetOpenAuth/Messaging/Bindings/Bindings.cd b/src/DotNetOpenAuth/Messaging/Bindings/Bindings.cd
index 47a133a..6205b92 100644
--- a/src/DotNetOpenAuth/Messaging/Bindings/Bindings.cd
+++ b/src/DotNetOpenAuth/Messaging/Bindings/Bindings.cd
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DotNetOpenAuth.Messaging.Bindings.InvalidSignatureException" Collapsed="true">
-    <Position X="8.25" Y="2" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messaging\Bindings\InvalidSignatureException.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.Messaging.Bindings.ReplayedMessageException" Collapsed="true">
-    <Position X="6" Y="2" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messaging\Bindings\ReplayedMessageException.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.Messaging.Bindings.ExpiredMessageException" Collapsed="true">
-    <Position X="3.75" Y="2" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messaging\Bindings\ExpiredMessageException.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.Messaging.ProtocolException" Collapsed="true">
-    <Position X="6" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAKAAAAAAAAAAAAAIBAAAAACAQAIAAAAACAAAAAAAA=</HashCode>
-      <FileName>Messaging\ProtocolException.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="DotNetOpenAuth.Messaging.Bindings.StandardExpirationBindingElement" Collapsed="true">
-    <Position X="1" Y="3" Width="2.75" />
-    <TypeIdentifier>
-      <HashCode>AAAQAAAAAAAARAAAAAAAEAAAAAIAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messaging\Bindings\StandardExpirationBindingElement.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Interface Name="DotNetOpenAuth.Messaging.IProtocolMessage" Collapsed="true">
-    <Position X="6" Y="3.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAQAAAAAAAAAAAAAYAAAAAAAAAAAACAAAAAAA=</HashCode>
-      <FileName>Messaging\IProtocolMessage.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="DotNetOpenAuth.Messaging.Bindings.IExpiringProtocolMessage" Collapsed="true">
-    <Position X="3.75" Y="4.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messaging\Bindings\IExpiringProtocolMessage.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="DotNetOpenAuth.Messaging.Bindings.IReplayProtectedProtocolMessage" Collapsed="true">
-    <Position X="6" Y="4.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAA=</HashCode>
-      <FileName>Messaging\Bindings\IReplayProtectedProtocolMessage.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="DotNetOpenAuth.Messaging.Bindings.ISignedOAuthMessage" Collapsed="true">
-    <Position X="8.25" Y="4.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=</HashCode>
-      <FileName>Messaging\Bindings\ISignedOAuthMessage.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="DotNetOpenAuth.Messaging.IChannelBindingElement">
-    <Position X="0.5" Y="0.5" Width="2" />
-    <TypeIdentifier>
-      <HashCode>BAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAEAAAAAAAAA=</HashCode>
-      <FileName>Messaging\IChannelBindingElement.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Font Name="Segoe UI" Size="9" />
+<?xml version="1.0" encoding="utf-8"?>

+<ClassDiagram MajorVersion="1" MinorVersion="1">

+  <Class Name="DotNetOpenAuth.Messaging.Bindings.InvalidSignatureException" Collapsed="true">

+    <Position X="8.25" Y="2" Width="1.5" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>Messaging\Bindings\InvalidSignatureException.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.Messaging.Bindings.ReplayedMessageException" Collapsed="true">

+    <Position X="6" Y="2" Width="1.5" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>Messaging\Bindings\ReplayedMessageException.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.Messaging.Bindings.ExpiredMessageException" Collapsed="true">

+    <Position X="3.75" Y="2" Width="1.5" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>Messaging\Bindings\ExpiredMessageException.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.Messaging.ProtocolException" Collapsed="true">

+    <Position X="6" Y="0.5" Width="1.5" />

+    <TypeIdentifier>

+      <HashCode>ICAMAAAAQAAAgAEAAIBAAAYgCgAAIAAAIACAACAAAAA=</HashCode>

+      <FileName>Messaging\ProtocolException.cs</FileName>

+    </TypeIdentifier>

+    <Lollipop Position="0.2" />

+  </Class>

+  <Class Name="DotNetOpenAuth.Messaging.Bindings.StandardExpirationBindingElement" Collapsed="true">

+    <Position X="1" Y="3" Width="2.75" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAgAAAARAAEAAAAAAAAAAIAAAAAAEAAAAAAAAA=</HashCode>

+      <FileName>Messaging\Bindings\StandardExpirationBindingElement.cs</FileName>

+    </TypeIdentifier>

+    <Lollipop Position="0.2" />

+  </Class>

+  <Interface Name="DotNetOpenAuth.Messaging.IProtocolMessage" Collapsed="true">

+    <Position X="6" Y="3.5" Width="1.5" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>Messaging\IProtocolMessage.cs</FileName>

+    </TypeIdentifier>

+  </Interface>

+  <Interface Name="DotNetOpenAuth.Messaging.Bindings.IExpiringProtocolMessage" Collapsed="true">

+    <Position X="3.75" Y="4.75" Width="2" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>Messaging\Bindings\IExpiringProtocolMessage.cs</FileName>

+    </TypeIdentifier>

+  </Interface>

+  <Interface Name="DotNetOpenAuth.Messaging.Bindings.IReplayProtectedProtocolMessage" Collapsed="true">

+    <Position X="6" Y="4.75" Width="2.5" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAA=</HashCode>

+      <FileName>Messaging\Bindings\IReplayProtectedProtocolMessage.cs</FileName>

+    </TypeIdentifier>

+  </Interface>

+  <Interface Name="DotNetOpenAuth.Messaging.IChannelBindingElement">

+    <Position X="0.5" Y="0.5" Width="2" />

+    <TypeIdentifier>

+      <HashCode>BAAAAAAgAAAAAAAEAAAAAAAAAAAAAAAAAEAAAAAAAAA=</HashCode>

+      <FileName>Messaging\IChannelBindingElement.cs</FileName>

+    </TypeIdentifier>

+  </Interface>

+  <Interface Name="DotNetOpenAuth.OAuth.ChannelElements.ITamperResistantOAuthMessage" Collapsed="true">

+    <Position X="8.75" Y="4.75" Width="2.5" />

+    <TypeIdentifier>

+      <HashCode>AIAAAAAAAAAAgAAAAIAAAgAAAAAAIAQAAAAAAAAAAAA=</HashCode>

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

+    </TypeIdentifier>

+  </Interface>

+  <Font Name="Segoe UI" Size="9" />

 </ClassDiagram>
\ No newline at end of file
diff --git a/src/DotNetOpenAuth/Messaging/Exceptions.cd b/src/DotNetOpenAuth/Messaging/Exceptions.cd
index 7225dc0..8798cd7 100644
--- a/src/DotNetOpenAuth/Messaging/Exceptions.cd
+++ b/src/DotNetOpenAuth/Messaging/Exceptions.cd
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="DotNetOpenAuth.Messaging.ExpiredMessageException">
-    <Position X="7.25" Y="2.25" Width="2" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messaging\ExpiredMessageException.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.Messaging.ProtocolException" Collapsed="true">
-    <Position X="9.75" Y="0.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAKAAAAAAAAQAAAAIBAAAAACAAAAAAAAACAAAAAAAA=</HashCode>
-      <FileName>Messaging\ProtocolException.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="DotNetOpenAuth.Messaging.InvalidSignatureException" Collapsed="true">
-    <Position X="9.5" Y="2.25" Width="2" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messaging\InvalidSignatureException.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DotNetOpenAuth.Messaging.ReplayedMessageException" Collapsed="true">
-    <Position X="11.75" Y="2.25" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messaging\ReplayedMessageException.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Font Name="Segoe UI" Size="9" />
+<?xml version="1.0" encoding="utf-8"?>

+<ClassDiagram MajorVersion="1" MinorVersion="1">

+  <Class Name="DotNetOpenAuth.Messaging.ProtocolException" Collapsed="true">

+    <Position X="3.25" Y="0.75" Width="1.5" />

+    <TypeIdentifier>

+      <HashCode>ICAMAAAAQAAAgAEAAIBAAAYgCgAAIAAAIACAACAAAAA=</HashCode>

+      <FileName>Messaging\ProtocolException.cs</FileName>

+    </TypeIdentifier>

+    <Lollipop Position="0.2" />

+  </Class>

+  <Class Name="DotNetOpenAuth.Messaging.Bindings.InvalidSignatureException" Collapsed="true">

+    <Position X="3" Y="2.25" Width="2" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>Messaging\Bindings\InvalidSignatureException.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.Messaging.Bindings.ReplayedMessageException" Collapsed="true">

+    <Position X="5.25" Y="2.25" Width="2.25" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>Messaging\Bindings\ReplayedMessageException.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.Messaging.Bindings.ExpiredMessageException">

+    <Position X="0.75" Y="2.25" Width="2" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>Messaging\Bindings\ExpiredMessageException.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Font Name="Segoe UI" Size="9" />

 </ClassDiagram>
\ No newline at end of file
diff --git a/src/DotNetOpenAuth/OAuth/ClassDiagram.cd b/src/DotNetOpenAuth/OAuth/ClassDiagram.cd
new file mode 100644
index 0000000..460b4f3
--- /dev/null
+++ b/src/DotNetOpenAuth/OAuth/ClassDiagram.cd
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>

+<ClassDiagram MajorVersion="1" MinorVersion="1" MembersFormat="NameAndType">

+  <Class Name="DotNetOpenAuth.DesktopConsumer">

+    <Position X="11.5" Y="5.25" Width="4.75" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAEAAAAAAABAAAAAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>OAuth\DesktopConsumer.cs</FileName>

+      <NewMemberFileName>WebConsumer.cs</NewMemberFileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.OAuth.WebConsumer">

+    <Position X="6.25" Y="5.25" Width="5" />

+    <TypeIdentifier>

+      <HashCode>AAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAA=</HashCode>

+      <FileName>OAuth\WebConsumer.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.OAuth.ServiceProviderDescription">

+    <Position X="0.5" Y="5.25" Width="5" />

+    <Compartments>

+      <Compartment Name="Fields" Collapsed="true" />

+    </Compartments>

+    <TypeIdentifier>

+      <HashCode>AAACAAgAAAAEAAAQAAAAAAAAAAAAACAAAAAgAAAAAAA=</HashCode>

+      <FileName>OAuth\ServiceProviderDescription.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.OAuth.ServiceProvider">

+    <Position X="1" Y="0.5" Width="6" />

+    <Compartments>

+      <Compartment Name="Fields" Collapsed="true" />

+    </Compartments>

+    <TypeIdentifier>

+      <HashCode>EAoAAAsgAAAAIAAAEAAAAAAAAAAIAAEAAQAIAAwAAAA=</HashCode>

+      <FileName>OAuth\ServiceProvider.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Class Name="DotNetOpenAuth.OAuth.ConsumerBase">

+    <Position X="9" Y="0.5" Width="4.5" />

+    <TypeIdentifier>

+      <HashCode>ACAAAAEgAAAAAAAAAAAABgAAAAAIAAAAAQAAAAABABA=</HashCode>

+      <FileName>OAuth\ConsumerBase.cs</FileName>

+    </TypeIdentifier>

+  </Class>

+  <Font Name="Segoe UI" Size="9" />

+</ClassDiagram>
\ No newline at end of file
diff --git a/src/DotNetOpenAuth/OAuth/Messages/OAuth Messages.cd b/src/DotNetOpenAuth/OAuth/Messages/OAuth Messages.cd
index 5627be2..9b474a9 100644
--- a/src/DotNetOpenAuth/OAuth/Messages/OAuth Messages.cd
+++ b/src/DotNetOpenAuth/OAuth/Messages/OAuth Messages.cd
@@ -6,25 +6,19 @@
   <Comment CommentText="Messages from Consumer">

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

   </Comment>

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

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

-    <Members>

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

-    </Members>

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

-      <Path>

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

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

-        <Point X="4.25" Y="8.25" />

-      </Path>

-    </InheritanceLine>

+  <Class Name="DotNetOpenAuth.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>

     <TypeIdentifier>

-      <HashCode>AAAAAAACAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>

-      <FileName>Messages\AccessProtectedResourceRequest.cs</FileName>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAA=</HashCode>

+      <FileName>OAuth\Messages\UnauthorizedTokenRequest.cs</FileName>

     </TypeIdentifier>

-    <Lollipop Position="0.2" />

   </Class>

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

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

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

     <Members>

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

@@ -35,31 +29,26 @@
     </Compartments>

     <TypeIdentifier>

       <HashCode>AAAAAAACAAAAAAAAAAEAAAAAAIAAIAAAIAAAAAAAAAA=</HashCode>

-      <FileName>Messages\UnauthorizedTokenResponse.cs</FileName>

+      <FileName>OAuth\Messages\UnauthorizedTokenResponse.cs</FileName>

     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

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

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

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

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

     <Members>

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

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

+      <Property Name="ITamperResistantOAuthMessage.HttpMethod" Hidden="true" />

+      <Property Name="ITamperResistantOAuthMessage.SignatureMethod" Hidden="true" />

+      <Property Name="ITamperResistantOAuthMessage.TokenSecret" Hidden="true" />

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

     </Members>

-    <Compartments>

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

-    </Compartments>

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

-      <Path>

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

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

-      </Path>

-    </InheritanceLine>

     <TypeIdentifier>

-      <HashCode>AAAAAAACAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>

-      <FileName>Messages\UserAuthorizationResponse.cs</FileName>

+      <HashCode>AIAAFAAAAIAAAAACgICAAgAAAgAAIAQAAAEAIgAQAAE=</HashCode>

+      <FileName>OAuth\Messages\SignedMessageBase.cs</FileName>

     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

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

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

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

     <Members>

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

@@ -67,66 +56,42 @@
     <Compartments>

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

     </Compartments>

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

-      <Path>

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

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

-      </Path>

-    </InheritanceLine>

     <TypeIdentifier>

       <HashCode>AAAAAAACAAAAAAAAAAAAAAAAAIAAAAAAIAAAAAAAQAA=</HashCode>

-      <FileName>Messages\UserAuthorizationRequest.cs</FileName>

+      <FileName>OAuth\Messages\UserAuthorizationRequest.cs</FileName>

     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

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

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

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

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

     <Members>

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

-      <Property Name="ITokenSecretContainingMessage.TokenSecret" Hidden="true" />

     </Members>

     <Compartments>

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

     </Compartments>

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

-      <Path>

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

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

-        <Point X="10.5" Y="7.013" />

-      </Path>

-    </InheritanceLine>

     <TypeIdentifier>

-      <HashCode>AAAAAAACAAAAAAAAAAAAAAAAEAAAIAAAIAAAAAAAAAA=</HashCode>

-      <FileName>Messages\AuthorizedTokenResponse.cs</FileName>

+      <HashCode>AAAAAAACAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>OAuth\Messages\UserAuthorizationResponse.cs</FileName>

     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

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

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

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

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

     <Members>

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

-      <Property Name="IDirectedProtocolMessage.Recipient" Hidden="true" />

-      <Property Name="IOAuthDirectedMessage.HttpMethods" Hidden="true" />

-      <Property Name="IOAuthDirectedMessage.Recipient" Hidden="true" />

-      <Method Name="IMessage.EnsureValidMessage" Hidden="true" />

-      <Property Name="IMessage.ExtraData" Hidden="true" />

-      <Property Name="IMessage.Version" Hidden="true" />

-      <Property Name="IProtocolMessage.RequiredProtection" Hidden="true" />

-      <Property Name="IProtocolMessage.Transport" Hidden="true" />

-      <Field Name="protectionRequired" Hidden="true" />

-      <Field Name="recipient" Hidden="true" />

-      <Field Name="transport" Hidden="true" />

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

+      <Property Name="ITokenSecretContainingMessage.TokenSecret" Hidden="true" />

     </Members>

     <Compartments>

-      <Compartment Name="Fields" Collapsed="true" />

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

     </Compartments>

     <TypeIdentifier>

-      <HashCode>AAAKAAAAYAAAgAEEAIAAAAYAAAQEIDAAIgCCACAAAAA=</HashCode>

-      <FileName>Messages\MessageBase.cs</FileName>

+      <HashCode>AAAAAAACAAAAAAAAAAAAAAAAEAAAIAAAIAAAAAAAAAA=</HashCode>

+      <FileName>OAuth\Messages\AuthorizedTokenResponse.cs</FileName>

     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

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

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

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

     <Members>

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

@@ -134,58 +99,43 @@
     <Compartments>

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

     </Compartments>

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

-      <Path>

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

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

-        <Point X="4.123" Y="5.75" />

-        <Point X="4.25" Y="5.75" />

-      </Path>

-    </InheritanceLine>

     <TypeIdentifier>

       <HashCode>AAAAAAACQAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>

-      <FileName>Messages\AuthorizedTokenRequest.cs</FileName>

+      <FileName>OAuth\Messages\AuthorizedTokenRequest.cs</FileName>

     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

-  <Class Name="DotNetOpenAuth.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="DotNetOpenAuth.Messages.SignedMessageBase" FixedFromPoint="true">

-      <Path>

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

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

-      </Path>

-    </InheritanceLine>

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

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

+    <Members>

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

+    </Members>

     <TypeIdentifier>

-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAA=</HashCode>

-      <FileName>Messages\UnauthorizedTokenRequest.cs</FileName>

+      <HashCode>AAAAAAACAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>

+      <FileName>OAuth\Messages\AccessProtectedResourceRequest.cs</FileName>

     </TypeIdentifier>

+    <Lollipop Position="0.2" />

   </Class>

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

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

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

+    <Position X="11" Y="1" Width="3.5" />

     <Members>

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

-      <Property Name="ITamperResistantOAuthMessage.HttpMethod" Hidden="true" />

-      <Property Name="ITamperResistantOAuthMessage.SignatureMethod" Hidden="true" />

-      <Property Name="ITamperResistantOAuthMessage.TokenSecret" Hidden="true" />

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

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

+      <Property Name="IDirectedProtocolMessage.Recipient" Hidden="true" />

+      <Method Name="IMessage.EnsureValidMessage" Hidden="true" />

+      <Property Name="IMessage.ExtraData" Hidden="true" />

+      <Property Name="IMessage.Version" Hidden="true" />

+      <Property Name="IProtocolMessage.RequiredProtection" Hidden="true" />

+      <Property Name="IProtocolMessage.Transport" Hidden="true" />

+      <Field Name="protectionRequired" Hidden="true" />

+      <Field Name="recipient" Hidden="true" />

+      <Field Name="transport" Hidden="true" />

     </Members>

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

-      <Path>

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

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

-        <Point X="3" Y="0.625" />

-        <Point X="3" Y="1.5" />

-      </Path>

-    </InheritanceLine>

+    <Compartments>

+      <Compartment Name="Fields" Collapsed="true" />

+    </Compartments>

     <TypeIdentifier>

-      <HashCode>IIAAFAAAAIAAAAAAgICAAgAAAgAAIAQAAAEAIAAQAAE=</HashCode>

-      <FileName>Messages\SignedMessageBase.cs</FileName>

+      <HashCode>ICAMAAQAYAAAgAkEAIAIAAYACgAEYBAAIECBACAAAAA=</HashCode>

+      <FileName>OAuth\Messages\MessageBase.cs</FileName>

     </TypeIdentifier>

     <Lollipop Position="0.2" />

   </Class>

@@ -196,19 +146,18 @@
       <FileName>ChannelElements\ITamperResistantOAuthMessage.cs</FileName>

     </TypeIdentifier>

   </Interface>

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

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

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

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

     <TypeIdentifier>

-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAA=</HashCode>

-      <FileName>Messages\ITokenSecretContainingMessage.cs</FileName>

-      <NewMemberFileName>Messages\ITokenContainingMessage.cs</NewMemberFileName>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=</HashCode>

+      <FileName>OAuth\Messages\ITokenContainingMessage.cs</FileName>

     </TypeIdentifier>

   </Interface>

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

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

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

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

     <TypeIdentifier>

-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=</HashCode>

-      <FileName>Messages\ITokenContainingMessage.cs</FileName>

+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAA=</HashCode>

+      <FileName>OAuth\Messages\ITokenSecretContainingMessage.cs</FileName>

     </TypeIdentifier>

   </Interface>

   <Font Name="Segoe UI" Size="9" />