diff --git a/src/Ocelot.Library/Infrastructure/Services/CannotAddDataError.cs b/src/Ocelot.Library/Infrastructure/Repository/CannotAddDataError.cs
similarity index 79%
rename from src/Ocelot.Library/Infrastructure/Services/CannotAddDataError.cs
rename to src/Ocelot.Library/Infrastructure/Repository/CannotAddDataError.cs
index 6a05b321..ea9d9b75 100644
--- a/src/Ocelot.Library/Infrastructure/Services/CannotAddDataError.cs
+++ b/src/Ocelot.Library/Infrastructure/Repository/CannotAddDataError.cs
@@ -1,6 +1,6 @@
 using Ocelot.Library.Infrastructure.Responses;
 
-namespace Ocelot.Library.Infrastructure.Services
+namespace Ocelot.Library.Infrastructure.Repository
 {
     public class CannotAddDataError : Error
     {
diff --git a/src/Ocelot.Library/Infrastructure/Services/CannotFindDataError.cs b/src/Ocelot.Library/Infrastructure/Repository/CannotFindDataError.cs
similarity index 79%
rename from src/Ocelot.Library/Infrastructure/Services/CannotFindDataError.cs
rename to src/Ocelot.Library/Infrastructure/Repository/CannotFindDataError.cs
index 660df5b3..41699f12 100644
--- a/src/Ocelot.Library/Infrastructure/Services/CannotFindDataError.cs
+++ b/src/Ocelot.Library/Infrastructure/Repository/CannotFindDataError.cs
@@ -1,6 +1,6 @@
 using Ocelot.Library.Infrastructure.Responses;
 
-namespace Ocelot.Library.Infrastructure.Services
+namespace Ocelot.Library.Infrastructure.Repository
 {
     public class CannotFindDataError : Error
     {
diff --git a/src/Ocelot.Library/Infrastructure/Services/IScopedRequestDataRepository.cs b/src/Ocelot.Library/Infrastructure/Repository/IScopedRequestDataRepository.cs
similarity index 79%
rename from src/Ocelot.Library/Infrastructure/Services/IScopedRequestDataRepository.cs
rename to src/Ocelot.Library/Infrastructure/Repository/IScopedRequestDataRepository.cs
index cb5e60a9..b88605d6 100644
--- a/src/Ocelot.Library/Infrastructure/Services/IScopedRequestDataRepository.cs
+++ b/src/Ocelot.Library/Infrastructure/Repository/IScopedRequestDataRepository.cs
@@ -1,6 +1,6 @@
 using Ocelot.Library.Infrastructure.Responses;
 
-namespace Ocelot.Library.Infrastructure.Services
+namespace Ocelot.Library.Infrastructure.Repository
 {
     public interface IScopedRequestDataRepository
     {
diff --git a/src/Ocelot.Library/Infrastructure/Services/ScopedRequestDataRepository.cs b/src/Ocelot.Library/Infrastructure/Repository/ScopedRequestDataRepository.cs
similarity index 96%
rename from src/Ocelot.Library/Infrastructure/Services/ScopedRequestDataRepository.cs
rename to src/Ocelot.Library/Infrastructure/Repository/ScopedRequestDataRepository.cs
index 71d94659..f49de35b 100644
--- a/src/Ocelot.Library/Infrastructure/Services/ScopedRequestDataRepository.cs
+++ b/src/Ocelot.Library/Infrastructure/Repository/ScopedRequestDataRepository.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 using Ocelot.Library.Infrastructure.Responses;
 
-namespace Ocelot.Library.Infrastructure.Services
+namespace Ocelot.Library.Infrastructure.Repository
 {
     public class ScopedRequestDataRepository : IScopedRequestDataRepository
     {
diff --git a/src/Ocelot.Library/Middleware/DownstreamRouteFinderMiddleware.cs b/src/Ocelot.Library/Middleware/DownstreamRouteFinderMiddleware.cs
index 28afbfe1..eff4b94e 100644
--- a/src/Ocelot.Library/Middleware/DownstreamRouteFinderMiddleware.cs
+++ b/src/Ocelot.Library/Middleware/DownstreamRouteFinderMiddleware.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Ocelot.Library.Infrastructure.DownstreamRouteFinder;
+using Ocelot.Library.Infrastructure.Repository;
 using Ocelot.Library.Infrastructure.Responder;
-using Ocelot.Library.Infrastructure.Services;
 
 namespace Ocelot.Library.Middleware
 {
diff --git a/src/Ocelot.Library/Middleware/DownstreamUrlCreatorMiddleware.cs b/src/Ocelot.Library/Middleware/DownstreamUrlCreatorMiddleware.cs
index d69ae887..ed0f330d 100644
--- a/src/Ocelot.Library/Middleware/DownstreamUrlCreatorMiddleware.cs
+++ b/src/Ocelot.Library/Middleware/DownstreamUrlCreatorMiddleware.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Ocelot.Library.Infrastructure.DownstreamRouteFinder;
+using Ocelot.Library.Infrastructure.Repository;
 using Ocelot.Library.Infrastructure.Responder;
-using Ocelot.Library.Infrastructure.Services;
 using Ocelot.Library.Infrastructure.UrlTemplateReplacer;
 
 namespace Ocelot.Library.Middleware
diff --git a/src/Ocelot.Library/Middleware/HttpRequesterMiddleware.cs b/src/Ocelot.Library/Middleware/HttpRequesterMiddleware.cs
index b154276f..bc767a22 100644
--- a/src/Ocelot.Library/Middleware/HttpRequesterMiddleware.cs
+++ b/src/Ocelot.Library/Middleware/HttpRequesterMiddleware.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Ocelot.Library.Infrastructure.Repository;
 using Ocelot.Library.Infrastructure.Requester;
 using Ocelot.Library.Infrastructure.Responder;
-using Ocelot.Library.Infrastructure.Services;
 
 namespace Ocelot.Library.Middleware
 {
diff --git a/src/Ocelot/Startup.cs b/src/Ocelot/Startup.cs
index 7645a3db..17f68c6c 100644
--- a/src/Ocelot/Startup.cs
+++ b/src/Ocelot/Startup.cs
@@ -5,9 +5,9 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Ocelot.Library.Infrastructure.DownstreamRouteFinder;
+using Ocelot.Library.Infrastructure.Repository;
 using Ocelot.Library.Infrastructure.Requester;
 using Ocelot.Library.Infrastructure.Responder;
-using Ocelot.Library.Infrastructure.Services;
 using Ocelot.Library.Middleware;
 
 namespace Ocelot
diff --git a/test/Ocelot.UnitTests/Services/ScopedRequestDataRepositoryTests.cs b/test/Ocelot.UnitTests/Repository/ScopedRequestDataRepositoryTests.cs
similarity index 96%
rename from test/Ocelot.UnitTests/Services/ScopedRequestDataRepositoryTests.cs
rename to test/Ocelot.UnitTests/Repository/ScopedRequestDataRepositoryTests.cs
index 4b07437e..3236521d 100644
--- a/test/Ocelot.UnitTests/Services/ScopedRequestDataRepositoryTests.cs
+++ b/test/Ocelot.UnitTests/Repository/ScopedRequestDataRepositoryTests.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Http;
+using Ocelot.Library.Infrastructure.Repository;
 using Ocelot.Library.Infrastructure.Responses;
-using Ocelot.Library.Infrastructure.Services;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;
 
-namespace Ocelot.UnitTests.Services
+namespace Ocelot.UnitTests.Repository
 {
     public class ScopedRequestDataRepositoryTests
     {