diff --git a/samples/CookieSessionSample/MemoryCacheSessionStore.cs b/samples/CookieSessionSample/MemoryCacheSessionStore.cs
index c07d706325..854b40fb20 100644
--- a/samples/CookieSessionSample/MemoryCacheSessionStore.cs
+++ b/samples/CookieSessionSample/MemoryCacheSessionStore.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Authentication;
-using Microsoft.AspNet.Authentication.Cookies.Infrastructure;
+using Microsoft.AspNet.Authentication.Cookies;
 using Microsoft.Framework.Caching.Memory;
 
 namespace CookieSessionSample
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/ChunkingCookieManager.cs b/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs
similarity index 99%
rename from src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/ChunkingCookieManager.cs
rename to src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs
index 62ab42dd28..993d0e74ee 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/ChunkingCookieManager.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/ChunkingCookieManager.cs
@@ -10,7 +10,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.WebEncoders;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Authentication.Cookies.Infrastructure
+namespace Microsoft.AspNet.Authentication.Cookies
 {
     /// <summary>
     /// This handles cookies that are limited by per cookie length. It breaks down long cookies for responses, and reassembles them
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/Constants.cs b/src/Microsoft.AspNet.Authentication.Cookies/Constants.cs
similarity index 83%
rename from src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/Constants.cs
rename to src/Microsoft.AspNet.Authentication.Cookies/Constants.cs
index 6865cea0f9..c9d6194ba5 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/Constants.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/Constants.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Authentication.Cookies.Infrastructure
+namespace Microsoft.AspNet.Authentication.Cookies
 {
     internal static class Constants
     {
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs
index 70cafe854d..690e6d50d7 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationMiddleware.cs
@@ -2,8 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Authentication.Cookies.Infrastructure;
-using Microsoft.AspNet.Authentication.DataHandler;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.DataProtection;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs
index 52660955cf..0d5e5c16bb 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationOptions.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Cookies.Infrastructure;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Authentication.Cookies
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/IAuthenticationSessionStore.cs b/src/Microsoft.AspNet.Authentication.Cookies/IAuthenticationSessionStore.cs
similarity index 96%
rename from src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/IAuthenticationSessionStore.cs
rename to src/Microsoft.AspNet.Authentication.Cookies/IAuthenticationSessionStore.cs
index 6b2886d0ac..25de38de11 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/IAuthenticationSessionStore.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/IAuthenticationSessionStore.cs
@@ -2,7 +2,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Authentication.Cookies.Infrastructure
+namespace Microsoft.AspNet.Authentication.Cookies
 {
     /// <summary>
     /// This provides an abstract storage mechanic to preserve identity information on the server
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/ICookieManager.cs b/src/Microsoft.AspNet.Authentication.Cookies/ICookieManager.cs
similarity index 95%
rename from src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/ICookieManager.cs
rename to src/Microsoft.AspNet.Authentication.Cookies/ICookieManager.cs
index cffde3869f..0aa9855ee3 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Infrastructure/ICookieManager.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/ICookieManager.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Cookies.Infrastructure
+namespace Microsoft.AspNet.Authentication.Cookies
 {
     /// <summary>
     /// This is used by the CookieAuthenticationMiddleware to process request and response cookies.
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieApplyRedirectContext.cs b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieApplyRedirectContext.cs
index 9083ed817c..aeea8f9633 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieApplyRedirectContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieApplyRedirectContext.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.Cookies
 {
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieExceptionContext.cs b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieExceptionContext.cs
index 1b66997ec3..62ec2eb934 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieExceptionContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieExceptionContext.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.Cookies
 {
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignInContext.cs b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignInContext.cs
index f894231ae8..b931a7c484 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignInContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignInContext.cs
@@ -4,7 +4,6 @@
 using System.Security.Claims;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.Cookies
 {
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignOutContext.cs b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignOutContext.cs
index 260a31ad9f..f33295af57 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignOutContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignOutContext.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.Cookies
 {
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignedInContext.cs b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignedInContext.cs
index df88fef98c..725a900544 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignedInContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieResponseSignedInContext.cs
@@ -4,7 +4,6 @@
 using System.Security.Claims;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.Cookies
 {
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieValidateIdentityContext.cs b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieValidateIdentityContext.cs
index 01c9b920f8..5a95fe639f 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieValidateIdentityContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieValidateIdentityContext.cs
@@ -2,10 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Security.Claims;
-using System.Security.Principal;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Authentication.Notifications;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Authentication.Cookies
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/ICookieAuthenticationNotifications.cs b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/ICookieAuthenticationNotifications.cs
index 3364207af5..365396a924 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/Notifications/ICookieAuthenticationNotifications.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/Notifications/ICookieAuthenticationNotifications.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using System.Threading.Tasks;
 
 namespace Microsoft.AspNet.Authentication.Cookies
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/BaseValidatingContext.cs b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/BaseValidatingContext.cs
index 1dec378602..7ce31e63f8 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/BaseValidatingContext.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/BaseValidatingContext.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.OAuth
 {
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthApplyRedirectContext.cs b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthApplyRedirectContext.cs
index 71c61f261c..86ec2d62a9 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthApplyRedirectContext.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthApplyRedirectContext.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.OAuth
 {
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthAuthenticatedContext.cs b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthAuthenticatedContext.cs
index e423e9244f..5e5574f825 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthAuthenticatedContext.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthAuthenticatedContext.cs
@@ -5,7 +5,6 @@ using System;
 using System.Globalization;
 using System.Net.Http;
 using System.Security.Claims;
-using Microsoft.AspNet.Authentication.Notifications;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthChallengeContext.cs b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthChallengeContext.cs
index 00560432db..b9eccd02f1 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthChallengeContext.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthChallengeContext.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.OAuth
 {
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthRequestTokenContext.cs b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthRequestTokenContext.cs
index 8af4bf6c6e..54a3dac80a 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthRequestTokenContext.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthRequestTokenContext.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.OAuth
 {
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthReturnEndpointContext.cs b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthReturnEndpointContext.cs
index 222420797f..dcf9f2d366 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthReturnEndpointContext.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/Notifications/OAuthReturnEndpointContext.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.OAuth
 {
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationHandler.cs
index 480c3da04b..f99f99d666 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationHandler.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationHandler.cs
@@ -8,7 +8,6 @@ using System.Net.Http.Headers;
 using System.Security.Cryptography;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication.DataHandler.Encoder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.AspNet.Http.Extensions;
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationMiddleware.cs
index c1c884810d..f8a4135fd3 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationMiddleware.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/OAuthAuthenticationMiddleware.cs
@@ -5,7 +5,6 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Net.Http;
-using Microsoft.AspNet.Authentication.DataHandler;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.DataProtection;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Authentication.OAuthBearer/Notifications/AuthenticationChallengeNotification.cs b/src/Microsoft.AspNet.Authentication.OAuthBearer/Notifications/AuthenticationChallengeNotification.cs
index a3bc8af031..f9a4b8b87f 100644
--- a/src/Microsoft.AspNet.Authentication.OAuthBearer/Notifications/AuthenticationChallengeNotification.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuthBearer/Notifications/AuthenticationChallengeNotification.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.OAuthBearer
 {
diff --git a/src/Microsoft.AspNet.Authentication.OAuthBearer/Notifications/OAuthBearerAuthenticationNotifications.cs b/src/Microsoft.AspNet.Authentication.OAuthBearer/Notifications/OAuthBearerAuthenticationNotifications.cs
index 648ff036d3..ffc0b9fc4f 100644
--- a/src/Microsoft.AspNet.Authentication.OAuthBearer/Notifications/OAuthBearerAuthenticationNotifications.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuthBearer/Notifications/OAuthBearerAuthenticationNotifications.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 /// <summary>
 /// Specifies events which the <see cref="OAuthBearerAuthenticationMiddleware"></see> invokes to enable developer control over the authentication process. />
diff --git a/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationHandler.cs
index a163ec5378..a67e92223f 100644
--- a/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationHandler.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationHandler.cs
@@ -5,7 +5,6 @@ using System;
 using System.IdentityModel.Tokens;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication.Notifications;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.AspNet.Http.Features.Authentication;
diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeReceivedNotification.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeReceivedNotification.cs
index 740a0e63c6..9333bea42a 100644
--- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeReceivedNotification.cs
+++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeReceivedNotification.cs
@@ -2,12 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.OpenIdConnect;
 using Microsoft.IdentityModel.Protocols;
 using System.Diagnostics.CodeAnalysis;
 using System.IdentityModel.Tokens;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication.OpenIdConnect
 {
     /// <summary>
     /// This Notification can be used to be informed when an 'AuthorizationCode' is received over the OpenIdConnect protocol.
diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeRedeemedNotification.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeRedeemedNotification.cs
index 5d8a106867..8289e521bd 100644
--- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeRedeemedNotification.cs
+++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeRedeemedNotification.cs
@@ -1,9 +1,7 @@
-using System;
-using Microsoft.AspNet.Authentication.OpenIdConnect;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http;
 using Microsoft.IdentityModel.Protocols;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication.OpenIdConnect
 {
     /// <summary>
     /// This Notification can be used to be informed when an 'AuthorizationCode' is redeemed for tokens at the token endpoint.
diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationNotifications.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/OpenIdConnectAuthenticationNotifications.cs
similarity index 98%
rename from src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationNotifications.cs
rename to src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/OpenIdConnectAuthenticationNotifications.cs
index 81eeb08d32..10ef1ddfab 100644
--- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationNotifications.cs
+++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/OpenIdConnectAuthenticationNotifications.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication.Notifications;
 using Microsoft.IdentityModel.Protocols;
 
 namespace Microsoft.AspNet.Authentication.OpenIdConnect
diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationHandler.cs
index ac28e3434f..8653a261c4 100644
--- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationHandler.cs
+++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationHandler.cs
@@ -10,7 +10,6 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication.Notifications;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.AspNet.Http.Features.Authentication;
diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationMiddleware.cs
index 29f1144aaf..7c67f8ef7a 100644
--- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationMiddleware.cs
+++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectAuthenticationMiddleware.cs
@@ -7,9 +7,6 @@ using System.Diagnostics.CodeAnalysis;
 using System.IdentityModel.Tokens;
 using System.Net.Http;
 using System.Text;
-using Microsoft.AspNet.Authentication.DataHandler;
-using Microsoft.AspNet.Authentication.DataHandler.Encoder;
-using Microsoft.AspNet.Authentication.DataHandler.Serializer;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.DataProtection;
 using Microsoft.AspNet.Http;
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/Messages/AccessToken.cs b/src/Microsoft.AspNet.Authentication.Twitter/Messages/AccessToken.cs
index f723da7426..880cf69d93 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/Messages/AccessToken.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/Messages/AccessToken.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Authentication.Twitter.Messages
+namespace Microsoft.AspNet.Authentication.Twitter
 {
     /// <summary>
     /// The Twitter access token retrieved from the access token endpoint.
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestToken.cs b/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestToken.cs
index 963ad1d7dc..94a766e020 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestToken.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestToken.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http.Authentication;
 
-namespace Microsoft.AspNet.Authentication.Twitter.Messages
+namespace Microsoft.AspNet.Authentication.Twitter
 {
     /// <summary>
     /// The Twitter request token obtained from the request token endpoint.
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestTokenSerializer.cs b/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestTokenSerializer.cs
index 21ef478a8e..b16a430cc4 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestTokenSerializer.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/Messages/RequestTokenSerializer.cs
@@ -3,11 +3,10 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using Microsoft.AspNet.Authentication.DataHandler.Serializer;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Authentication.Twitter.Messages
+namespace Microsoft.AspNet.Authentication.Twitter
 {
     /// <summary>
     /// Serializes and deserializes Twitter request and access tokens so that they can be used by other application components.
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/Messages/Serializers.cs b/src/Microsoft.AspNet.Authentication.Twitter/Messages/Serializers.cs
index b40ac22c12..2476dac5ec 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/Messages/Serializers.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/Messages/Serializers.cs
@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Authentication.DataHandler.Serializer;
-
-namespace Microsoft.AspNet.Authentication.Twitter.Messages
+namespace Microsoft.AspNet.Authentication.Twitter
 {
     /// <summary>
     /// Provides access to a request token serializer.
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterApplyRedirectContext.cs b/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterApplyRedirectContext.cs
index 2186644ed8..90bfd92a2a 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterApplyRedirectContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterApplyRedirectContext.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.Twitter
 {
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterAuthenticatedContext.cs b/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterAuthenticatedContext.cs
index 9cf3b085c7..0ebd2bf91c 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterAuthenticatedContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterAuthenticatedContext.cs
@@ -4,7 +4,6 @@
 using System.Security.Claims;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.Twitter
 {
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterReturnEndpointContext.cs b/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterReturnEndpointContext.cs
index 6d71bc95fe..f6786988e3 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterReturnEndpointContext.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/Notifications/TwitterReturnEndpointContext.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Notifications;
 
 namespace Microsoft.AspNet.Authentication.Twitter
 {
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationHandler.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationHandler.cs
index 19df41b908..d6fea526dc 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationHandler.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationHandler.cs
@@ -9,7 +9,6 @@ using System.Security.Claims;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication.Twitter.Messages;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.AspNet.Http.Features.Authentication;
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationMiddleware.cs
index 1536bd8070..e555e84b24 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationMiddleware.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationMiddleware.cs
@@ -5,9 +5,6 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Net.Http;
-using Microsoft.AspNet.Authentication.DataHandler;
-using Microsoft.AspNet.Authentication.DataHandler.Encoder;
-using Microsoft.AspNet.Authentication.Twitter.Messages;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.DataProtection;
 using Microsoft.Framework.Internal;
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationOptions.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationOptions.cs
index 73cac04563..ba85b77ba4 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationOptions.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationOptions.cs
@@ -5,7 +5,6 @@ using System;
 using System.Net.Http;
 using System.Security.Claims;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Twitter.Messages;
 
 namespace Microsoft.AspNet.Authentication.Twitter
 {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/Encoder/Base64TextEncoder.cs b/src/Microsoft.AspNet.Authentication/DataHandler/Base64TextEncoder.cs
similarity index 88%
rename from src/Microsoft.AspNet.Authentication/DataHandler/Encoder/Base64TextEncoder.cs
rename to src/Microsoft.AspNet.Authentication/DataHandler/Base64TextEncoder.cs
index 073795f260..f56b6f2088 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/Encoder/Base64TextEncoder.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/Base64TextEncoder.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Authentication.DataHandler.Encoder
+namespace Microsoft.AspNet.Authentication
 {
     public class Base64TextEncoder : ITextEncoder
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/Encoder/Base64UrlTextEncoder.cs b/src/Microsoft.AspNet.Authentication/DataHandler/Base64UrlTextEncoder.cs
similarity index 93%
rename from src/Microsoft.AspNet.Authentication/DataHandler/Encoder/Base64UrlTextEncoder.cs
rename to src/Microsoft.AspNet.Authentication/DataHandler/Base64UrlTextEncoder.cs
index 28d74196fa..df3319d9f6 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/Encoder/Base64UrlTextEncoder.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/Base64UrlTextEncoder.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Authentication.DataHandler.Encoder
+namespace Microsoft.AspNet.Authentication
 {
     public class Base64UrlTextEncoder : ITextEncoder
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/Serializer/DataSerializers.cs b/src/Microsoft.AspNet.Authentication/DataHandler/DataSerializers.cs
similarity index 90%
rename from src/Microsoft.AspNet.Authentication/DataHandler/Serializer/DataSerializers.cs
rename to src/Microsoft.AspNet.Authentication/DataHandler/DataSerializers.cs
index 0c185a9b2f..eda821414a 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/Serializer/DataSerializers.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/DataSerializers.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using Microsoft.AspNet.Http.Authentication;
 
-namespace Microsoft.AspNet.Authentication.DataHandler.Serializer
+namespace Microsoft.AspNet.Authentication
 {
     public static class DataSerializers
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/Serializer/IDataSerializer.cs b/src/Microsoft.AspNet.Authentication/DataHandler/IDataSerializer.cs
similarity index 82%
rename from src/Microsoft.AspNet.Authentication/DataHandler/Serializer/IDataSerializer.cs
rename to src/Microsoft.AspNet.Authentication/DataHandler/IDataSerializer.cs
index d6cfd18b20..4fc7b49bec 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/Serializer/IDataSerializer.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/IDataSerializer.cs
@@ -1,8 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
-namespace Microsoft.AspNet.Authentication.DataHandler.Serializer
+namespace Microsoft.AspNet.Authentication
 {
     public interface IDataSerializer<TModel>
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/ISecureDataFormat.cs b/src/Microsoft.AspNet.Authentication/DataHandler/ISecureDataFormat.cs
index e9587de000..cd31bd2a32 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/ISecureDataFormat.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/ISecureDataFormat.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 namespace Microsoft.AspNet.Authentication
 {
     public interface ISecureDataFormat<TData>
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/Encoder/ITextEncoder.cs b/src/Microsoft.AspNet.Authentication/DataHandler/ITextEncoder.cs
similarity index 82%
rename from src/Microsoft.AspNet.Authentication/DataHandler/Encoder/ITextEncoder.cs
rename to src/Microsoft.AspNet.Authentication/DataHandler/ITextEncoder.cs
index 953fb62329..2bcf3f8bac 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/Encoder/ITextEncoder.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/ITextEncoder.cs
@@ -1,8 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
-namespace Microsoft.AspNet.Authentication.DataHandler.Encoder
+namespace Microsoft.AspNet.Authentication
 {
     public interface ITextEncoder
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesDataFormat.cs b/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesDataFormat.cs
index 127554ad8e..d02b0c30b7 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesDataFormat.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesDataFormat.cs
@@ -3,10 +3,8 @@
 
 using Microsoft.AspNet.DataProtection;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Authentication.DataHandler.Encoder;
-using Microsoft.AspNet.Authentication.DataHandler.Serializer;
 
-namespace Microsoft.AspNet.Authentication.DataHandler
+namespace Microsoft.AspNet.Authentication
 {
     public class PropertiesDataFormat : SecureDataFormat<AuthenticationProperties>
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/Serializer/PropertiesSerializer.cs b/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesSerializer.cs
similarity index 96%
rename from src/Microsoft.AspNet.Authentication/DataHandler/Serializer/PropertiesSerializer.cs
rename to src/Microsoft.AspNet.Authentication/DataHandler/PropertiesSerializer.cs
index 5120219ffa..d3957b7221 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/Serializer/PropertiesSerializer.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/PropertiesSerializer.cs
@@ -1,15 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Microsoft.AspNet.Http.Authentication;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Authentication.DataHandler.Serializer
+namespace Microsoft.AspNet.Authentication
 {
     public class PropertiesSerializer : IDataSerializer<AuthenticationProperties>
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/SecureDataFormat.cs b/src/Microsoft.AspNet.Authentication/DataHandler/SecureDataFormat.cs
index 6221e498ab..258bba52ea 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/SecureDataFormat.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/SecureDataFormat.cs
@@ -1,13 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNet.DataProtection;
-using Microsoft.AspNet.Authentication.DataHandler.Encoder;
-using Microsoft.AspNet.Authentication.DataHandler.Serializer;
 
-namespace Microsoft.AspNet.Authentication.DataHandler
+namespace Microsoft.AspNet.Authentication
 {
     public class SecureDataFormat<TData> : ISecureDataFormat<TData>
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/Encoder/TextEncodings.cs b/src/Microsoft.AspNet.Authentication/DataHandler/TextEncodings.cs
similarity index 90%
rename from src/Microsoft.AspNet.Authentication/DataHandler/Encoder/TextEncodings.cs
rename to src/Microsoft.AspNet.Authentication/DataHandler/TextEncodings.cs
index 5e6bbde93b..ddb11f5999 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/Encoder/TextEncodings.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/TextEncodings.cs
@@ -1,8 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
-namespace Microsoft.AspNet.Authentication.DataHandler.Encoder
+namespace Microsoft.AspNet.Authentication
 {
     public static class TextEncodings
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/TicketDataFormat.cs b/src/Microsoft.AspNet.Authentication/DataHandler/TicketDataFormat.cs
index 6dd719aecc..0f4dbd44fc 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/TicketDataFormat.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/TicketDataFormat.cs
@@ -2,10 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.DataProtection;
-using Microsoft.AspNet.Authentication.DataHandler.Encoder;
-using Microsoft.AspNet.Authentication.DataHandler.Serializer;
 
-namespace Microsoft.AspNet.Authentication.DataHandler
+namespace Microsoft.AspNet.Authentication
 {
     public class TicketDataFormat : SecureDataFormat<AuthenticationTicket>
     {
diff --git a/src/Microsoft.AspNet.Authentication/DataHandler/Serializer/TicketSerializer.cs b/src/Microsoft.AspNet.Authentication/DataHandler/TicketSerializer.cs
similarity index 98%
rename from src/Microsoft.AspNet.Authentication/DataHandler/Serializer/TicketSerializer.cs
rename to src/Microsoft.AspNet.Authentication/DataHandler/TicketSerializer.cs
index 01d232a9cc..310b2b03a8 100644
--- a/src/Microsoft.AspNet.Authentication/DataHandler/Serializer/TicketSerializer.cs
+++ b/src/Microsoft.AspNet.Authentication/DataHandler/TicketSerializer.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Security.Claims;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Authentication.DataHandler.Serializer
+namespace Microsoft.AspNet.Authentication
 {
     public class TicketSerializer : IDataSerializer<AuthenticationTicket>
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/AuthenticationFailedNotification.cs b/src/Microsoft.AspNet.Authentication/Notifications/AuthenticationFailedNotification.cs
index 4f912dc1cd..676072238d 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/AuthenticationFailedNotification.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/AuthenticationFailedNotification.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public class AuthenticationFailedNotification<TMessage, TOptions> : BaseNotification<TOptions>
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/BaseContext.cs b/src/Microsoft.AspNet.Authentication/Notifications/BaseContext.cs
index 4215020dca..0286871e98 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/BaseContext.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/BaseContext.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public abstract class BaseContext
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/BaseContext`1.cs b/src/Microsoft.AspNet.Authentication/Notifications/BaseContext`1.cs
index b124fa7178..24a8ef53d4 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/BaseContext`1.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/BaseContext`1.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     /// <summary>
     /// Base class used for certain event contexts
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/BaseNotification.cs b/src/Microsoft.AspNet.Authentication/Notifications/BaseNotification.cs
index 50b626d1ad..8cd7424244 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/BaseNotification.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/BaseNotification.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public class BaseNotification<TOptions> : BaseContext<TOptions>
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/EndpointContext.cs b/src/Microsoft.AspNet.Authentication/Notifications/EndpointContext.cs
index 096de20eef..e8b93e9e38 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/EndpointContext.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/EndpointContext.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public abstract class EndpointContext : BaseContext
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/EndpointContext`1.cs b/src/Microsoft.AspNet.Authentication/Notifications/EndpointContext`1.cs
index f7a9a1e97e..3f56a3a176 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/EndpointContext`1.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/EndpointContext`1.cs
@@ -4,7 +4,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     /// <summary>
     /// Base class used for certain event contexts
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/MessageReceivedNotification.cs b/src/Microsoft.AspNet.Authentication/Notifications/MessageReceivedNotification.cs
index 32df87bab8..dc64a7a504 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/MessageReceivedNotification.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/MessageReceivedNotification.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public class MessageReceivedNotification<TMessage, TOptions> : BaseNotification<TOptions>
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/NotificationResultState.cs b/src/Microsoft.AspNet.Authentication/Notifications/NotificationResultState.cs
index 7434ebd82b..76fb0a7622 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/NotificationResultState.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/NotificationResultState.cs
@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using System;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public enum NotificationResultState
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/RedirectFromIdentityProviderNotification.cs b/src/Microsoft.AspNet.Authentication/Notifications/RedirectFromIdentityProviderNotification.cs
index 970d9d718b..61387bc910 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/RedirectFromIdentityProviderNotification.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/RedirectFromIdentityProviderNotification.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public class RedirectFromIdentityProviderNotification<TMessage, TOptions> : BaseNotification<TOptions>
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/RedirectToIdentityProviderNotification.cs b/src/Microsoft.AspNet.Authentication/Notifications/RedirectToIdentityProviderNotification.cs
index d8b7dcac97..be8ac62b46 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/RedirectToIdentityProviderNotification.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/RedirectToIdentityProviderNotification.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.AspNet.Http;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     /// <summary>
     /// When a user configures the <see cref="AuthenticationMiddleware{TOptions}"/> to be notified prior to redirecting to an IdentityProvider
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/ReturnEndpointContext.cs b/src/Microsoft.AspNet.Authentication/Notifications/ReturnEndpointContext.cs
index ac4fa7b3c7..77c903f457 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/ReturnEndpointContext.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/ReturnEndpointContext.cs
@@ -1,13 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Authentication;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public abstract class ReturnEndpointContext : EndpointContext
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/SecurityTokenReceivedNotification.cs b/src/Microsoft.AspNet.Authentication/Notifications/SecurityTokenReceivedNotification.cs
index a0208b8b33..5e73c1cafe 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/SecurityTokenReceivedNotification.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/SecurityTokenReceivedNotification.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public class SecurityTokenReceivedNotification<TMessage, TOptions> : BaseNotification<TOptions>
     {
diff --git a/src/Microsoft.AspNet.Authentication/Notifications/SecurityTokenValidatedNotification.cs b/src/Microsoft.AspNet.Authentication/Notifications/SecurityTokenValidatedNotification.cs
index 82c641ca11..12f520d7e5 100644
--- a/src/Microsoft.AspNet.Authentication/Notifications/SecurityTokenValidatedNotification.cs
+++ b/src/Microsoft.AspNet.Authentication/Notifications/SecurityTokenValidatedNotification.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Authentication.Notifications
+namespace Microsoft.AspNet.Authentication
 {
     public class SecurityTokenValidatedNotification<TMessage, TOptions> : BaseNotification<TOptions>
     {
diff --git a/test/Microsoft.AspNet.Authentication.Test/DataHandler/Encoder/Base64UrlTextEncoderTests.cs b/test/Microsoft.AspNet.Authentication.Test/DataHandler/Base64UrlTextEncoderTests.cs
similarity index 93%
rename from test/Microsoft.AspNet.Authentication.Test/DataHandler/Encoder/Base64UrlTextEncoderTests.cs
rename to test/Microsoft.AspNet.Authentication.Test/DataHandler/Base64UrlTextEncoderTests.cs
index a345241d2c..0df9232b7c 100644
--- a/test/Microsoft.AspNet.Authentication.Test/DataHandler/Encoder/Base64UrlTextEncoderTests.cs
+++ b/test/Microsoft.AspNet.Authentication.Test/DataHandler/Base64UrlTextEncoderTests.cs
@@ -4,7 +4,7 @@
 using Shouldly;
 using Xunit;
 
-namespace Microsoft.AspNet.Authentication.DataHandler.Encoder
+namespace Microsoft.AspNet.Authentication
 {
     public class Base64UrlTextEncoderTests
     {
diff --git a/test/Microsoft.AspNet.Authentication.Test/DataHandler/Encoder/TicketSerializerTests.cs b/test/Microsoft.AspNet.Authentication.Test/DataHandler/TicketSerializerTests.cs
similarity index 93%
rename from test/Microsoft.AspNet.Authentication.Test/DataHandler/Encoder/TicketSerializerTests.cs
rename to test/Microsoft.AspNet.Authentication.Test/DataHandler/TicketSerializerTests.cs
index 2e9978d0bd..b1eaa07095 100644
--- a/test/Microsoft.AspNet.Authentication.Test/DataHandler/Encoder/TicketSerializerTests.cs
+++ b/test/Microsoft.AspNet.Authentication.Test/DataHandler/TicketSerializerTests.cs
@@ -5,12 +5,11 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Security.Claims;
-using Microsoft.AspNet.Authentication.DataHandler.Serializer;
 using Microsoft.AspNet.Http.Authentication;
 using Shouldly;
 using Xunit;
 
-namespace Microsoft.AspNet.Authentication.DataHandler.Encoder
+namespace Microsoft.AspNet.Authentication
 {
     public class TicketSerializerTests
     {
diff --git a/test/Microsoft.AspNet.Authentication.Test/Google/GoogleMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/Google/GoogleMiddlewareTests.cs
index e1b8edfec5..a37b0f716a 100644
--- a/test/Microsoft.AspNet.Authentication.Test/Google/GoogleMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Authentication.Test/Google/GoogleMiddlewareTests.cs
@@ -8,7 +8,6 @@ using System.Net.Http;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication.DataHandler;
 using Microsoft.AspNet.Authentication.OAuth;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.DataProtection;
diff --git a/test/Microsoft.AspNet.Authentication.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs
index 42799750c7..6ef50be516 100644
--- a/test/Microsoft.AspNet.Authentication.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Authentication.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs
@@ -6,7 +6,6 @@ using System.Net.Http;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication.DataHandler;
 using Microsoft.AspNet.Authentication.MicrosoftAccount;
 using Microsoft.AspNet.Authentication.OAuth;
 using Microsoft.AspNet.Builder;