removed library namespace

src/Ocelot/Authentication/Handler/AuthenticationHandler.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 
-namespace Ocelot.Library.Authentication.Handler
+namespace Ocelot.Authentication.Handler
 {
     public class AuthenticationHandler
     {

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

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

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

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

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

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Builder;
-using Ocelot.Library.Authentication.Handler.Creator;
-using Ocelot.Library.Errors;
-using Ocelot.Library.Responses;
+using Ocelot.Authentication.Handler.Creator;
+using Ocelot.Errors;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Authentication.Handler.Factory
+namespace Ocelot.Authentication.Handler.Factory
 {
     using AuthenticationOptions = Configuration.AuthenticationOptions;
 

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

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

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

@@ -1,6 +1,6 @@
-using Ocelot.Library.Errors;
+using Ocelot.Errors;
 
-namespace Ocelot.Library.Authentication.Handler.Factory
+namespace Ocelot.Authentication.Handler.Factory
 {
     public class UnableToCreateAuthenticationHandlerError : Error
     {

src/Ocelot/Authentication/Handler/SupportedAuthenticationProviders.cs

@@ -1,4 +1,4 @@
-namespace Ocelot.Library.Authentication.Handler
+namespace Ocelot.Authentication.Handler
 {
     public enum SupportedAuthenticationProviders
     {

src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs

@@ -2,14 +2,14 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
-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;
+using Ocelot.Authentication.Handler.Factory;
+using Ocelot.Configuration;
+using Ocelot.DownstreamRouteFinder;
+using Ocelot.Errors;
+using Ocelot.Middleware;
+using Ocelot.ScopedData;
 
-namespace Ocelot.Library.Authentication.Middleware
+namespace Ocelot.Authentication.Middleware
 {
     public class AuthenticationMiddleware : OcelotMiddleware
     {

src/Ocelot/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace Ocelot.Library.Authentication.Middleware
+namespace Ocelot.Authentication.Middleware
 {
     public static class AuthenticationMiddlewareMiddlewareExtensions
     {

src/Ocelot/Configuration/AuthenticationOptions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Configuration
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
 
+namespace Ocelot.Configuration
+{
     public class AuthenticationOptions
     {
         public AuthenticationOptions(string provider, string providerRootUrl, string scopeName, bool requireHttps, List<string> additionalScopes, string scopeSecret)

src/Ocelot/Configuration/Builder/ReRouteBuilder.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Ocelot.Library.Configuration.Builder
+namespace Ocelot.Configuration.Builder
 {
     public class ReRouteBuilder
     {

src/Ocelot/Configuration/ClaimToHeader.cs

@@ -1,4 +1,4 @@
-namespace Ocelot.Library.Configuration
+namespace Ocelot.Configuration
 {
     public class ClaimToHeader
     {

src/Ocelot/Configuration/Creator/IOcelotConfigurationCreator.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Configuration.Creator
+namespace Ocelot.Configuration.Creator
 {
     public interface IOcelotConfigurationCreator
     {

src/Ocelot/Configuration/Creator/YamlOcelotConfigurationCreator.cs

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

src/Ocelot/Configuration/IOcelotConfiguration.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Configuration
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
 
+namespace Ocelot.Configuration
+{
     public interface IOcelotConfiguration
     {
         List<ReRoute> ReRoutes { get; }

src/Ocelot/Configuration/OcelotConfiguration.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Ocelot.Library.Configuration
+namespace Ocelot.Configuration
 {
     public class OcelotConfiguration : IOcelotConfiguration
     {

src/Ocelot/Configuration/Parser/ClaimToHeaderConfigurationParser.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using Ocelot.Library.Errors;
-using Ocelot.Library.RequestBuilder;
-using Ocelot.Library.Responses;
+using Ocelot.Errors;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Configuration.Parser
+namespace Ocelot.Configuration.Parser
 {
     public class ClaimToHeaderConfigurationParser : IClaimToHeaderConfigurationParser
     {

src/Ocelot/Configuration/Parser/IClaimToHeaderConfigurationParser.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Configuration.Parser
+namespace Ocelot.Configuration.Parser
 {
     public interface IClaimToHeaderConfigurationParser
     {

src/Ocelot/Configuration/Parser/InstructionNotForClaimsError.cs

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

src/Ocelot/Configuration/Parser/NoInstructionsError.cs

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

src/Ocelot/Configuration/Parser/ParsingConfigurationHeaderError.cs

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

src/Ocelot/Configuration/Provider/IOcelotConfigurationProvider.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Configuration.Provider
+namespace Ocelot.Configuration.Provider
 {
     public interface IOcelotConfigurationProvider
     {

src/Ocelot/Configuration/Provider/YamlOcelotConfigurationProvider.cs

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

src/Ocelot/Configuration/ReRoute.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Ocelot.Library.Configuration
+namespace Ocelot.Configuration
 {
     public class ReRoute
     {

src/Ocelot/Configuration/Repository/IOcelotConfigurationRepository.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Configuration.Repository
+namespace Ocelot.Configuration.Repository
 {
     public interface IOcelotConfigurationRepository
     {

src/Ocelot/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Configuration.Repository
+namespace Ocelot.Configuration.Repository
 {
     /// <summary>
     /// Register as singleton

src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Ocelot.Library.Errors;
+using Ocelot.Errors;
 
-namespace Ocelot.Library.Configuration.Validator
+namespace Ocelot.Configuration.Validator
 {
     public class ConfigurationValidationResult
     {

src/Ocelot/Configuration/Validator/ConfigurationValidator.cs

@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Ocelot.Library.Authentication;
-using Ocelot.Library.Authentication.Handler;
-using Ocelot.Library.Configuration.Yaml;
-using Ocelot.Library.Errors;
-using Ocelot.Library.Responses;
+using Ocelot.Authentication.Handler;
+using Ocelot.Configuration.Yaml;
+using Ocelot.Errors;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Configuration.Validator
+namespace Ocelot.Configuration.Validator
 {
     public class ConfigurationValidator : IConfigurationValidator
     {

src/Ocelot/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Errors;
+using Ocelot.Errors;
 
-namespace Ocelot.Library.Configuration.Validator
+namespace Ocelot.Configuration.Validator
 {
     public class DownstreamTemplateAlreadyUsedError : Error
     {

src/Ocelot/Configuration/Validator/IConfigurationValidator.cs

@@ -1,7 +1,7 @@
-using Ocelot.Library.Configuration.Yaml;
-using Ocelot.Library.Responses;
+using Ocelot.Configuration.Yaml;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.Configuration.Validator
+namespace Ocelot.Configuration.Validator
 {
     public interface IConfigurationValidator
     {

src/Ocelot/Configuration/Validator/UnsupportedAuthenticationProviderError.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Errors;
+using Ocelot.Errors;
 
-namespace Ocelot.Library.Configuration.Validator
+namespace Ocelot.Configuration.Validator
 {
     public class UnsupportedAuthenticationProviderError : Error
     {

src/Ocelot/Configuration/Yaml/YamlAuthenticationOptions.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Configuration.Yaml
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
 
+namespace Ocelot.Configuration.Yaml
+{
     public class YamlAuthenticationOptions
     {
         public string Provider { get; set; }

src/Ocelot/Configuration/Yaml/YamlConfiguration.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Configuration.Yaml
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
 
+namespace Ocelot.Configuration.Yaml
+{
     public class YamlConfiguration
     {
         public YamlConfiguration()

src/Ocelot/Configuration/Yaml/YamlReRoute.cs

@@ -1,7 +1,7 @@
-namespace Ocelot.Library.Configuration.Yaml
-{
-    using System.Collections.Generic;
+using System.Collections.Generic;
 
+namespace Ocelot.Configuration.Yaml
+{
     public class YamlReRoute
     {
         public YamlReRoute()

src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,31 +1,26 @@
-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;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Ocelot.Authentication.Handler.Creator;
+using Ocelot.Authentication.Handler.Factory;
+using Ocelot.Configuration.Creator;
+using Ocelot.Configuration.Parser;
+using Ocelot.Configuration.Provider;
+using Ocelot.Configuration.Repository;
+using Ocelot.Configuration.Validator;
+using Ocelot.Configuration.Yaml;
+using Ocelot.DownstreamRouteFinder.Finder;
+using Ocelot.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.DownstreamUrlCreator.UrlTemplateReplacer;
+using Ocelot.HeaderBuilder;
+using Ocelot.HeaderBuilder.Parser;
+using Ocelot.RequestBuilder.Builder;
+using Ocelot.Requester;
+using Ocelot.Responder;
+using Ocelot.ScopedData;
 
-namespace Ocelot.Library.DependencyInjection
+namespace Ocelot.DependencyInjection
 {
-    using Authentication;
-    using Configuration;
-    using Configuration.Yaml;
-    using DownstreamRouteFinder;
-    using Microsoft.AspNetCore.Http;
-    using Microsoft.Extensions.Configuration;
-    using Microsoft.Extensions.DependencyInjection;
-    using RequestBuilder;
-    using Requester;
-    using Responder;
-
     public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddOcelotYamlConfiguration(this IServiceCollection services, IConfigurationRoot configurationRoot)

src/Ocelot/DownstreamRouteFinder/DownstreamRoute.cs

@@ -1,10 +1,9 @@
-using Ocelot.Library.DownstreamRouteFinder.UrlMatcher;
+using System.Collections.Generic;
+using Ocelot.Configuration;
+using Ocelot.DownstreamRouteFinder.UrlMatcher;
 
-namespace Ocelot.Library.DownstreamRouteFinder
+namespace Ocelot.DownstreamRouteFinder
 {
-    using System.Collections.Generic;
-    using Configuration;
-
     public class DownstreamRoute
     {
         public DownstreamRoute(List<TemplateVariableNameAndValue> templateVariableNameAndValues, ReRoute reRoute)

src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs

@@ -1,12 +1,12 @@
 using System;
 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.Configuration.Provider;
+using Ocelot.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Errors;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.DownstreamRouteFinder.Finder
+namespace Ocelot.DownstreamRouteFinder.Finder
 {
     public class DownstreamRouteFinder : IDownstreamRouteFinder
     {

src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.DownstreamRouteFinder.Finder
+namespace Ocelot.DownstreamRouteFinder.Finder
 {
     public interface IDownstreamRouteFinder
     {

src/Ocelot/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Errors;
+using Ocelot.Errors;
 
-namespace Ocelot.Library.DownstreamRouteFinder.Finder
+namespace Ocelot.DownstreamRouteFinder.Finder
 {
     public class UnableToFindDownstreamRouteError : Error
     {

src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs

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

src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace Ocelot.Library.DownstreamRouteFinder.Middleware
+namespace Ocelot.DownstreamRouteFinder.Middleware
 {
     public static class DownstreamRouteFinderMiddlewareExtensions
     {

src/Ocelot/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
+namespace Ocelot.DownstreamRouteFinder.UrlMatcher
 {
     public interface ITemplateVariableNameAndValueFinder
     {

src/Ocelot/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
+namespace Ocelot.DownstreamRouteFinder.UrlMatcher
 {
     public interface IUrlPathToUrlTemplateMatcher
      {

src/Ocelot/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs

@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
+namespace Ocelot.DownstreamRouteFinder.UrlMatcher
 {
     public class RegExUrlMatcher : IUrlPathToUrlTemplateMatcher
     {

src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs

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

src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.DownstreamRouteFinder.UrlMatcher
+namespace Ocelot.DownstreamRouteFinder.UrlMatcher
 {
     public class TemplateVariableNameAndValueFinder : ITemplateVariableNameAndValueFinder
     {

src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs

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

src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs

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

src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace Ocelot.Library.DownstreamUrlCreator.Middleware
+namespace Ocelot.DownstreamUrlCreator.Middleware
 {
     public static class DownstreamUrlCreatorMiddlewareExtensions
     {

src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs

@@ -1,8 +1,8 @@
 using System.Text;
-using Ocelot.Library.DownstreamRouteFinder;
-using Ocelot.Library.Responses;
+using Ocelot.DownstreamRouteFinder;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer
+namespace Ocelot.DownstreamUrlCreator.UrlTemplateReplacer
 {
     public class DownstreamUrlTemplateVariableReplacer : IDownstreamUrlTemplateVariableReplacer
     {

src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs

@@ -1,7 +1,7 @@
-using Ocelot.Library.DownstreamRouteFinder;
-using Ocelot.Library.Responses;
+using Ocelot.DownstreamRouteFinder;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.DownstreamUrlCreator.UrlTemplateReplacer
+namespace Ocelot.DownstreamUrlCreator.UrlTemplateReplacer
 {
     public interface IDownstreamUrlTemplateVariableReplacer
     {

src/Ocelot/Errors/Error.cs

@@ -1,4 +1,4 @@
-namespace Ocelot.Library.Errors
+namespace Ocelot.Errors
 {
     public abstract class Error 
     {

src/Ocelot/Errors/OcelotErrorCode.cs

@@ -1,4 +1,4 @@
-namespace Ocelot.Library.Errors
+namespace Ocelot.Errors
 {
     public enum OcelotErrorCode
     {

src/Ocelot/HeaderBuilder/AddHeadersToRequest.cs

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

src/Ocelot/HeaderBuilder/IAddHeadersToRequest.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
-using Ocelot.Library.Configuration;
-using Ocelot.Library.Responses;
+using Ocelot.Configuration;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.HeaderBuilder
+namespace Ocelot.HeaderBuilder
 {
     public interface IAddHeadersToRequest
     {

src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs

@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Ocelot.Library.DownstreamRouteFinder;
-using Ocelot.Library.Middleware;
-using Ocelot.Library.ScopedData;
+using Ocelot.DownstreamRouteFinder;
+using Ocelot.Middleware;
+using Ocelot.ScopedData;
 
-namespace Ocelot.Library.HeaderBuilder.Middleware
+namespace Ocelot.HeaderBuilder.Middleware
 {
     public class HttpRequestHeadersBuilderMiddleware : OcelotMiddleware
     {

src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace Ocelot.Library.HeaderBuilder.Middleware
+namespace Ocelot.HeaderBuilder.Middleware
 {
     public static class HttpRequestHeadersBuilderMiddlewareExtensions
     {

src/Ocelot/HeaderBuilder/Parser/CannotFindClaimError.cs

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

src/Ocelot/HeaderBuilder/Parser/ClaimsParser.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using Ocelot.Library.Errors;
-using Ocelot.Library.Responses;
+using Ocelot.Errors;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.HeaderBuilder.Parser
+namespace Ocelot.HeaderBuilder.Parser
 {
     public class ClaimsParser : IClaimsParser
     {

src/Ocelot/HeaderBuilder/Parser/IClaimsParser.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Security.Claims;
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.HeaderBuilder.Parser
+namespace Ocelot.HeaderBuilder.Parser
 {
     public interface IClaimsParser
     {

src/Ocelot/Middleware/OcelotMiddleware.cs

@@ -1,10 +1,9 @@
-using Ocelot.Library.ScopedData;
+using System.Collections.Generic;
+using Ocelot.Errors;
+using Ocelot.ScopedData;
 
-namespace Ocelot.Library.Middleware
+namespace Ocelot.Middleware
 {
-    using System.Collections.Generic;
-    using Errors;
-
     public abstract class OcelotMiddleware
     {
         private readonly IScopedRequestDataRepository _scopedRequestDataRepository;

src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs

@@ -1,15 +1,14 @@
-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;
+using Microsoft.AspNetCore.Builder;
+using Ocelot.Authentication.Middleware;
+using Ocelot.DownstreamRouteFinder.Middleware;
+using Ocelot.DownstreamUrlCreator.Middleware;
+using Ocelot.HeaderBuilder.Middleware;
+using Ocelot.RequestBuilder.Middleware;
+using Ocelot.Requester.Middleware;
+using Ocelot.Responder.Middleware;
 
-namespace Ocelot.Library.Middleware
+namespace Ocelot.Middleware
 {
-    using Microsoft.AspNetCore.Builder;
-
     public static class OcelotMiddlewareExtensions
     {
         public static IApplicationBuilder UseOcelot(this IApplicationBuilder builder)

src/Ocelot/Middleware/UnauthenticatedError.cs

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

src/Ocelot/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 // associated with an assembly.
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Ocelot.Library")]
+[assembly: AssemblyProduct("Ocelot")]
 [assembly: AssemblyTrademark("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible

src/Ocelot/RequestBuilder/Builder/HttpRequestBuilder.cs

@@ -5,9 +5,9 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.RequestBuilder.Builder
+namespace Ocelot.RequestBuilder.Builder
 {
     public class HttpRequestBuilder : IRequestBuilder
     {

src/Ocelot/RequestBuilder/Builder/IRequestBuilder.cs

@@ -1,9 +1,9 @@
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.RequestBuilder.Builder
+namespace Ocelot.RequestBuilder.Builder
 {
     public interface IRequestBuilder
     {

src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs

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

src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace Ocelot.Library.RequestBuilder.Middleware
+namespace Ocelot.RequestBuilder.Middleware
 {
     public static class HttpRequestBuilderMiddlewareExtensions
     {

src/Ocelot/RequestBuilder/Request.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.RequestBuilder
-{
-    using System.Net;
-    using System.Net.Http;
+using System.Net;
+using System.Net.Http;
 
+namespace Ocelot.RequestBuilder
+{
     public class Request
     {
         public Request(HttpRequestMessage httpRequestMessage, CookieContainer cookieContainer)

src/Ocelot/Requester/HttpClientHttpRequester.cs

@@ -1,13 +1,13 @@
-namespace Ocelot.Library.Requester
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Net.Http;
-    using System.Threading.Tasks;
-    using Errors;
-    using RequestBuilder;
-    using Responses;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Ocelot.Errors;
+using Ocelot.RequestBuilder;
+using Ocelot.Responses;
 
+namespace Ocelot.Requester
+{
     public class HttpClientHttpRequester : IHttpRequester
     {
         public async Task<Response<HttpResponseMessage>> GetResponse(Request request)

src/Ocelot/Requester/IHttpRequester.cs

@@ -1,10 +1,10 @@
-namespace Ocelot.Library.Requester
-{
-    using System.Net.Http;
-    using System.Threading.Tasks;
-    using RequestBuilder;
-    using Responses;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Ocelot.RequestBuilder;
+using Ocelot.Responses;
 
+namespace Ocelot.Requester
+{
     public interface IHttpRequester
     {
         Task<Response<HttpResponseMessage>> GetResponse(Request request);

src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs

@@ -1,10 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Ocelot.Library.Middleware;
-using Ocelot.Library.RequestBuilder;
-using Ocelot.Library.ScopedData;
+using Ocelot.Middleware;
+using Ocelot.RequestBuilder;
+using Ocelot.ScopedData;
 
-namespace Ocelot.Library.Requester.Middleware
+namespace Ocelot.Requester.Middleware
 {
     public class HttpRequesterMiddleware : OcelotMiddleware
     {

src/Ocelot/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace Ocelot.Library.Requester.Middleware
+namespace Ocelot.Requester.Middleware
 {
     public static class HttpRequesterMiddlewareExtensions
     {

src/Ocelot/Requester/UnableToCompleteRequestError.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.Requester
-{
-    using System;
-    using Errors;
+using System;
+using Ocelot.Errors;
 
+namespace Ocelot.Requester
+{
     public class UnableToCompleteRequestError : Error
     {
         public UnableToCompleteRequestError(Exception exception) 

src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs

@@ -1,10 +1,10 @@
-namespace Ocelot.Library.Responder
-{
-    using System.Collections.Generic;
-    using System.Linq;
-    using Errors;
-    using Responses;
+using System.Collections.Generic;
+using System.Linq;
+using Ocelot.Errors;
+using Ocelot.Responses;
 
+namespace Ocelot.Responder
+{
     public class ErrorsToHttpStatusCodeMapper : IErrorsToHttpStatusCodeMapper
     {
         public Response<int> Map(List<Error> errors)

src/Ocelot/Responder/HttpContextResponder.cs

@@ -1,9 +1,9 @@
-namespace Ocelot.Library.Responder
-{
-    using System.Net.Http;
-    using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Http;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 
+namespace Ocelot.Responder
+{
     /// <summary>
     /// Cannot unit test things in this class due to methods not being implemented
     /// on .net concretes used for testing

src/Ocelot/Responder/IErrorsToHttpStatusCodeMapper.cs

@@ -1,9 +1,9 @@
-namespace Ocelot.Library.Responder
-{
-    using System.Collections.Generic;
-    using Errors;
-    using Responses;
+using System.Collections.Generic;
+using Ocelot.Errors;
+using Ocelot.Responses;
 
+namespace Ocelot.Responder
+{
     public interface IErrorsToHttpStatusCodeMapper
     {
         Response<int> Map(List<Error> errors);

src/Ocelot/Responder/IHttpResponder.cs

@@ -1,9 +1,9 @@
-namespace Ocelot.Library.Responder
-{
-    using System.Net.Http;
-    using System.Threading.Tasks;
-    using Microsoft.AspNetCore.Http;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 
+namespace Ocelot.Responder
+{
     public interface IHttpResponder
     {
         Task<HttpContext> CreateResponse(HttpContext context, HttpResponseMessage response);

src/Ocelot/Responder/Middleware/HttpResponderMiddleware.cs

@@ -1,10 +1,10 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Ocelot.Library.Middleware;
-using Ocelot.Library.ScopedData;
+using Ocelot.Middleware;
+using Ocelot.ScopedData;
 
-namespace Ocelot.Library.Responder.Middleware
+namespace Ocelot.Responder.Middleware
 {
     public class HttpResponderMiddleware : OcelotMiddleware
     {

src/Ocelot/Responder/Middleware/HttpResponderMiddlewareExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace Ocelot.Library.Responder.Middleware
+namespace Ocelot.Responder.Middleware
 {
     public static class HttpResponderMiddlewareExtensions
     {

src/Ocelot/Responses/ErrorResponse.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.Responses
-{
-    using System.Collections.Generic;
-    using Errors;
+using System.Collections.Generic;
+using Ocelot.Errors;
 
+namespace Ocelot.Responses
+{
     public class ErrorResponse : Response
     {
         public ErrorResponse(List<Error> errors) : base(errors)

src/Ocelot/Responses/ErrorResponseGeneric.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.Responses
-{
-    using System.Collections.Generic;
-    using Errors;
+using System.Collections.Generic;
+using Ocelot.Errors;
 
+namespace Ocelot.Responses
+{
     public class ErrorResponse<T> : Response<T>
     {
         public ErrorResponse(List<Error> errors) : base(errors)

src/Ocelot/Responses/OkResponse.cs

@@ -1,4 +1,4 @@
-namespace Ocelot.Library.Responses
+namespace Ocelot.Responses
 {
     public class OkResponse : Response
     {

src/Ocelot/Responses/OkResponseGeneric.cs

@@ -1,4 +1,4 @@
-namespace Ocelot.Library.Responses
+namespace Ocelot.Responses
 {
     public class OkResponse<T> : Response<T>
     {

src/Ocelot/Responses/Response.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.Responses
-{
-    using System.Collections.Generic;
-    using Errors;
+using System.Collections.Generic;
+using Ocelot.Errors;
 
+namespace Ocelot.Responses
+{
     public abstract class Response
     {
         protected Response()

src/Ocelot/Responses/ResponseGeneric.cs

@@ -1,8 +1,8 @@
-namespace Ocelot.Library.Responses
-{
-    using System.Collections.Generic;
-    using Errors;
+using System.Collections.Generic;
+using Ocelot.Errors;
 
+namespace Ocelot.Responses
+{
     public abstract class Response<T> : Response
     {
         protected Response(T data)

src/Ocelot/ScopedData/CannotAddDataError.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Errors;
+using Ocelot.Errors;
 
-namespace Ocelot.Library.ScopedData
+namespace Ocelot.ScopedData
 {
     public class CannotAddDataError : Error
     {

src/Ocelot/ScopedData/CannotFindDataError.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Errors;
+using Ocelot.Errors;
 
-namespace Ocelot.Library.ScopedData
+namespace Ocelot.ScopedData
 {
     public class CannotFindDataError : Error
     {

src/Ocelot/ScopedData/IScopedRequestDataRepository.cs

@@ -1,6 +1,6 @@
-using Ocelot.Library.Responses;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.ScopedData
+namespace Ocelot.ScopedData
 {
     public interface IScopedRequestDataRepository
     {

src/Ocelot/ScopedData/ScopedRequestDataRepository.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
-using Ocelot.Library.Errors;
-using Ocelot.Library.Responses;
+using Ocelot.Errors;
+using Ocelot.Responses;
 
-namespace Ocelot.Library.ScopedData
+namespace Ocelot.ScopedData
 {
     public class ScopedRequestDataRepository : IScopedRequestDataRepository
     {

test/Ocelot.AcceptanceTests/AuthenticationTests.cs

@@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
+using Ocelot.Configuration.Yaml;
 using Ocelot.ManualTest;
 using Shouldly;
 using TestStack.BDDfy;
@@ -22,7 +23,6 @@ using YamlDotNet.Serialization;
 namespace Ocelot.AcceptanceTests
 {
     using System.Security.Claims;
-    using Library.Configuration.Yaml;
 
     public class AuthenticationTests : IDisposable
     {

test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs

@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
-using Ocelot.Library.Configuration.Yaml;
+using Ocelot.Configuration.Yaml;
 using Ocelot.ManualTest;
 using Shouldly;
 using TestStack.BDDfy;

test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs

@@ -6,7 +6,7 @@ using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
-using Ocelot.Library.Configuration.Yaml;
+using Ocelot.Configuration.Yaml;
 using Ocelot.ManualTest;
 using Shouldly;
 using TestStack.BDDfy;

test/Ocelot.AcceptanceTests/RoutingTests.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
+using Ocelot.Configuration.Yaml;
 using Ocelot.ManualTest;
 using Shouldly;
 using TestStack.BDDfy;
@@ -15,8 +16,6 @@ using YamlDotNet.Serialization;
 
 namespace Ocelot.AcceptanceTests
 {
-    using Library.Configuration.Yaml;
-
     public class RoutingTests : IDisposable
     {
         private TestServer _server;

test/Ocelot.ManualTest/Startup.cs

@@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Ocelot.Library.DependencyInjection;
-using Ocelot.Library.Middleware;
+using Ocelot.DependencyInjection;
+using Ocelot.Middleware;
 
 namespace Ocelot.ManualTest
 {

test/Ocelot.UnitTests/Authentication/AuthenticationHandlerFactoryTests.cs

@@ -3,20 +3,18 @@ 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 Ocelot.Authentication.Handler;
+using Ocelot.Authentication.Handler.Creator;
+using Ocelot.Authentication.Handler.Factory;
+using Ocelot.Errors;
+using Ocelot.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
+using AuthenticationOptions = Ocelot.Configuration.AuthenticationOptions;
 
 namespace Ocelot.UnitTests.Authentication
 {
-    using Library.Authentication;
-    using Library.Configuration;
-    using Library.Errors;
-    using Library.Responses;
-
     public class AuthenticationHandlerFactoryTests
     {
         private readonly IAuthenticationHandlerFactory _authenticationHandlerFactory;

test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs

@@ -6,13 +6,13 @@ 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 Ocelot.Authentication.Handler.Factory;
+using Ocelot.Authentication.Middleware;
+using Ocelot.Configuration.Builder;
+using Ocelot.DownstreamRouteFinder;
+using Ocelot.DownstreamRouteFinder.UrlMatcher;
+using Ocelot.Responses;
+using Ocelot.ScopedData;
 using TestStack.BDDfy;
 using Xunit;
 

test/Ocelot.UnitTests/Configuration/ConfigurationHeadersExtractorTests.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using Ocelot.Library.Configuration;
-using Ocelot.Library.Configuration.Parser;
-using Ocelot.Library.Errors;
-using Ocelot.Library.Responses;
+using Ocelot.Configuration;
+using Ocelot.Configuration.Parser;
+using Ocelot.Errors;
+using Ocelot.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.UnitTests/Configuration/ConfigurationValidationTests.cs

@@ -1,14 +1,13 @@
 using System.Collections.Generic;
-using Ocelot.Library.Configuration.Validator;
+using Ocelot.Configuration.Validator;
+using Ocelot.Configuration.Yaml;
+using Ocelot.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
 namespace Ocelot.UnitTests.Configuration
 {
-    using Library.Configuration.Yaml;
-    using Library.Responses;
-
     public class ConfigurationValidationTests
     {
         private YamlConfiguration _yamlConfiguration;

test/Ocelot.UnitTests/Configuration/InMemoryConfigurationRepositoryTests.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Ocelot.Library.Configuration;
-using Ocelot.Library.Configuration.Builder;
-using Ocelot.Library.Configuration.Repository;
-using Ocelot.Library.Responses;
+using Ocelot.Configuration;
+using Ocelot.Configuration.Builder;
+using Ocelot.Configuration.Repository;
+using Ocelot.Responses;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;