diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryContext.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryContext.cs
similarity index 86%
rename from src/Microsoft.AspNetCore.Antiforgery/AntiforgeryContext.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryContext.cs
index 3615fc25b1..f1abeefe92 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryContext.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryContext.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.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     /// <summary>
     /// Used as a per request state.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptionsSetup.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryOptionsSetup.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptionsSetup.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryOptionsSetup.cs
index c397845599..f1f7dc612a 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptionsSetup.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryOptionsSetup.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class AntiforgeryOptionsSetup : ConfigureOptions<AntiforgeryOptions>
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgerySerializationContext.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgerySerializationContext.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Antiforgery/AntiforgerySerializationContext.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgerySerializationContext.cs
index 969df3428e..27f7fa3725 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgerySerializationContext.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgerySerializationContext.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class AntiforgerySerializationContext
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryToken.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryToken.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Antiforgery/AntiforgeryToken.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryToken.cs
index bf9ba5e9bf..78294f730c 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryToken.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/AntiforgeryToken.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.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public sealed class AntiforgeryToken
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/BinaryBlob.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/BinaryBlob.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Antiforgery/BinaryBlob.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/BinaryBlob.cs
index 140317ef27..88c34571c0 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/BinaryBlob.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/BinaryBlob.cs
@@ -8,7 +8,7 @@ using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     // Represents a binary blob (token) that contains random data.
     // Useful for binary data inside a serialized stream.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgery.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgery.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgery.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgery.cs
index e0cbe2ada6..6d52cfa4da 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgery.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgery.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     /// <summary>
     /// Provides access to the antiforgery system, which provides protection against
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryAdditionalDataProvider.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryAdditionalDataProvider.cs
similarity index 94%
rename from src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryAdditionalDataProvider.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryAdditionalDataProvider.cs
index e0797d2696..ad28453495 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryAdditionalDataProvider.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryAdditionalDataProvider.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     /// <summary>
     /// A default <see cref="IAntiforgeryAdditionalDataProvider"/> implementation.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryContextAccessor.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryContextAccessor.cs
similarity index 85%
rename from src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryContextAccessor.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryContextAccessor.cs
index 7dd27634e6..ab2df64fa1 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryContextAccessor.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryContextAccessor.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.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultAntiforgeryContextAccessor : IAntiforgeryContextAccessor
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenGenerator.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenGenerator.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenGenerator.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenGenerator.cs
index 36c01beff7..390a39cab8 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenGenerator.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenGenerator.cs
@@ -6,7 +6,7 @@ using System.Security.Claims;
 using System.Security.Principal;
 using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultAntiforgeryTokenGenerator : IAntiforgeryTokenGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenSerializer.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenSerializer.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenSerializer.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenSerializer.cs
index c606c1cc9d..216f79ae09 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenSerializer.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenSerializer.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.ObjectPool;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultAntiforgeryTokenSerializer : IAntiforgeryTokenSerializer
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenStore.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenStore.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenStore.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenStore.cs
index 72b6eee169..52d852a27c 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenStore.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultAntiforgeryTokenStore.cs
@@ -9,7 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultAntiforgeryTokenStore : IAntiforgeryTokenStore
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultClaimUidExtractor.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultClaimUidExtractor.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Antiforgery/DefaultClaimUidExtractor.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultClaimUidExtractor.cs
index 66ddf13743..7f089073bc 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultClaimUidExtractor.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/DefaultClaimUidExtractor.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Security.Claims;
 using Microsoft.Extensions.ObjectPool;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     /// <summary>
     /// Default implementation of <see cref="IClaimUidExtractor"/>.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryContextAccessor.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryContextAccessor.cs
similarity index 84%
rename from src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryContextAccessor.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryContextAccessor.cs
index 7b0146dbd9..238f2a082e 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryContextAccessor.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryContextAccessor.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.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public interface IAntiforgeryContextAccessor
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenGenerator.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenGenerator.cs
similarity index 97%
rename from src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenGenerator.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenGenerator.cs
index e615d8c933..c0dff86047 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenGenerator.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenGenerator.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     /// <summary>
     /// Generates and validates antiforgery tokens.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenSerializer.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenSerializer.cs
