Giving each extension its own sub-namespace under DNOI.Extensions.

30 files changed, 143 insertions, 147 deletions

diff --git a/samples/ProviderPortal/ProfileFields.ascx.cs b/samples/ProviderPortal/ProfileFields.ascx.cs
index c1ffd36..07fd2f9 100644
--- a/samples/ProviderPortal/ProfileFields.ascx.cs
+++ b/samples/ProviderPortal/ProfileFields.ascx.cs
@@ -1,7 +1,6 @@
 using System;

-using System.Net.Mail;

-using DotNetOpenId.Provider;

 using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.SimpleRegistration;

 

 /// <summary>

 /// Handles the collection of the simple registration fields.

@@ -82,10 +81,10 @@ public partial class ProfileFields : System.Web.UI.UserControl {
 	public Gender? Gender {

 		get {

 			if (this.genderDropdownList.SelectedValue == "Male") {

-				return DotNetOpenId.Extensions.Gender.Male;

+				return DotNetOpenId.Extensions.SimpleRegistration.Gender.Male;

 			}

 			if (this.genderDropdownList.SelectedValue == "Female") {

-				return DotNetOpenId.Extensions.Gender.Female;

+				return DotNetOpenId.Extensions.SimpleRegistration.Gender.Female;

 			}

 			return null;

 		}

diff --git a/samples/ProviderPortal/decide.aspx.cs b/samples/ProviderPortal/decide.aspx.cs
index 7954dfc..ed1f62e 100644
--- a/samples/ProviderPortal/decide.aspx.cs
+++ b/samples/ProviderPortal/decide.aspx.cs
@@ -2,7 +2,7 @@ using System;
 using System.Diagnostics;

 using System.Web.Security;

 using System.Web.UI;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.SimpleRegistration;

 using DotNetOpenId.Provider;

 

 /// <summary>

@@ -28,7 +28,7 @@ public partial class decide : Page {
 				this.profileFields.Visible = true;

 				this.profileFields.SetRequiredFieldsFromRequest(requestedFields);

 				if (!IsPostBack) {

-					this.profileFields.OpenIdProfileFields = new DotNetOpenId.Extensions.SimpleRegistrationFieldValues() {

+					this.profileFields.OpenIdProfileFields = new SimpleRegistrationFieldValues() {

 						Email = Membership.GetUser().Email,

 					};

 				}

diff --git a/samples/RelyingPartyPortal/Code/State.cs b/samples/RelyingPartyPortal/Code/State.cs
index ccfdd6e..f049ad1 100644
--- a/samples/RelyingPartyPortal/Code/State.cs
+++ b/samples/RelyingPartyPortal/Code/State.cs
@@ -7,7 +7,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;

 using System.Web.UI.WebControls.WebParts;

 using System.Web.UI.HtmlControls;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.SimpleRegistration;

 

 /// <summary>

 /// Summary description for State

diff --git a/src/DotNetOpenId.Test/Extensions/AttributeExchangeFetchRequestTests.cs b/src/DotNetOpenId.Test/Extensions/AttributeExchangeFetchRequestTests.cs
index 3095b02..659f39f 100644
--- a/src/DotNetOpenId.Test/Extensions/AttributeExchangeFetchRequestTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/AttributeExchangeFetchRequestTests.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Text;

 using NUnit.Framework;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.AttributeExchange;

 

 namespace DotNetOpenId.Test.Extensions {

 	[TestFixture]

diff --git a/src/DotNetOpenId.Test/Extensions/AttributeExchangeFetchResponseTests.cs b/src/DotNetOpenId.Test/Extensions/AttributeExchangeFetchResponseTests.cs
index 36efca4..d11129b 100644
--- a/src/DotNetOpenId.Test/Extensions/AttributeExchangeFetchResponseTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/AttributeExchangeFetchResponseTests.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Text;

 using NUnit.Framework;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.AttributeExchange;

 

 namespace DotNetOpenId.Test.Extensions {

 	[TestFixture]

diff --git a/src/DotNetOpenId.Test/Extensions/AttributeExchangeTests.cs b/src/DotNetOpenId.Test/Extensions/AttributeExchangeTests.cs
index 1e76a1d..1b516ff 100644
--- a/src/DotNetOpenId.Test/Extensions/AttributeExchangeTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/AttributeExchangeTests.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;

 using NUnit.Framework;

 using DotNetOpenId.RelyingParty;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.AttributeExchange;

 

 namespace DotNetOpenId.Test.Extensions {

 	[TestFixture]

diff --git a/src/DotNetOpenId.Test/Extensions/AttributeRequestTests.cs b/src/DotNetOpenId.Test/Extensions/AttributeRequestTests.cs
index 89a29a0..c695582 100644
--- a/src/DotNetOpenId.Test/Extensions/AttributeRequestTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/AttributeRequestTests.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Text;

 using NUnit.Framework;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.AttributeExchange;

 

 namespace DotNetOpenId.Test.Extensions {

 	[TestFixture]

diff --git a/src/DotNetOpenId.Test/Extensions/SimpleRegistrationTests.cs b/src/DotNetOpenId.Test/Extensions/SimpleRegistrationTests.cs
index 1377a49..0c068ac 100644
--- a/src/DotNetOpenId.Test/Extensions/SimpleRegistrationTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/SimpleRegistrationTests.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Text;

 using NUnit.Framework;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.SimpleRegistration;

 

 namespace DotNetOpenId.Test.Extensions {

 	[TestFixture]

diff --git a/src/DotNetOpenId.Test/ExtensionsArgumentsManagerTests.cs b/src/DotNetOpenId.Test/ExtensionsArgumentsManagerTests.cs
index 3fcbb3c..350c392 100644
--- a/src/DotNetOpenId.Test/ExtensionsArgumentsManagerTests.cs
+++ b/src/DotNetOpenId.Test/ExtensionsArgumentsManagerTests.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Text;

 using NUnit.Framework;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.SimpleRegistration;

 

 namespace DotNetOpenId.Test {

 	[TestFixture]

@@ -117,15 +117,15 @@ namespace DotNetOpenId.Test {
 				{"openid.sreg.nickname", "andy"},

 			};

 			IIncomingExtensions mgr = ExtensionArgumentsManager.CreateIncomingExtensions(args);

-			Assert.IsTrue(mgr.ContainsExtension(Constants.sreg.sreg_ns));

-			Assert.AreEqual("andy", mgr.GetExtensionArguments(Constants.sreg.sreg_ns)["nickname"]);

+			Assert.IsTrue(mgr.ContainsExtension(Constants.sreg_ns));

+			Assert.AreEqual("andy", mgr.GetExtensionArguments(Constants.sreg_ns)["nickname"]);

 			// Now imagine that sreg was used explicitly by something else...

 			args = new Dictionary<string, string>() {

 				{"openid.sreg.nickname", "andy"},

 				{"openid.ns.sreg", "someOtherNS"},

 			};

 			mgr = ExtensionArgumentsManager.CreateIncomingExtensions(args);

-			Assert.IsFalse(mgr.ContainsExtension(Constants.sreg.sreg_ns));

+			Assert.IsFalse(mgr.ContainsExtension(Constants.sreg_ns));

 			Assert.AreEqual("andy", mgr.GetExtensionArguments("someOtherNS")["nickname"]);

 		}

 

@@ -135,10 +135,10 @@ namespace DotNetOpenId.Test {
 				{"nickname", "andy"},

 			};

 			var mgr = ExtensionArgumentsManager.CreateOutgoingExtensions(protocol);

-			mgr.AddExtensionArguments(Constants.sreg.sreg_ns, args);

+			mgr.AddExtensionArguments(Constants.sreg_ns, args);

 			var results = mgr.GetArgumentsToSend(true);

 			Assert.IsTrue(results.ContainsKey("openid.ns.sreg"));

-			Assert.AreEqual(Constants.sreg.sreg_ns, results["openid.ns.sreg"]);

+			Assert.AreEqual(Constants.sreg_ns, results["openid.ns.sreg"]);

 			Assert.IsTrue(results.ContainsKey("openid.sreg.nickname"));

 			Assert.AreEqual("andy", results["openid.sreg.nickname"]);

 		}

@@ -149,10 +149,10 @@ namespace DotNetOpenId.Test {
 				{"nickname", "andy"},

 			};

 			var mgr = ExtensionArgumentsManager.CreateOutgoingExtensions(protocol);

-			mgr.AddExtensionArguments(Constants.sreg.sreg_ns, args);

+			mgr.AddExtensionArguments(Constants.sreg_ns, args);

 			var results = mgr.GetArgumentsToSend(false);

 			Assert.IsTrue(results.ContainsKey("ns.sreg"));

-			Assert.AreEqual(Constants.sreg.sreg_ns, results["ns.sreg"]);

+			Assert.AreEqual(Constants.sreg_ns, results["ns.sreg"]);

 			Assert.IsTrue(results.ContainsKey("sreg.nickname"));

 			Assert.AreEqual("andy", results["sreg.nickname"]);

 		}

@@ -190,7 +190,7 @@ namespace DotNetOpenId.Test {
 				{"openid.sreg", "v1"},

 			};

 			var mgr = ExtensionArgumentsManager.CreateIncomingExtensions(args);

-			var result = mgr.GetExtensionArguments(Constants.sreg.sreg_ns);

+			var result = mgr.GetExtensionArguments(Constants.sreg_ns);

 			Assert.AreEqual("v1", result[string.Empty]);

 		}

 

@@ -200,7 +200,7 @@ namespace DotNetOpenId.Test {
 				{"", "v1"},

 			};

 			var mgr = ExtensionArgumentsManager.CreateOutgoingExtensions(protocol);

-			mgr.AddExtensionArguments(Constants.sreg.sreg_ns, args);

+			mgr.AddExtensionArguments(Constants.sreg_ns, args);

 			var result = mgr.GetArgumentsToSend(true);

 			Assert.AreEqual(2, result.Count);

 			Assert.AreEqual("v1", result["openid.sreg"]);

diff --git a/src/DotNetOpenId.Test/ProfileFieldValuesTests.cs b/src/DotNetOpenId.Test/ProfileFieldValuesTests.cs
index 9c309c8..b04bd6f 100644
--- a/src/DotNetOpenId.Test/ProfileFieldValuesTests.cs
+++ b/src/DotNetOpenId.Test/ProfileFieldValuesTests.cs
@@ -13,6 +13,7 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Xml.Serialization;

 using System.IO;

 using NUnit.Framework;

+using DotNetOpenId.Extensions.SimpleRegistration;

 using DotNetOpenId.Extensions;

 

 namespace DotNetOpenId.Test {

diff --git a/src/DotNetOpenId.Test/UriIdentifierTests.cs b/src/DotNetOpenId.Test/UriIdentifierTests.cs
index 8747bf6..cebb3c6 100644
--- a/src/DotNetOpenId.Test/UriIdentifierTests.cs
+++ b/src/DotNetOpenId.Test/UriIdentifierTests.cs
@@ -4,7 +4,7 @@ using System.Text;
 using NUnit.Framework;

 using DotNetOpenId.RelyingParty;

 using System.Net;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.SimpleRegistration;

 

 namespace DotNetOpenId.Test {

 	[TestFixture]

@@ -74,7 +74,7 @@ namespace DotNetOpenId.Test {
 			Assert.AreEqual(expectSreg ? 2 : 1, se.ProviderSupportedServiceTypeUris.Length);

 			Assert.IsTrue(Array.IndexOf(se.ProviderSupportedServiceTypeUris, protocol.ClaimedIdentifierServiceTypeURI)>=0);

 			if (expectSreg)

-				Assert.IsTrue(Array.IndexOf(se.ProviderSupportedServiceTypeUris, Constants.sreg.TypeUri) >= 0);

+				Assert.IsTrue(Array.IndexOf(se.ProviderSupportedServiceTypeUris, Constants.TypeUri) >= 0);

 		}

 		void discoverXrds(string page, ProtocolVersion version, Identifier expectedLocalId) {

 			discover("/xrdsdiscovery/" + page + ".aspx", version, expectedLocalId, true, false);

diff --git a/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs b/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
index 1c56632..45efd09 100644
--- a/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
+++ b/src/DotNetOpenId.TestWeb/ProviderEndpoint.aspx.cs
@@ -9,8 +9,9 @@ using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;

 using System.Web.UI.WebControls.WebParts;

 using System.Collections.Specialized;

-using DotNetOpenId.Extensions;

 using System.Collections.Generic;

+using DotNetOpenId.Extensions.AttributeExchange;

+using DotNetOpenId.Extensions.SimpleRegistration;

 

 public partial class ProviderEndpoint : System.Web.UI.Page {

 	const string nicknameTypeUri = AttributeExchangeConstants.Name.Alias;

diff --git a/src/DotNetOpenId/DotNetOpenId.csproj b/src/DotNetOpenId/DotNetOpenId.csproj
index 594954c..a48ff65 100644
--- a/src/DotNetOpenId/DotNetOpenId.csproj
+++ b/src/DotNetOpenId/DotNetOpenId.csproj
@@ -58,15 +58,15 @@
     <Compile Include="Associations.cs" />

     <Compile Include="ExtensionArgumentsManager.cs" />

     <Compile Include="Extensions\AliasManager.cs" />

-    <Compile Include="Extensions\AttributeExchangeConstants.cs" />

-    <Compile Include="Extensions\AttributeExchangeFetchResponse.cs" />

-    <Compile Include="Extensions\AttributeRequest.cs" />

-    <Compile Include="Extensions\AttributeValues.cs" />

-    <Compile Include="Extensions\Constants.cs" />

-    <Compile Include="Extensions\AttributeExchangeFetchRequest.cs" />

-    <Compile Include="Extensions\AttributeExchangeStoreRequest.cs" />

-    <Compile Include="Extensions\AttributeExchangeStoreResponse.cs" />

-    <Compile Include="Extensions\DemandLevel.cs" />

+    <Compile Include="Extensions\AttributeExchange\Constants.cs" />

+    <Compile Include="Extensions\AttributeExchange\AttributeExchangeFetchResponse.cs" />

+    <Compile Include="Extensions\AttributeExchange\AttributeRequest.cs" />

+    <Compile Include="Extensions\AttributeExchange\AttributeValues.cs" />

+    <Compile Include="Extensions\SimpleRegistration\Constants.cs" />

+    <Compile Include="Extensions\AttributeExchange\AttributeExchangeFetchRequest.cs" />

+    <Compile Include="Extensions\AttributeExchange\AttributeExchangeStoreRequest.cs" />

+    <Compile Include="Extensions\AttributeExchange\AttributeExchangeStoreResponse.cs" />

+    <Compile Include="Extensions\AttributeExchange\DemandLevel.cs" />

     <Compile Include="Extensions\IExtension.cs" />

     <Compile Include="HmacSha256Association.cs" />

     <Compile Include="Identifier.cs" />

@@ -112,13 +112,13 @@
     <Compile Include="Provider\Request.cs" />

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

     <Compile Include="Provider\ProviderEndpoint.cs" />

-    <Compile Include="Extensions\Gender.cs" />

+    <Compile Include="Extensions\SimpleRegistration\Gender.cs" />

     <Compile Include="Provider\AssociatedRequest.cs" />

-    <Compile Include="Extensions\SimpleRegistrationFieldValues.cs" />

-    <Compile Include="Extensions\SimpleRegistrationRequestFields.cs" />

+    <Compile Include="Extensions\SimpleRegistration\SimpleRegistrationFieldValues.cs" />

+    <Compile Include="Extensions\SimpleRegistration\SimpleRegistrationRequestFields.cs" />

     <Compile Include="RelyingParty\OpenIdLogin.cs" />

     <Compile Include="RelyingParty\OpenIdTextBox.cs" />

-    <Compile Include="Extensions\SimpleRegistrationRequest.cs" />

+    <Compile Include="Extensions\SimpleRegistration\SimpleRegistrationRequest.cs" />

     <Compile Include="RelyingParty\ServiceEndpoint.cs" />

     <Compile Include="CryptUtil.cs" />

     <Compile Include="DiffieHellman\DHKeyGeneration.cs" />

diff --git a/src/DotNetOpenId/ExtensionArgumentsManager.cs b/src/DotNetOpenId/ExtensionArgumentsManager.cs
index b35d1e4..9bcdb73 100644
--- a/src/DotNetOpenId/ExtensionArgumentsManager.cs
+++ b/src/DotNetOpenId/ExtensionArgumentsManager.cs
@@ -21,7 +21,7 @@ namespace DotNetOpenId {
 		/// match to namespaces for backward compatibility with other OpenID libraries.

 		/// </summary>

 		static readonly Dictionary<string, string> typeUriToAliasAffinity = new Dictionary<string, string> {

-			{ Extensions.Constants.sreg.sreg_ns, Extensions.Constants.sreg.sreg_compatibility_alias },

+			{ Extensions.SimpleRegistration.Constants.sreg_ns, Extensions.SimpleRegistration.Constants.sreg_compatibility_alias },

 		};

 

 		private ExtensionArgumentsManager() { }

diff --git a/src/DotNetOpenId/Extensions/AttributeExchangeFetchRequest.cs b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeExchangeFetchRequest.cs
index 3aad1ab..d266b59 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchangeFetchRequest.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeExchangeFetchRequest.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.Globalization;

 using System.Diagnostics;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.AttributeExchange {

 	/// <summary>

 	/// The Attribute Exchange Fetch message, request leg.

 	/// </summary>

@@ -42,7 +42,7 @@ namespace DotNetOpenId.Extensions {
 		public Uri UpdateUrl { get; set; }

 

 		#region IExtensionRequest Members

-		string IExtension.TypeUri { get { return Constants.ae.ns; } }

+		string IExtension.TypeUri { get { return Constants.ns; } }

 

 		IDictionary<string, string> IExtensionRequest.Serialize(RelyingParty.IAuthenticationRequest authenticationRequest) {

 			var fields = new Dictionary<string, string> {

diff --git a/src/DotNetOpenId/Extensions/AttributeExchangeFetchResponse.cs b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeExchangeFetchResponse.cs
index efceb19..295fca5 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchangeFetchResponse.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeExchangeFetchResponse.cs
@@ -5,7 +5,7 @@ using DotNetOpenId.RelyingParty;
 using System.Globalization;

 using System.Diagnostics;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.AttributeExchange {

 	/// <summary>

 	/// The Attribute Exchange Fetch message, response leg.

 	/// </summary>

@@ -44,7 +44,7 @@ namespace DotNetOpenId.Extensions {
 		public Uri UpdateUrl { get; set; }

 

 		#region IExtensionResponse Members

-		string IExtension.TypeUri { get { return Constants.ae.ns; } }

+		string IExtension.TypeUri { get { return Constants.ns; } }

 

 		IDictionary<string, string> IExtensionResponse.Serialize(Provider.IRequest authenticationRequest) {

 			var fields = new Dictionary<string, string> {

diff --git a/src/DotNetOpenId/Extensions/AttributeExchangeStoreRequest.cs b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeExchangeStoreRequest.cs
index 7f72c46..981d990 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchangeStoreRequest.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeExchangeStoreRequest.cs
@@ -4,7 +4,7 @@ using System.Text;
 using DotNetOpenId.RelyingParty;

 using System.Globalization;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.AttributeExchange {

 	/// <summary>

 	/// The Attribute Exchange Store message, request leg.

 	/// </summary>

@@ -34,7 +34,7 @@ namespace DotNetOpenId.Extensions {
 		}

 

 		#region IExtensionRequest Members

-		string IExtension.TypeUri { get { return Constants.ae.ns; } }

+		string IExtension.TypeUri { get { return Constants.ns; } }

 

 		IDictionary<string, string> IExtensionRequest.Serialize(RelyingParty.IAuthenticationRequest authenticationRequest) {

 			var fields = new Dictionary<string, string> {

diff --git a/src/DotNetOpenId/Extensions/AttributeExchangeStoreResponse.cs b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeExchangeStoreResponse.cs
index 35c7874..487d560 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchangeStoreResponse.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeExchangeStoreResponse.cs
@@ -5,7 +5,7 @@ using DotNetOpenId.RelyingParty;
 using System.Globalization;

 using System.Diagnostics;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.AttributeExchange {

 	/// <summary>

 	/// The Attribute Exchange Store message, response leg.

 	/// </summary>

@@ -23,7 +23,7 @@ namespace DotNetOpenId.Extensions {
 		public string FailureReason { get; set; }

 

 		#region IExtensionResponse Members

-		string IExtension.TypeUri { get { return Constants.ae.ns; } }

+		string IExtension.TypeUri { get { return Constants.ns; } }

 

 		IDictionary<string, string> IExtensionResponse.Serialize(Provider.IRequest authenticationRequest) {

 			var fields = new Dictionary<string, string> {

diff --git a/src/DotNetOpenId/Extensions/AttributeRequest.cs b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeRequest.cs
index eeb30ee..b7a38c4 100644
--- a/src/DotNetOpenId/Extensions/AttributeRequest.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeRequest.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;

 using System.Globalization;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.AttributeExchange {

 	/// <summary>

 	/// An individual attribute to be requested of the OpenID Provider using

 	/// the Attribute Exchange extension.

diff --git a/src/DotNetOpenId/Extensions/AttributeValues.cs b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeValues.cs
index 594b6cf..71effa5 100644
--- a/src/DotNetOpenId/Extensions/AttributeValues.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/AttributeValues.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;

 using System.Text;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.AttributeExchange {

 	/// <summary>

 	/// An individual attribute's value(s) as supplied by an OpenID Provider

 	/// in response to a prior request by an OpenID Relying Party as part of

diff --git a/src/DotNetOpenId/Extensions/AttributeExchangeConstants.cs b/src/DotNetOpenId/Extensions/AttributeExchange/Constants.cs
index 5343acb..84fb041 100644
--- a/src/DotNetOpenId/Extensions/AttributeExchangeConstants.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/Constants.cs
@@ -2,7 +2,14 @@
 using System.Collections.Generic;

 using System.Text;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.AttributeExchange {

+	/// <summary>

+	/// Attribute Exchange constants

+	/// </summary>

+	internal static class Constants {

+		internal const string ns = "http://openid.net/srv/ax/1.0";

+	}

+

 	/// <summary>

 	/// Attribute types defined at http://www.axschema.org/types/.

 	/// </summary>

diff --git a/src/DotNetOpenId/Extensions/DemandLevel.cs b/src/DotNetOpenId/Extensions/AttributeExchange/DemandLevel.cs
index 05ec8be..69e67a9 100644
--- a/src/DotNetOpenId/Extensions/DemandLevel.cs
+++ b/src/DotNetOpenId/Extensions/AttributeExchange/DemandLevel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;

 using System.Text;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.AttributeExchange {

 	/// <summary>

 	/// Indicates a relying party's level of desire for a particular value

 	/// to be provided by the OpenID Provider.

diff --git a/src/DotNetOpenId/Extensions/Constants.cs b/src/DotNetOpenId/Extensions/Constants.cs
deleted file mode 100644
index 304f52f..0000000
--- a/src/DotNetOpenId/Extensions/Constants.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace DotNetOpenId.Extensions {

-	/// <summary>

-	/// Tracks the several versions of OpenID this library supports and the unique

-	/// constants to each version used in the protocol.

-	/// </summary>

-	internal static class Constants {

-		/// <summary>

-		/// Attribute Exchange constants

-		/// </summary>

-		internal static class ae {

-			internal const string ns = "http://openid.net/srv/ax/1.0";

-		}

-		/// <summary>

-		/// Simple Registration constants

-		/// </summary>

-		internal static class sreg {

-			internal const string TypeUri = "http://openid.net/sreg/1.0";

-			internal const string sreg_ns = "http://openid.net/extensions/sreg/1.1";

-			internal const string sreg_compatibility_alias = "sreg";

-			internal const string policy_url = "policy_url";

-			internal const string optional = "optional";

-			internal const string required = "required";

-			internal const string nickname = "nickname";

-			internal const string email = "email";

-			internal const string fullname = "fullname";

-			internal const string dob = "dob";

-			internal const string gender = "gender";

-			internal const string postcode = "postcode";

-			internal const string country = "country";

-			internal const string language = "language";

-			internal const string timezone = "timezone";

-			internal static class Genders {

-				internal const string Male = "M";

-				internal const string Female = "F";

-			}

-		}

-	}

-}

diff --git a/src/DotNetOpenId/Extensions/SimpleRegistration/Constants.cs b/src/DotNetOpenId/Extensions/SimpleRegistration/Constants.cs
new file mode 100644
index 0000000..fc4066e
--- /dev/null
+++ b/src/DotNetOpenId/Extensions/SimpleRegistration/Constants.cs
@@ -0,0 +1,30 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace DotNetOpenId.Extensions.SimpleRegistration {

+	/// <summary>

+	/// Simple Registration constants

+	/// </summary>

+	internal static class Constants {

+		internal const string TypeUri = "http://openid.net/sreg/1.0";

+		internal const string sreg_ns = "http://openid.net/extensions/sreg/1.1";

+		internal const string sreg_compatibility_alias = "sreg";

+		internal const string policy_url = "policy_url";

+		internal const string optional = "optional";

+		internal const string required = "required";

+		internal const string nickname = "nickname";

+		internal const string email = "email";

+		internal const string fullname = "fullname";

+		internal const string dob = "dob";

+		internal const string gender = "gender";

+		internal const string postcode = "postcode";

+		internal const string country = "country";

+		internal const string language = "language";

+		internal const string timezone = "timezone";

+		internal static class Genders {

+			internal const string Male = "M";

+			internal const string Female = "F";

+		}

+	}

+}

diff --git a/src/DotNetOpenId/Extensions/Gender.cs b/src/DotNetOpenId/Extensions/SimpleRegistration/Gender.cs
index a804416..6f42658 100644
--- a/src/DotNetOpenId/Extensions/Gender.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistration/Gender.cs
@@ -5,7 +5,7 @@
  * For news or support on this file: http://blog.nerdbank.net/

  ********************************************************/

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.SimpleRegistration {

 	/// <summary>

 	/// Indicates the gender of a user.

 	/// </summary>

diff --git a/src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs b/src/DotNetOpenId/Extensions/SimpleRegistration/SimpleRegistrationFieldValues.cs
index ffefd6f..89771ba 100644
--- a/src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistration/SimpleRegistrationFieldValues.cs
@@ -14,7 +14,7 @@ using DotNetOpenId.RelyingParty;
 using DotNetOpenId.Provider;

 using System.Collections.Generic;

 

-namespace DotNetOpenId.Extensions

+namespace DotNetOpenId.Extensions.SimpleRegistration

 {

 #pragma warning disable 0659, 0661

 	/// <summary>

@@ -104,7 +104,7 @@ namespace DotNetOpenId.Extensions
 		public string TimeZone { get; set; }

 

 		#region IExtensionResponse Members

-		string IExtension.TypeUri { get { return Constants.sreg.sreg_ns; } }

+		string IExtension.TypeUri { get { return Constants.sreg_ns; } }

 

 		/// <summary>

 		/// Adds the values of this struct to an authentication response being prepared

@@ -115,35 +115,35 @@ namespace DotNetOpenId.Extensions
 			if (authenticationRequest == null) throw new ArgumentNullException("authenticationRequest");

 			Dictionary<string, string> fields = new Dictionary<string, string>();

 			if (BirthDate != null) {

-				fields.Add(Constants.sreg.dob, BirthDate.ToString());

+				fields.Add(Constants.dob, BirthDate.ToString());

 			}

 			if (!String.IsNullOrEmpty(Country)) {

-				fields.Add(Constants.sreg.country, Country);

+				fields.Add(Constants.country, Country);

 			}

 			if (Email != null) {

-				fields.Add(Constants.sreg.email, Email.ToString());

+				fields.Add(Constants.email, Email.ToString());

 			}

 			if ((!String.IsNullOrEmpty(FullName))) {

-				fields.Add(Constants.sreg.fullname, FullName);

+				fields.Add(Constants.fullname, FullName);

 			}

 			if (Gender != null) {

-				if (Gender == DotNetOpenId.Extensions.Gender.Female) {

-					fields.Add(Constants.sreg.gender, Constants.sreg.Genders.Female);

+				if (Gender == SimpleRegistration.Gender.Female) {

+					fields.Add(Constants.gender, Constants.Genders.Female);

 				} else {

-					fields.Add(Constants.sreg.gender, Constants.sreg.Genders.Male);

+					fields.Add(Constants.gender, Constants.Genders.Male);

 				}

 			}

 			if (!String.IsNullOrEmpty(Language)) {

-				fields.Add(Constants.sreg.language, Language);

+				fields.Add(Constants.language, Language);

 			}

 			if (!String.IsNullOrEmpty(Nickname)) {

-				fields.Add(Constants.sreg.nickname, Nickname);

+				fields.Add(Constants.nickname, Nickname);

 			}

 			if (!String.IsNullOrEmpty(PostalCode)) {

-				fields.Add(Constants.sreg.postcode, PostalCode);

+				fields.Add(Constants.postcode, PostalCode);

 			}

 			if (!String.IsNullOrEmpty(TimeZone)) {

-				fields.Add(Constants.sreg.timezone, TimeZone);

+				fields.Add(Constants.timezone, TimeZone);

 			}

 			return fields;

 		}

@@ -153,30 +153,30 @@ namespace DotNetOpenId.Extensions
 			string nickname, email, fullName, dob, genderString, postalCode, country, language, timeZone;

 			BirthDate = null;

 			Gender = null;

-			sreg.TryGetValue(Constants.sreg.nickname, out nickname);

+			sreg.TryGetValue(Constants.nickname, out nickname);

 			Nickname = nickname;

-			sreg.TryGetValue(Constants.sreg.email, out email);

+			sreg.TryGetValue(Constants.email, out email);

 			Email = email;

-			sreg.TryGetValue(Constants.sreg.fullname, out fullName);

+			sreg.TryGetValue(Constants.fullname, out fullName);

 			FullName = fullName;

-			if (sreg.TryGetValue(Constants.sreg.dob, out dob)) {

+			if (sreg.TryGetValue(Constants.dob, out dob)) {

 				DateTime bd;

 				if (DateTime.TryParse(dob, out bd))

 					BirthDate = bd;

 			}

-			if (sreg.TryGetValue(Constants.sreg.gender, out genderString)) {

+			if (sreg.TryGetValue(Constants.gender, out genderString)) {

 				switch (genderString) {

-					case Constants.sreg.Genders.Male: Gender = DotNetOpenId.Extensions.Gender.Male; break;

-					case Constants.sreg.Genders.Female: Gender = DotNetOpenId.Extensions.Gender.Female; break;

+					case Constants.Genders.Male: Gender = SimpleRegistration.Gender.Male; break;

+					case Constants.Genders.Female: Gender = SimpleRegistration.Gender.Female; break;

 				}

 			}

-			sreg.TryGetValue(Constants.sreg.postcode, out postalCode);

+			sreg.TryGetValue(Constants.postcode, out postalCode);

 			PostalCode = postalCode;

-			sreg.TryGetValue(Constants.sreg.country, out country);

+			sreg.TryGetValue(Constants.country, out country);

 			Country = country;

-			sreg.TryGetValue(Constants.sreg.language, out language);

+			sreg.TryGetValue(Constants.language, out language);

 			Language = language;

-			sreg.TryGetValue(Constants.sreg.timezone, out timeZone);

+			sreg.TryGetValue(Constants.timezone, out timeZone);

 			TimeZone = timeZone;

 

 			return true;

diff --git a/src/DotNetOpenId/Extensions/SimpleRegistrationRequest.cs b/src/DotNetOpenId/Extensions/SimpleRegistration/SimpleRegistrationRequest.cs
index 6c9c5c7..5c60535 100644
--- a/src/DotNetOpenId/Extensions/SimpleRegistrationRequest.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistration/SimpleRegistrationRequest.cs
@@ -5,7 +5,7 @@
  * For news or support on this file: http://blog.nerdbank.net/

  ********************************************************/

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.SimpleRegistration {

 	/// <summary>

 	/// Specifies what level of interest a relying party has in obtaining the value

 	/// of a given field offered by the Simple Registration extension.

diff --git a/src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs b/src/DotNetOpenId/Extensions/SimpleRegistration/SimpleRegistrationRequestFields.cs
index a881dab..1d5d1d4 100644
--- a/src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistration/SimpleRegistrationRequestFields.cs
@@ -6,7 +6,7 @@ using System.Globalization;
 using DotNetOpenId.Provider;

 using DotNetOpenId.RelyingParty;

 

-namespace DotNetOpenId.Extensions {

+namespace DotNetOpenId.Extensions.SimpleRegistration {

 	/// <summary>

 	/// Carries the request/require/none demand state of the simple registration fields.

 	/// </summary>

@@ -69,31 +69,31 @@ namespace DotNetOpenId.Extensions {
 		internal void SetProfileRequestFromList(ICollection<string> fieldNames, SimpleRegistrationRequest requestLevel) {

 			foreach (string field in fieldNames) {

 				switch (field) {

-					case Constants.sreg.nickname:

+					case Constants.nickname:

 						Nickname = requestLevel;

 						break;

-					case Constants.sreg.email:

+					case Constants.email:

 						Email = requestLevel;

 						break;

-					case Constants.sreg.fullname:

+					case Constants.fullname:

 						FullName = requestLevel;

 						break;

-					case Constants.sreg.dob:

+					case Constants.dob:

 						BirthDate = requestLevel;

 						break;

-					case Constants.sreg.gender:

+					case Constants.gender:

 						Gender = requestLevel;

 						break;

-					case Constants.sreg.postcode:

+					case Constants.postcode:

 						PostalCode = requestLevel;

 						break;

-					case Constants.sreg.country:

+					case Constants.country:

 						Country = requestLevel;

 						break;

-					case Constants.sreg.language:

+					case Constants.language:

 						Language = requestLevel;

 						break;

-					case Constants.sreg.timezone:

+					case Constants.timezone:

 						TimeZone = requestLevel;

 						break;

 					default:

@@ -105,46 +105,46 @@ namespace DotNetOpenId.Extensions {
 		string[] assembleProfileFields(SimpleRegistrationRequest level) {

 			List<string> fields = new List<string>(10);

 			if (Nickname == level)

-				fields.Add(Constants.sreg.nickname);

+				fields.Add(Constants.nickname);

 			if (Email == level)

-				fields.Add(Constants.sreg.email);

+				fields.Add(Constants.email);

 			if (FullName == level)

-				fields.Add(Constants.sreg.fullname);

+				fields.Add(Constants.fullname);

 			if (BirthDate == level)

-				fields.Add(Constants.sreg.dob);

+				fields.Add(Constants.dob);

 			if (Gender == level)

-				fields.Add(Constants.sreg.gender);

+				fields.Add(Constants.gender);

 			if (PostalCode == level)

-				fields.Add(Constants.sreg.postcode);

+				fields.Add(Constants.postcode);

 			if (Country == level)

-				fields.Add(Constants.sreg.country);

+				fields.Add(Constants.country);

 			if (Language == level)

-				fields.Add(Constants.sreg.language);

+				fields.Add(Constants.language);

 			if (TimeZone == level)

-				fields.Add(Constants.sreg.timezone);

+				fields.Add(Constants.timezone);

 

 			return fields.ToArray();

 		}

 

 		#region IExtensionRequest Members

-		string IExtension.TypeUri { get { return Constants.sreg.sreg_ns; } }

+		string IExtension.TypeUri { get { return Constants.sreg_ns; } }

 

 		bool IExtensionRequest.Deserialize(IDictionary<string, string> args, IRequest request) {

 			if (args == null) return false;

 

 			string policyUrl;

-			if (args.TryGetValue(Constants.sreg.policy_url, out policyUrl)

+			if (args.TryGetValue(Constants.policy_url, out policyUrl)

 				&& !string.IsNullOrEmpty(policyUrl)) {

 				PolicyUrl = new Uri(policyUrl);

 			}

 

 			string optionalFields;

-			if (args.TryGetValue(Constants.sreg.optional, out optionalFields)) {

+			if (args.TryGetValue(Constants.optional, out optionalFields)) {

 				SetProfileRequestFromList(optionalFields.Split(','), SimpleRegistrationRequest.Request);

 			}

 

 			string requiredFields;

-			if (args.TryGetValue(Constants.sreg.required, out requiredFields)) {

+			if (args.TryGetValue(Constants.required, out requiredFields)) {

 				SetProfileRequestFromList(requiredFields.Split(','), SimpleRegistrationRequest.Require);

 			}

 

@@ -159,10 +159,10 @@ namespace DotNetOpenId.Extensions {
 		IDictionary<string, string> IExtensionRequest.Serialize(RelyingParty.IAuthenticationRequest request) {

 			var fields = new Dictionary<string, string>();

 			if (PolicyUrl != null)

-				fields.Add(Constants.sreg.policy_url, PolicyUrl.AbsoluteUri);

+				fields.Add(Constants.policy_url, PolicyUrl.AbsoluteUri);

 

-			fields.Add(Constants.sreg.required, string.Join(",", assembleProfileFields(SimpleRegistrationRequest.Require)));

-			fields.Add(Constants.sreg.optional, string.Join(",", assembleProfileFields(SimpleRegistrationRequest.Request)));

+			fields.Add(Constants.required, string.Join(",", assembleProfileFields(SimpleRegistrationRequest.Require)));

+			fields.Add(Constants.optional, string.Join(",", assembleProfileFields(SimpleRegistrationRequest.Request)));

 

 			return fields;

 		}

diff --git a/src/DotNetOpenId/RelyingParty/OpenIdMobileTextBox.cs b/src/DotNetOpenId/RelyingParty/OpenIdMobileTextBox.cs
index ae932ee..9487bdf 100644
--- a/src/DotNetOpenId/RelyingParty/OpenIdMobileTextBox.cs
+++ b/src/DotNetOpenId/RelyingParty/OpenIdMobileTextBox.cs
@@ -14,7 +14,7 @@ using System.Text.RegularExpressions;
 using System.Web.Security;

 using System.Web.UI;

 using System.Web.UI.MobileControls;

-using DotNetOpenId.Extensions;

+using DotNetOpenId.Extensions.SimpleRegistration;

 

 [assembly: WebResource(DotNetOpenId.RelyingParty.OpenIdMobileTextBox.EmbeddedLogoResourceName, "image/gif")]

 

diff --git a/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs b/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
index 4ff20d1..2d0b77a 100644
--- a/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
+++ b/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
@@ -12,13 +12,13 @@ using System.ComponentModel;
 using System.Web.Security;

 using System.Web.UI;

 using System.Web.UI.WebControls;

-using DotNetOpenId.Extensions;

 using System.Net;

 using System.Text.RegularExpressions;

 using System.Diagnostics;

 using System.Globalization;

 using System.Diagnostics.CodeAnalysis;

 using System.Web;

+using DotNetOpenId.Extensions.SimpleRegistration;

 

 [assembly: WebResource(DotNetOpenId.RelyingParty.OpenIdTextBox.EmbeddedLogoResourceName, "image/gif")]