diff --git a/src/Microsoft.AspNetCore.Cors/CorsConstants.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsConstants.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/CorsConstants.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/CorsConstants.cs
diff --git a/src/Microsoft.AspNetCore.Cors/CorsMiddleware.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/CorsMiddleware.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/CorsMiddleware.cs
diff --git a/src/Microsoft.AspNetCore.Cors/CorsMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsMiddlewareExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/CorsMiddlewareExtensions.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/CorsMiddlewareExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Cors/CorsOptions.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/CorsOptions.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/CorsOptions.cs
diff --git a/src/Microsoft.AspNetCore.Cors/CorsPolicy.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/CorsPolicy.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicy.cs
diff --git a/src/Microsoft.AspNetCore.Cors/CorsPolicyBuilder.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicyBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/CorsPolicyBuilder.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/CorsPolicyBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Cors/CorsResult.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/CorsResult.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/CorsResult.cs
diff --git a/src/Microsoft.AspNetCore.Cors/CorsService.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/CorsService.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/CorsService.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/CorsService.cs
diff --git a/src/Microsoft.AspNetCore.Cors/DefaultCorsPolicyProvider.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/DefaultCorsPolicyProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/DefaultCorsPolicyProvider.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/DefaultCorsPolicyProvider.cs
diff --git a/src/Microsoft.AspNetCore.Cors/ICorsPolicyProvider.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/ICorsPolicyProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/ICorsPolicyProvider.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/ICorsPolicyProvider.cs
diff --git a/src/Microsoft.AspNetCore.Cors/ICorsService.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/ICorsService.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/ICorsService.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/ICorsService.cs
diff --git a/src/Microsoft.AspNetCore.Cors/IDisableCorsAttribute.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/IDisableCorsAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/IDisableCorsAttribute.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/IDisableCorsAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Cors/IEnableCorsAttribute.cs b/src/Microsoft.AspNetCore.Cors/Infrastructure/IEnableCorsAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Cors/IEnableCorsAttribute.cs
rename to src/Microsoft.AspNetCore.Cors/Infrastructure/IEnableCorsAttribute.cs