API review: nuke notification namespaces

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

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

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
     {

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;

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

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

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.

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
 {

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
 {

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
 {

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
 {

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
 {

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

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

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
 {

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
 {

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;

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
 {

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
 {

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
 {

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;

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;

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
 {

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. />

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;

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.

src/Microsoft.AspNet.Authentication.OpenIdConnect/Notifications/AuthorizationCodeRedeemedNotification.cs

@@ -1,9 +1,7 @@
-using System;
+using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.OpenIdConnect;
-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.

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

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;

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;

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.

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.

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.

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
-
-namespace Microsoft.AspNet.Authentication.Twitter.Messages
 {
     /// <summary>
     /// Provides access to a request token serializer.

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
 {

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
 {

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
 {

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;

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;

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
 {

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
     {

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
     {

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
     {

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
-namespace Microsoft.AspNet.Authentication.DataHandler.Serializer
 {
     public interface IDataSerializer<TModel>
     {

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>

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
-namespace Microsoft.AspNet.Authentication.DataHandler.Encoder
 {
     public interface ITextEncoder
     {

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>
     {

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>
     {

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>
     {

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
-namespace Microsoft.AspNet.Authentication.DataHandler.Encoder
 {
     public static class TextEncodings
     {

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>
     {

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>
     {

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>
     {

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
     {

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

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>
     {

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
     {

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

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>
     {

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
     {

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>
     {

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

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
     {

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>
     {

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>
     {

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
     {

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
     {

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;

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;