reorganised project so its a bit more vertical for features

src/Ocelot.Library/Authentication/Handler/AuthenticationHandler.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Authentication
+using Microsoft.AspNetCore.Http;
-{
-    using Microsoft.AspNetCore.Http;
 
+namespace Ocelot.Library.Authentication.Handler
+{
     public class AuthenticationHandler
     {
         public AuthenticationHandler(string provider, RequestDelegate handler)

src/Ocelot.Library/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs

@@ -1,9 +1,10 @@
-namespace Ocelot.Library.Authentication
-{
 using IdentityServer4.AccessTokenValidation;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-    using Responses;
+using Ocelot.Library.Responses;
+
+namespace Ocelot.Library.Authentication.Handler.Creator
+{
     using AuthenticationOptions = Configuration.AuthenticationOptions;
 
     /// <summary>

src/Ocelot.Library/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs

@@ -1,8 +1,9 @@
-namespace Ocelot.Library.Authentication
+using Microsoft.AspNetCore.Builder;
-{
-    using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-    using Responses;
+using Ocelot.Library.Responses;
+
+namespace Ocelot.Library.Authentication.Handler.Creator
+{
     using AuthenticationOptions = Configuration.AuthenticationOptions;
 
     public interface IAuthenticationHandlerCreator

src/Ocelot.Library/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs

@@ -1,9 +1,11 @@
-namespace Ocelot.Library.Authentication
-{
 using System.Collections.Generic;
-    using Errors;
 using Microsoft.AspNetCore.Builder;
-    using Responses;
+using Ocelot.Library.Authentication.Handler.Creator;
+using Ocelot.Library.Errors;
+using Ocelot.Library.Responses;
+
+namespace Ocelot.Library.Authentication.Handler.Factory
+{
     using AuthenticationOptions = Configuration.AuthenticationOptions;
 
     public class AuthenticationHandlerFactory : IAuthenticationHandlerFactory

src/Ocelot.Library/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs

@@ -1,7 +1,8 @@
-namespace Ocelot.Library.Authentication
+using Microsoft.AspNetCore.Builder;
+using Ocelot.Library.Responses;
+
+namespace Ocelot.Library.Authentication.Handler.Factory
 {
-    using Microsoft.AspNetCore.Builder;
-    using Responses;
     using AuthenticationOptions = Configuration.AuthenticationOptions;
 
     public interface IAuthenticationHandlerFactory

src/Ocelot.Library/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Authentication
+using Ocelot.Library.Errors;
-{
-    using Errors;
 
+namespace Ocelot.Library.Authentication.Handler.Factory
+{
     public class UnableToCreateAuthenticationHandlerError : Error
     {
         public UnableToCreateAuthenticationHandlerError(string message) 

src/Ocelot.Library/Authentication/Handler/SupportedAuthenticationProviders.cs

@@ -0,0 +1,7 @@
+namespace Ocelot.Library.Authentication.Handler
+{
+    public enum SupportedAuthenticationProviders
+    {
+        IdentityServer
+    }
+}

src/Ocelot.Library/Authentication/Middleware/AuthenticationMiddleware.cs

@@ -1,15 +1,16 @@
-namespace Ocelot.Library.Middleware
+using System.Collections.Generic;
-{
-    using System.Collections.Generic;
 using System.Threading.Tasks;
-    using Authentication;
-    using Configuration;
-    using DownstreamRouteFinder;
-    using Errors;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-    using Repository;
+using Ocelot.Library.Authentication.Handler.Factory;
+using Ocelot.Library.Configuration;
+using Ocelot.Library.DownstreamRouteFinder;
+using Ocelot.Library.Errors;
+using Ocelot.Library.Middleware;
+using Ocelot.Library.ScopedData;
 
+namespace Ocelot.Library.Authentication.Middleware
+{
     public class AuthenticationMiddleware : OcelotMiddleware
     {
         private readonly RequestDelegate _next;

src/Ocelot.Library/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Middleware
-{
 using Microsoft.AspNetCore.Builder;
 
+namespace Ocelot.Library.Authentication.Middleware
+{
     public static class AuthenticationMiddlewareMiddlewareExtensions
     {
         public static IApplicationBuilder UseAuthenticationMiddleware(this IApplicationBuilder builder)

src/Ocelot.Library/Authentication/SupportAuthenticationProviders.cs

@@ -1,7 +0,0 @@
-namespace Ocelot.Library.Authentication
-{
-    public enum SupportAuthenticationProviders
-    {
-        IdentityServer
-    }
-}

src/Ocelot.Library/Configuration/Creator/YamlOcelotConfigurationCreator.cs

@@ -2,13 +2,12 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Ocelot.Library.Configuration.Creator;
 using Ocelot.Library.Configuration.Parser;
-using Ocelot.Library.Configuration.Repository;
+using Ocelot.Library.Configuration.Validator;
-using Ocelot.Library.Errors;
+using Ocelot.Library.Configuration.Yaml;
 using Ocelot.Library.Responses;
 
-namespace Ocelot.Library.Configuration.Yaml
+namespace Ocelot.Library.Configuration.Creator
 {
     /// <summary>
     /// Register as singleton

src/Ocelot.Library/Configuration/Parser/InstructionNotForClaimsError.cs

@@ -1,6 +1,6 @@
 using Ocelot.Library.Errors;
 
-namespace Ocelot.Library.RequestBuilder
+namespace Ocelot.Library.Configuration.Parser
 {
     public class InstructionNotForClaimsError : Error
     {

src/Ocelot.Library/Configuration/Parser/NoInstructionsError.cs

@@ -1,6 +1,6 @@
 using Ocelot.Library.Errors;
 
-namespace Ocelot.Library.RequestBuilder
+namespace Ocelot.Library.Configuration.Parser
 {
     public class NoInstructionsError : Error
     {

src/Ocelot.Library/Configuration/Parser/ParsingConfigurationHeaderError.cs

@@ -1,7 +1,7 @@
 using System;
 using Ocelot.Library.Errors;
 
-namespace Ocelot.Library.RequestBuilder
+namespace Ocelot.Library.Configuration.Parser
 {
     public class ParsingConfigurationHeaderError : Error
     {

src/Ocelot.Library/Configuration/Provider/YamlOcelotConfigurationProvider.cs

@@ -1,9 +1,8 @@
 using Ocelot.Library.Configuration.Creator;
-using Ocelot.Library.Configuration.Provider;
 using Ocelot.Library.Configuration.Repository;
 using Ocelot.Library.Responses;
 
-namespace Ocelot.Library.Configuration.Yaml
+namespace Ocelot.Library.Configuration.Provider
 {
     /// <summary>
     /// Register as singleton

src/Ocelot.Library/Configuration/Validator/ConfigurationValidationResult.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.Configuration.Yaml
+using System.Collections.Generic;
-{
+using Ocelot.Library.Errors;
-    using System.Collections.Generic;
-    using Errors;
 
+namespace Ocelot.Library.Configuration.Validator
+{
     public class ConfigurationValidationResult
     {
         public ConfigurationValidationResult(bool isError)

src/Ocelot.Library/Configuration/Validator/ConfigurationValidator.cs

@@ -1,12 +1,14 @@
-namespace Ocelot.Library.Configuration.Yaml
+using System;
-{
-    using System;
 using System.Collections.Generic;
 using System.Linq;
-    using Authentication;
+using Ocelot.Library.Authentication;
-    using Errors;
+using Ocelot.Library.Authentication.Handler;
-    using Responses;
+using Ocelot.Library.Configuration.Yaml;
+using Ocelot.Library.Errors;
+using Ocelot.Library.Responses;
 
+namespace Ocelot.Library.Configuration.Validator
+{
     public class ConfigurationValidator : IConfigurationValidator
     {
         public Response<ConfigurationValidationResult> IsValid(YamlConfiguration configuration)
@@ -57,7 +59,7 @@
 
         private bool IsSupportedAuthenticationProvider(string provider)
         {
-            SupportAuthenticationProviders supportedProvider;
+            SupportedAuthenticationProviders supportedProvider;
 
             return Enum.TryParse(provider, true, out supportedProvider);
         }

src/Ocelot.Library/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Configuration.Yaml
+using Ocelot.Library.Errors;
-{
-    using Errors;
 
+namespace Ocelot.Library.Configuration.Validator
+{
     public class DownstreamTemplateAlreadyUsedError : Error
     {
         public DownstreamTemplateAlreadyUsedError(string message) : base(message, OcelotErrorCode.DownstreamTemplateAlreadyUsedError)

src/Ocelot.Library/Configuration/Validator/IConfigurationValidator.cs

@@ -1,7 +1,8 @@
-namespace Ocelot.Library.Configuration.Yaml
+using Ocelot.Library.Configuration.Yaml;
-{
+using Ocelot.Library.Responses;
-    using Responses;
 
+namespace Ocelot.Library.Configuration.Validator
+{
     public interface IConfigurationValidator
     {
         Response<ConfigurationValidationResult> IsValid(YamlConfiguration configuration);

src/Ocelot.Library/Configuration/Validator/UnsupportedAuthenticationProviderError.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Configuration.Yaml
+using Ocelot.Library.Errors;
-{
-    using Errors;
 
+namespace Ocelot.Library.Configuration.Validator
+{
     public class UnsupportedAuthenticationProviderError : Error
     {
         public UnsupportedAuthenticationProviderError(string message) 

src/Ocelot.Library/DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,7 +1,17 @@
-using Ocelot.Library.Configuration.Creator;
+using Ocelot.Library.Authentication.Handler.Creator;
+using Ocelot.Library.Authentication.Handler.Factory;
+using Ocelot.Library.Configuration.Creator;
 using Ocelot.Library.Configuration.Parser;
 using Ocelot.Library.Configuration.Provider;
 using Ocelot.Library.Configuration.Repository;
+using Ocelot.Library.Configuration.Validator;
+using Ocelot.Library.DownstreamRouteFinder.Finder;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer;
+using Ocelot.Library.HeaderBuilder;
+using Ocelot.Library.HeaderBuilder.Parser;
+using Ocelot.Library.RequestBuilder.Builder;
+using Ocelot.Library.ScopedData;
 
 namespace Ocelot.Library.DependencyInjection
 {
@@ -12,12 +22,9 @@ namespace Ocelot.Library.DependencyInjection
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
-    using Repository;
     using RequestBuilder;
     using Requester;
     using Responder;
-    using UrlMatcher;
-    using UrlTemplateReplacer;
 
     public static class ServiceCollectionExtensions
     {
@@ -48,7 +55,7 @@ namespace Ocelot.Library.DependencyInjection
             services.AddSingleton<IUrlPathToUrlTemplateMatcher, RegExUrlMatcher>();
             services.AddSingleton<ITemplateVariableNameAndValueFinder, TemplateVariableNameAndValueFinder>();
             services.AddSingleton<IDownstreamUrlTemplateVariableReplacer, DownstreamUrlTemplateVariableReplacer>();
-            services.AddSingleton<IDownstreamRouteFinder, DownstreamRouteFinder>();
+            services.AddSingleton<IDownstreamRouteFinder, DownstreamRouteFinder.Finder.DownstreamRouteFinder>();
             services.AddSingleton<IHttpRequester, HttpClientHttpRequester>();
             services.AddSingleton<IHttpResponder, HttpContextResponder>();
             services.AddSingleton<IRequestBuilder, HttpRequestBuilder>();

src/Ocelot.Library/DownstreamRouteFinder/DownstreamRoute.cs

@@ -1,8 +1,9 @@
-namespace Ocelot.Library.DownstreamRouteFinder
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+
+namespace Ocelot.Library.DownstreamRouteFinder
 {
     using System.Collections.Generic;
     using Configuration;
-    using UrlMatcher;
 
     public class DownstreamRoute
     {

src/Ocelot.Library/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Ocelot.Library.Configuration.Provider;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
 using Ocelot.Library.Errors;
 using Ocelot.Library.Responses;
-using Ocelot.Library.UrlMatcher;
 
-namespace Ocelot.Library.DownstreamRouteFinder
+namespace Ocelot.Library.DownstreamRouteFinder.Finder
 {
     public class DownstreamRouteFinder : IDownstreamRouteFinder
     {

src/Ocelot.Library/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.DownstreamRouteFinder
+using Ocelot.Library.Responses;
-{
-    using Responses;
 
+namespace Ocelot.Library.DownstreamRouteFinder.Finder
+{
     public interface IDownstreamRouteFinder
     {
         Response<DownstreamRoute> FindDownstreamRoute(string upstreamUrlPath, string upstreamHttpMethod);

src/Ocelot.Library/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.DownstreamRouteFinder
+using Ocelot.Library.Errors;
-{
-    using Errors;
 
+namespace Ocelot.Library.DownstreamRouteFinder.Finder
+{
     public class UnableToFindDownstreamRouteError : Error
     {
         public UnableToFindDownstreamRouteError() : base("UnableToFindDownstreamRouteError", OcelotErrorCode.UnableToFindDownstreamRouteError)

src/Ocelot.Library/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs

@@ -1,10 +1,11 @@
-namespace Ocelot.Library.Middleware
-{
 using System.Threading.Tasks;
-    using DownstreamRouteFinder;
 using Microsoft.AspNetCore.Http;
-    using Repository;
+using Ocelot.Library.DownstreamRouteFinder.Finder;
+using Ocelot.Library.Middleware;
+using Ocelot.Library.ScopedData;
 
+namespace Ocelot.Library.DownstreamRouteFinder.Middleware
+{
     public class DownstreamRouteFinderMiddleware : OcelotMiddleware
     {
         private readonly RequestDelegate _next;

src/Ocelot.Library/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Middleware
-{
 using Microsoft.AspNetCore.Builder;
 
+namespace Ocelot.Library.DownstreamRouteFinder.Middleware
+{
     public static class DownstreamRouteFinderMiddlewareExtensions
     {
         public static IApplicationBuilder UseDownstreamRouteFinderMiddleware(this IApplicationBuilder builder)

src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.UrlMatcher
+using System.Collections.Generic;
-{
+using Ocelot.Library.Responses;
-    using System.Collections.Generic;
-    using Responses;
 
+namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
+{
     public interface ITemplateVariableNameAndValueFinder
     {
         Response<List<TemplateVariableNameAndValue>> Find(string upstreamUrlPath, string upstreamUrlPathTemplate);

src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.UrlMatcher
+using Ocelot.Library.Responses;
-{
-    using Responses;
 
+namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
+{
     public interface IUrlPathToUrlTemplateMatcher
      {
         Response<UrlMatch> Match(string upstreamUrlPath, string upstreamUrlPathTemplate);

src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.UrlMatcher
+using System.Text.RegularExpressions;
-{
+using Ocelot.Library.Responses;
-    using System.Text.RegularExpressions;
-    using Responses;
 
+namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
+{
     public class RegExUrlMatcher : IUrlPathToUrlTemplateMatcher
     {
         public Response<UrlMatch> Match(string upstreamUrlPath, string upstreamUrlPathTemplate)

src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs

@@ -1,4 +1,4 @@
-namespace Ocelot.Library.UrlMatcher
+namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
 {
     public class TemplateVariableNameAndValue
     {

src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.UrlMatcher
-{
 using System.Collections.Generic;
-    using Responses;
+using Ocelot.Library.Responses;
 
+namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
+{
     public class TemplateVariableNameAndValueFinder : ITemplateVariableNameAndValueFinder
     {
         public Response<List<TemplateVariableNameAndValue>> Find(string upstreamUrlPath, string upstreamUrlPathTemplate)

src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs

@@ -1,4 +1,4 @@
-namespace Ocelot.Library.UrlMatcher
+namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
 {
     public class UrlMatch
     {

src/Ocelot.Library/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs

@@ -1,11 +1,12 @@
-namespace Ocelot.Library.Middleware
-{
 using System.Threading.Tasks;
-    using DownstreamRouteFinder;
 using Microsoft.AspNetCore.Http;
-    using Repository;
+using Ocelot.Library.DownstreamRouteFinder;
-    using UrlTemplateReplacer;
+using Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer;
+using Ocelot.Library.Middleware;
+using Ocelot.Library.ScopedData;
 
+namespace Ocelot.Library.DownstreamUrlCreator.Middleware
+{
     public class DownstreamUrlCreatorMiddleware : OcelotMiddleware
     {
         private readonly RequestDelegate _next;

src/Ocelot.Library/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Middleware
-{
 using Microsoft.AspNetCore.Builder;
 
+namespace Ocelot.Library.DownstreamUrlCreator.Middleware
+{
     public static class DownstreamUrlCreatorMiddlewareExtensions
     {
         public static IApplicationBuilder UseDownstreamUrlCreatorMiddleware(this IApplicationBuilder builder)

src/Ocelot.Library/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs

@@ -1,9 +1,9 @@
-namespace Ocelot.Library.UrlTemplateReplacer
-{
 using System.Text;
-    using DownstreamRouteFinder;
+using Ocelot.Library.DownstreamRouteFinder;
-    using Responses;
+using Ocelot.Library.Responses;
 
+namespace Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer
+{
     public class DownstreamUrlTemplateVariableReplacer : IDownstreamUrlTemplateVariableReplacer
     {
         public Response<string> ReplaceTemplateVariables(DownstreamRoute downstreamRoute)

src/Ocelot.Library/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.UrlTemplateReplacer
+using Ocelot.Library.DownstreamRouteFinder;
-{
+using Ocelot.Library.Responses;
-    using DownstreamRouteFinder;
-    using Responses;
 
+namespace Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer
+{
     public interface IDownstreamUrlTemplateVariableReplacer
     {
         Response<string> ReplaceTemplateVariables(DownstreamRoute downstreamRoute);   

src/Ocelot.Library/HeaderBuilder/AddHeadersToRequest.cs

@@ -3,9 +3,10 @@ using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 using Ocelot.Library.Configuration;
+using Ocelot.Library.HeaderBuilder.Parser;
 using Ocelot.Library.Responses;
 
-namespace Ocelot.Library.RequestBuilder
+namespace Ocelot.Library.HeaderBuilder
 {
     public class AddHeadersToRequest : IAddHeadersToRequest
     {

src/Ocelot.Library/HeaderBuilder/IAddHeadersToRequest.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http;
 using Ocelot.Library.Configuration;
 using Ocelot.Library.Responses;
 
-namespace Ocelot.Library.RequestBuilder
+namespace Ocelot.Library.HeaderBuilder
 {
     public interface IAddHeadersToRequest
     {

src/Ocelot.Library/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs

@@ -1,15 +1,12 @@
-using System.Collections.Generic;
+using System.Linq;
-using System.Linq;
-using Microsoft.Extensions.Primitives;
-using Ocelot.Library.DownstreamRouteFinder;
-using Ocelot.Library.RequestBuilder;
-
-namespace Ocelot.Library.Middleware
-{
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-    using Repository;
+using Ocelot.Library.DownstreamRouteFinder;
+using Ocelot.Library.Middleware;
+using Ocelot.Library.ScopedData;
 
+namespace Ocelot.Library.HeaderBuilder.Middleware
+{
     public class HttpRequestHeadersBuilderMiddleware : OcelotMiddleware
     {
         private readonly RequestDelegate _next;

src/Ocelot.Library/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Middleware
+using Microsoft.AspNetCore.Builder;
-{
-    using Microsoft.AspNetCore.Builder;
 
+namespace Ocelot.Library.HeaderBuilder.Middleware
+{
     public static class HttpRequestHeadersBuilderMiddlewareExtensions
     {
         public static IApplicationBuilder UseHttpRequestHeadersBuilderMiddleware(this IApplicationBuilder builder)

src/Ocelot.Library/HeaderBuilder/Parser/CannotFindClaimError.cs

@@ -1,6 +1,6 @@
 using Ocelot.Library.Errors;
 
-namespace Ocelot.Library.RequestBuilder
+namespace Ocelot.Library.HeaderBuilder.Parser
 {
     public class CannotFindClaimError : Error
     {

src/Ocelot.Library/HeaderBuilder/Parser/ClaimsParser.cs

@@ -4,7 +4,7 @@ using System.Security.Claims;
 using Ocelot.Library.Errors;
 using Ocelot.Library.Responses;
 
-namespace Ocelot.Library.RequestBuilder
+namespace Ocelot.Library.HeaderBuilder.Parser
 {
     public class ClaimsParser : IClaimsParser
     {

src/Ocelot.Library/HeaderBuilder/Parser/IClaimsParser.cs

@@ -2,7 +2,7 @@
 using System.Security.Claims;
 using Ocelot.Library.Responses;
 
-namespace Ocelot.Library.RequestBuilder
+namespace Ocelot.Library.HeaderBuilder.Parser
 {
     public interface IClaimsParser
     {

src/Ocelot.Library/Middleware/OcelotMiddleware.cs

@@ -1,8 +1,9 @@
-namespace Ocelot.Library.Middleware
+using Ocelot.Library.ScopedData;
+
+namespace Ocelot.Library.Middleware
 {
     using System.Collections.Generic;
     using Errors;
-    using Repository;
 
     public abstract class OcelotMiddleware
     {

src/Ocelot.Library/Middleware/OcelotMiddlewareExtensions.cs

@@ -1,4 +1,12 @@
-namespace Ocelot.Library.Middleware
+using Ocelot.Library.Authentication.Middleware;
+using Ocelot.Library.DownstreamRouteFinder.Middleware;
+using Ocelot.Library.DownstreamUrlCreator.Middleware;
+using Ocelot.Library.HeaderBuilder.Middleware;
+using Ocelot.Library.RequestBuilder.Middleware;
+using Ocelot.Library.Requester.Middleware;
+using Ocelot.Library.Responder.Middleware;
+
+namespace Ocelot.Library.Middleware
 {
     using Microsoft.AspNetCore.Builder;
 

src/Ocelot.Library/RequestBuilder/Builder/HttpRequestBuilder.cs

@@ -1,14 +1,14 @@
-namespace Ocelot.Library.RequestBuilder
+using System;
-{
-    using System;
 using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-    using Responses;
+using Ocelot.Library.Responses;
 
+namespace Ocelot.Library.RequestBuilder.Builder
+{
     public class HttpRequestBuilder : IRequestBuilder
     {
         public async Task<Response<Request>> Build(string httpMethod, string downstreamUrl, Stream content, IHeaderDictionary headers,

src/Ocelot.Library/RequestBuilder/Builder/IRequestBuilder.cs

@@ -1,10 +1,10 @@
-namespace Ocelot.Library.RequestBuilder
+using System.IO;
-{
-    using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-    using Responses;
+using Ocelot.Library.Responses;
 
+namespace Ocelot.Library.RequestBuilder.Builder
+{
     public interface IRequestBuilder
     {
         Task<Response<Request>> Build(string httpMethod,

src/Ocelot.Library/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs

@@ -1,10 +1,11 @@
-namespace Ocelot.Library.Middleware
-{
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-    using Repository;
+using Ocelot.Library.Middleware;
-    using RequestBuilder;
+using Ocelot.Library.RequestBuilder.Builder;
+using Ocelot.Library.ScopedData;
 
+namespace Ocelot.Library.RequestBuilder.Middleware
+{
     public class HttpRequestBuilderMiddleware : OcelotMiddleware
     {
         private readonly RequestDelegate _next;

src/Ocelot.Library/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Middleware
-{
 using Microsoft.AspNetCore.Builder;
 
+namespace Ocelot.Library.RequestBuilder.Middleware
+{
     public static class HttpRequestBuilderMiddlewareExtensions
     {
         public static IApplicationBuilder UseHttpRequestBuilderMiddleware(this IApplicationBuilder builder)

src/Ocelot.Library/Requester/Middleware/HttpRequesterMiddleware.cs

@@ -1,11 +1,11 @@
-namespace Ocelot.Library.Middleware
-{
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-    using Repository;
+using Ocelot.Library.Middleware;
-    using RequestBuilder;
+using Ocelot.Library.RequestBuilder;
-    using Requester;
+using Ocelot.Library.ScopedData;
 
+namespace Ocelot.Library.Requester.Middleware
+{
     public class HttpRequesterMiddleware : OcelotMiddleware
     {
         private readonly RequestDelegate _next;

src/Ocelot.Library/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Middleware
-{
 using Microsoft.AspNetCore.Builder;
 
+namespace Ocelot.Library.Requester.Middleware
+{
     public static class HttpRequesterMiddlewareExtensions
     {
         public static IApplicationBuilder UseHttpRequesterMiddleware(this IApplicationBuilder builder)

src/Ocelot.Library/Responder/Middleware/HttpResponderMiddleware.cs

@@ -1,11 +1,11 @@
-namespace Ocelot.Library.Middleware
-{
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-    using Repository;
+using Ocelot.Library.Middleware;
-    using Responder;
+using Ocelot.Library.ScopedData;
 
+namespace Ocelot.Library.Responder.Middleware
+{
     public class HttpResponderMiddleware : OcelotMiddleware
     {
         private readonly RequestDelegate _next;

src/Ocelot.Library/Responder/Middleware/HttpResponderMiddlewareExtensions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Middleware
-{
 using Microsoft.AspNetCore.Builder;
 
+namespace Ocelot.Library.Responder.Middleware
+{
     public static class HttpResponderMiddlewareExtensions
     {
         public static IApplicationBuilder UseHttpResponderMiddleware(this IApplicationBuilder builder)

src/Ocelot.Library/ScopedData/CannotAddDataError.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Repository
+using Ocelot.Library.Errors;
-{
-    using Errors;
 
+namespace Ocelot.Library.ScopedData
+{
     public class CannotAddDataError : Error
     {
         public CannotAddDataError(string message) : base(message, OcelotErrorCode.CannotAddDataError)

src/Ocelot.Library/ScopedData/CannotFindDataError.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Repository
+using Ocelot.Library.Errors;
-{
-    using Errors;
 
+namespace Ocelot.Library.ScopedData
+{
     public class CannotFindDataError : Error
     {
         public CannotFindDataError(string message) : base(message, OcelotErrorCode.CannotFindDataError)

src/Ocelot.Library/ScopedData/IScopedRequestDataRepository.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Repository
+using Ocelot.Library.Responses;
-{
-    using Responses;
 
+namespace Ocelot.Library.ScopedData
+{
     public interface IScopedRequestDataRepository
     {
         Response Add<T>(string key, T value);

src/Ocelot.Library/ScopedData/ScopedRequestDataRepository.cs

@@ -1,11 +1,11 @@
-namespace Ocelot.Library.Repository
+using System;
-{
-    using System;
 using System.Collections.Generic;
-    using Errors;
 using Microsoft.AspNetCore.Http;
-    using Responses;
+using Ocelot.Library.Errors;
+using Ocelot.Library.Responses;
 
+namespace Ocelot.Library.ScopedData
+{
     public class ScopedRequestDataRepository : IScopedRequestDataRepository
     {
         private readonly IHttpContextAccessor _httpContextAccessor;

test/Ocelot.UnitTests/Authentication/AuthenticationHandlerFactoryTests.cs

@@ -3,6 +3,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Moq;
+using Ocelot.Library.Authentication.Handler;
+using Ocelot.Library.Authentication.Handler.Creator;
+using Ocelot.Library.Authentication.Handler.Factory;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs

@@ -6,19 +6,18 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
+using Ocelot.Library.Authentication.Handler.Factory;
+using Ocelot.Library.Authentication.Middleware;
 using Ocelot.Library.Configuration.Builder;
+using Ocelot.Library.DownstreamRouteFinder;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Library.Responses;
+using Ocelot.Library.ScopedData;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.Middleware
+namespace Ocelot.UnitTests.Authentication
 {
-    using Library.Authentication;
-    using Library.DownstreamRouteFinder;
-    using Library.Middleware;
-    using Library.Repository;
-    using Library.Responses;
-    using Library.UrlMatcher;
-
     public class AuthenticationMiddlewareTests : IDisposable
     {
         private readonly Mock<IScopedRequestDataRepository> _scopedRepository;

test/Ocelot.UnitTests/Configuration/ConfigurationHeadersExtractorTests.cs

@@ -3,13 +3,12 @@ using System.Linq;
 using Ocelot.Library.Configuration;
 using Ocelot.Library.Configuration.Parser;
 using Ocelot.Library.Errors;
-using Ocelot.Library.RequestBuilder;
 using Ocelot.Library.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.RequestBuilder
+namespace Ocelot.UnitTests.Configuration
 {
     public class ConfigurationHeadersExtractorTests
     {

test/Ocelot.UnitTests/Configuration/ConfigurationValidationTests.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Ocelot.Library.Configuration.Validator;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.UnitTests/Configuration/YamlConfigurationCreatorTests.cs

@@ -3,8 +3,10 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
 using Ocelot.Library.Configuration.Builder;
+using Ocelot.Library.Configuration.Creator;
 using Ocelot.Library.Configuration.Parser;
 using Ocelot.Library.Configuration.Repository;
+using Ocelot.Library.Configuration.Validator;
 using Ocelot.Library.RequestBuilder;
 using Shouldly;
 using TestStack.BDDfy;

test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs

@@ -7,17 +7,17 @@ using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Ocelot.Library.Configuration.Builder;
+using Ocelot.Library.DownstreamRouteFinder;
+using Ocelot.Library.DownstreamRouteFinder.Finder;
+using Ocelot.Library.DownstreamRouteFinder.Middleware;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Library.Responses;
+using Ocelot.Library.ScopedData;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.Middleware
+namespace Ocelot.UnitTests.DownstreamRouteFinder
 {
-    using Library.DownstreamRouteFinder;
-    using Library.Middleware;
-    using Library.Repository;
-    using Library.Responses;
-    using Library.UrlMatcher;
-
     public class DownstreamRouteFinderMiddlewareTests : IDisposable
     {
         private readonly Mock<IDownstreamRouteFinder> _downstreamRouteFinder;

test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderTests.cs

@@ -2,6 +2,8 @@
 using Moq;
 using Ocelot.Library.Configuration.Builder;
 using Ocelot.Library.Configuration.Provider;
+using Ocelot.Library.DownstreamRouteFinder.Finder;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
@@ -11,7 +13,6 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
     using Library.Configuration;
     using Library.DownstreamRouteFinder;
     using Library.Responses;
-    using Library.UrlMatcher;
 
     public class DownstreamRouteFinderTests
     {
@@ -30,7 +31,7 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
             _mockConfig = new Mock<IOcelotConfigurationProvider>();
             _mockMatcher = new Mock<IUrlPathToUrlTemplateMatcher>();
             _finder = new Mock<ITemplateVariableNameAndValueFinder>();
-            _downstreamRouteFinder = new DownstreamRouteFinder(_mockConfig.Object, _mockMatcher.Object, _finder.Object);
+            _downstreamRouteFinder = new Library.DownstreamRouteFinder.Finder.DownstreamRouteFinder(_mockConfig.Object, _mockMatcher.Object, _finder.Object);
         }
 
         [Fact]

test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcherTests.cs

@@ -1,12 +1,11 @@
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Library.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.UrlMatcher
+namespace Ocelot.UnitTests.DownstreamRouteFinder.UrlMatcher
 {
-    using Library.Responses;
-    using Library.UrlMatcher;
-
     public class RegExUrlMatcherTests
     {
         private readonly IUrlPathToUrlTemplateMatcher _urlMatcher;

test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinderTests.cs

@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Library.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.UrlMatcher
+namespace Ocelot.UnitTests.DownstreamRouteFinder.UrlMatcher
 {
-    using Library.Responses;
-    using Library.UrlMatcher;
-
     public class UrlPathToUrlTemplateMatcherTests 
     {
         private readonly ITemplateVariableNameAndValueFinder _finder;

test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs

@@ -1,24 +1,23 @@
-using Ocelot.Library.Configuration.Builder;
+using System;
-
-namespace Ocelot.UnitTests.Middleware
-{
-    using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
-    using Library.DownstreamRouteFinder;
-    using Library.Middleware;
-    using Library.Repository;
-    using Library.Responses;
-    using Library.UrlMatcher;
-    using Library.UrlTemplateReplacer;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
+using Ocelot.Library.Configuration.Builder;
+using Ocelot.Library.DownstreamRouteFinder;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Library.DownstreamUrlCreator.Middleware;
+using Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer;
+using Ocelot.Library.Responses;
+using Ocelot.Library.ScopedData;
 using TestStack.BDDfy;
 using Xunit;
 
+namespace Ocelot.UnitTests.DownstreamUrlCreator
+{
     public class DownstreamUrlCreatorMiddlewareTests : IDisposable
     {
         private readonly Mock<IDownstreamUrlTemplateVariableReplacer> _downstreamUrlTemplateVariableReplacer;

test/Ocelot.UnitTests/DownstreamUrlCreator/UrlTemplateReplacer/UpstreamUrlPathTemplateVariableReplacerTests.cs

@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 using Ocelot.Library.Configuration.Builder;
+using Ocelot.Library.DownstreamRouteFinder;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer;
+using Ocelot.Library.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.UrlTemplateReplacer
+namespace Ocelot.UnitTests.DownstreamUrlCreator.UrlTemplateReplacer
 {
-    using Library.DownstreamRouteFinder;
-    using Library.Responses;
-    using Library.UrlMatcher;
-    using Library.UrlTemplateReplacer;
-
     public class UpstreamUrlPathTemplateVariableReplacerTests
     {
         private DownstreamRoute _downstreamRoute;

test/Ocelot.UnitTests/HeaderBuilder/AddHeadersToRequestTests.cs

@@ -6,13 +6,14 @@ using Microsoft.Extensions.Primitives;
 using Moq;
 using Ocelot.Library.Configuration;
 using Ocelot.Library.Errors;
-using Ocelot.Library.RequestBuilder;
+using Ocelot.Library.HeaderBuilder;
+using Ocelot.Library.HeaderBuilder.Parser;
 using Ocelot.Library.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.RequestBuilder
+namespace Ocelot.UnitTests.HeaderBuilder
 {
     public class AddHeadersToRequestTests
     {

test/Ocelot.UnitTests/HeaderBuilder/ClaimParserTests.cs

@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.Security.Claims;
 using Ocelot.Library.Errors;
-using Ocelot.Library.RequestBuilder;
+using Ocelot.Library.HeaderBuilder.Parser;
 using Ocelot.Library.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.RequestBuilder
+namespace Ocelot.UnitTests.HeaderBuilder
 {
     public class ClaimParserTests
     {
@@ -21,7 +21,7 @@ namespace Ocelot.UnitTests.RequestBuilder
         public ClaimParserTests()
         {
             _claims = new List<Claim>();
-            _claimsParser = new Library.RequestBuilder.ClaimsParser();
+            _claimsParser = new ClaimsParser();
         }
 
         [Fact]

test/Ocelot.UnitTests/HeaderBuilder/HttpRequestHeadersBuilderMiddlewareTests.cs

@@ -10,15 +10,15 @@ using Moq;
 using Ocelot.Library.Configuration;
 using Ocelot.Library.Configuration.Builder;
 using Ocelot.Library.DownstreamRouteFinder;
-using Ocelot.Library.Middleware;
+using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
-using Ocelot.Library.Repository;
+using Ocelot.Library.HeaderBuilder;
-using Ocelot.Library.RequestBuilder;
+using Ocelot.Library.HeaderBuilder.Middleware;
 using Ocelot.Library.Responses;
-using Ocelot.Library.UrlMatcher;
+using Ocelot.Library.ScopedData;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.Middleware
+namespace Ocelot.UnitTests.HeaderBuilder
 {
     public class HttpRequestHeadersBuilderMiddlewareTests : IDisposable
     {

test/Ocelot.UnitTests/Repository/ScopedRequestDataRepositoryTests.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Http;
+using Ocelot.Library.ScopedData;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
 namespace Ocelot.UnitTests.Repository
 {
-    using Library.Repository;
     using Library.Responses;
 
     public class ScopedRequestDataRepositoryTests

test/Ocelot.UnitTests/RequestBuilder/HttpRequestBuilderMiddlewareTests.cs

@@ -7,16 +7,16 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
+using Ocelot.Library.RequestBuilder;
+using Ocelot.Library.RequestBuilder.Builder;
+using Ocelot.Library.RequestBuilder.Middleware;
+using Ocelot.Library.Responses;
+using Ocelot.Library.ScopedData;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.Middleware
+namespace Ocelot.UnitTests.RequestBuilder
 {
-    using Library.Middleware;
-    using Library.Repository;
-    using Library.RequestBuilder;
-    using Library.Responses;
-
     public class HttpRequestBuilderMiddlewareTests : IDisposable
     {
         private readonly Mock<IRequestBuilder> _requestBuilder;

test/Ocelot.UnitTests/RequestBuilder/RequestBuilderTests.cs

@@ -5,6 +5,7 @@ using System.Net;
 using System.Net.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
+using Ocelot.Library.RequestBuilder.Builder;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs

@@ -6,17 +6,16 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
+using Ocelot.Library.RequestBuilder;
+using Ocelot.Library.Requester;
+using Ocelot.Library.Requester.Middleware;
+using Ocelot.Library.Responses;
+using Ocelot.Library.ScopedData;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.Middleware
+namespace Ocelot.UnitTests.Requester
 {
-    using Library.Middleware;
-    using Library.Repository;
-    using Library.RequestBuilder;
-    using Library.Requester;
-    using Library.Responses;
-
     public class HttpRequesterMiddlewareTests : IDisposable
     {
         private readonly Mock<IHttpRequester> _requester;

test/Ocelot.UnitTests/Responder/HttpResponderMiddlewareTests.cs

@@ -6,16 +6,15 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
+using Ocelot.Library.Responder;
+using Ocelot.Library.Responder.Middleware;
+using Ocelot.Library.Responses;
+using Ocelot.Library.ScopedData;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.Middleware
+namespace Ocelot.UnitTests.Responder
 {
-    using Library.Middleware;
-    using Library.Repository;
-    using Library.Responder;
-    using Library.Responses;
-
     public class HttpResponderMiddlewareTests : IDisposable
     {
         private readonly Mock<IHttpResponder> _responder;