similarity index 88%
rename from src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenSerializer.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenSerializer.cs
index badc897309..134516e8c9 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenSerializer.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenSerializer.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.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     // Abstracts out the serialization process for an antiforgery token
     public interface IAntiforgeryTokenSerializer
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenStore.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenStore.cs
similarity index 94%
rename from src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenStore.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenStore.cs
index 9d14ac79b3..bff9360ff9 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenStore.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/IAntiforgeryTokenStore.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     // Provides an abstraction around how tokens are persisted and retrieved for a request
     public interface IAntiforgeryTokenStore
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IClaimUidExtractor.cs b/src/Microsoft.AspNetCore.Antiforgery/Internal/IClaimUidExtractor.cs
similarity index 92%
rename from src/Microsoft.AspNetCore.Antiforgery/IClaimUidExtractor.cs
rename to src/Microsoft.AspNetCore.Antiforgery/Internal/IClaimUidExtractor.cs
index b78cbc863a..d4a888dec5 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IClaimUidExtractor.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Internal/IClaimUidExtractor.cs
@@ -3,7 +3,7 @@
 
 using System.Security.Claims;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     /// <summary>
     /// This interface can extract unique identifers for a claims-based identity.
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryOptionsSetupTest.cs
similarity index 97%
rename from test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs
rename to test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryOptionsSetupTest.cs
index 7822afb4d3..a981339793 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryOptionsSetupTest.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class AntiforgeryOptionsSetupTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryTokenTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryTokenTest.cs
similarity index 98%
rename from test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryTokenTest.cs
rename to test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryTokenTest.cs
index 1980043b8b..9cafd306b0 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryTokenTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/AntiforgeryTokenTest.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class AntiforgeryTokenTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/BinaryBlobTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/BinaryBlobTest.cs
similarity index 98%
rename from test/Microsoft.AspNetCore.Antiforgery.Test/BinaryBlobTest.cs
rename to test/Microsoft.AspNetCore.Antiforgery.Test/Internal/BinaryBlobTest.cs
index c49a055724..2ab5b12fc1 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/BinaryBlobTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/BinaryBlobTest.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class BinaryBlobTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTest.cs
rename to test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTest.cs
index dedcac76ee..19f14fc6af 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTest.cs
@@ -13,7 +13,7 @@ using Microsoft.Extensions.WebEncoders.Testing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultAntiforgeryTest
     {
@@ -186,7 +186,7 @@ namespace Microsoft.AspNetCore.Antiforgery
             var antiforgery = GetAntiforgery(context);
             var encoder = new HtmlTestEncoder();
 
-            // Setup so that the null cookie token returned is treated as invalid.		
+            // Setup so that the null cookie token returned is treated as invalid.
             context.TokenGenerator
                 .Setup(o => o.IsCookieTokenValid(null))
                 .Returns(false);
@@ -226,7 +226,7 @@ namespace Microsoft.AspNetCore.Antiforgery
                 .Setup(o => o.GetCookieToken(context.HttpContext))
                 .Throws(new Exception("should be swallowed"));
 
-            // Setup so that the null cookie token returned is treated as invalid.		
+            // Setup so that the null cookie token returned is treated as invalid.
             context.TokenGenerator
                 .Setup(o => o.IsCookieTokenValid(null))
                 .Returns(false);
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenGeneratorTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenGeneratorTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenGeneratorTest.cs
rename to test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenGeneratorTest.cs
index f277504d0b..0e4a2a3d02 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenGeneratorTest.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Testing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultAntiforgeryTokenGeneratorProviderTest
     {
@@ -190,7 +190,7 @@ namespace Microsoft.AspNetCore.Antiforgery
                         .Returns("my-username");
 
             httpContext.User = new ClaimsPrincipal(mockIdentity.Object);
-            
+
             var claimUidExtractor = new Mock<IClaimUidExtractor>().Object;
 
             var tokenProvider = new DefaultAntiforgeryTokenGenerator(
@@ -325,7 +325,7 @@ namespace Microsoft.AspNetCore.Antiforgery
                 claimUidExtractor: null,
                 additionalDataProvider: null);
 
-            string expectedMessage = 
+            string expectedMessage =
                 "Validation of the provided antiforgery token failed. " +
                 "The cookie token and the request token were swapped.";
 
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenSerializerTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenSerializerTest.cs
similarity index 98%
rename from test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenSerializerTest.cs
rename to test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenSerializerTest.cs
index 97193e59e6..80280de4f3 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenSerializerTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenSerializerTest.cs
@@ -4,13 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Antiforgery.Internal;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.ObjectPool;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultAntiforgeryTokenSerializerTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs
rename to test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs
index e1c566c77d..599e851871 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Antiforgery.Internal;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
@@ -14,7 +13,7 @@ using Microsoft.Extensions.Primitives;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultAntiforgeryTokenStoreTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultClaimUidExtractorTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs
similarity index 97%
rename from test/Microsoft.AspNetCore.Antiforgery.Test/DefaultClaimUidExtractorTest.cs
rename to test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs
index ebb28adbf6..2968358be2 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultClaimUidExtractorTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultClaimUidExtractorTest.cs
@@ -4,12 +4,11 @@
 using System;
 using System.Linq;
 using System.Security.Claims;
-using Microsoft.AspNetCore.Antiforgery.Internal;
 using Microsoft.Extensions.ObjectPool;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery.Internal
 {
     public class DefaultClaimUidExtractorTest
     {