diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs
index 39ed087eb..3e8e1850c 100644
--- a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs
+++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs
@@ -85,7 +85,7 @@ namespace Microsoft.Extensions.HealthChecks
             return new TypeOrHealthCheck_Type(name, cacheDuration, healthCheckType);
         }
 
-        class TypeOrHealthCheck_HealthCheck : CachedHealthCheck
+        private class TypeOrHealthCheck_HealthCheck : CachedHealthCheck
         {
             private readonly IHealthCheck _healthCheck;
 
@@ -95,7 +95,7 @@ namespace Microsoft.Extensions.HealthChecks
             protected override IHealthCheck Resolve(IServiceProvider serviceProvider) => _healthCheck;
         }
 
-        class TypeOrHealthCheck_Type : CachedHealthCheck
+        private class TypeOrHealthCheck_Type : CachedHealthCheck
         {
             private readonly Type _healthCheckType;
 
diff --git a/src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index dfe690f6f..a5a4a09d8 100644
--- a/src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Basket.API.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;
diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogBrandEntityTypeConfiguration.cs b/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogBrandEntityTypeConfiguration.cs
index 8312b023d..805bc6c6a 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogBrandEntityTypeConfiguration.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogBrandEntityTypeConfiguration.cs
@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure.EntityConfigurations
 {
-    class CatalogBrandEntityTypeConfiguration
+    internal class CatalogBrandEntityTypeConfiguration
         : IEntityTypeConfiguration<CatalogBrand>
     {
         public void Configure(EntityTypeBuilder<CatalogBrand> builder)
diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogItemEntityTypeConfiguration.cs b/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogItemEntityTypeConfiguration.cs
index f7f093ce8..ed44bf774 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogItemEntityTypeConfiguration.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogItemEntityTypeConfiguration.cs
@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure.EntityConfigurations
 {
-    class CatalogItemEntityTypeConfiguration
+    internal class CatalogItemEntityTypeConfiguration
         : IEntityTypeConfiguration<CatalogItem>
     {
         public void Configure(EntityTypeBuilder<CatalogItem> builder)
diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogTypeEntityTypeConfiguration.cs b/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogTypeEntityTypeConfiguration.cs
index 4c30bb3b6..c969429dd 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogTypeEntityTypeConfiguration.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogTypeEntityTypeConfiguration.cs
@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure.EntityConfigurations
 {
-    class CatalogTypeEntityTypeConfiguration
+    internal class CatalogTypeEntityTypeConfiguration
         : IEntityTypeConfiguration<CatalogType>
     {
         public void Configure(EntityTypeBuilder<CatalogType> builder)
diff --git a/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index ae21d10cc..1631991b2 100644
--- a/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;
diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/CampaignEntityTypeConfiguration.cs b/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/CampaignEntityTypeConfiguration.cs
index 833133dae..de6ee89c2 100644
--- a/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/CampaignEntityTypeConfiguration.cs
+++ b/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/CampaignEntityTypeConfiguration.cs
@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.EntityConfigurations
 {
-    class CampaignEntityTypeConfiguration
+    internal class CampaignEntityTypeConfiguration
         : IEntityTypeConfiguration<Campaign>
     {
         public void Configure(EntityTypeBuilder<Campaign> builder)
diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/RuleEntityTypeConfiguration.cs b/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/RuleEntityTypeConfiguration.cs
index 49c015014..f6eaaf717 100644
--- a/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/RuleEntityTypeConfiguration.cs
+++ b/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/RuleEntityTypeConfiguration.cs
@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.EntityConfigurations
 {
-    class RuleEntityTypeConfiguration
+    internal class RuleEntityTypeConfiguration
        : IEntityTypeConfiguration<Rule>
     {
         public void Configure(EntityTypeBuilder<Rule> builder)
diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/UserLocationRuleEntityTypeConfiguration.cs b/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/UserLocationRuleEntityTypeConfiguration.cs
index 84840d3a5..868bc649d 100644
--- a/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/UserLocationRuleEntityTypeConfiguration.cs
+++ b/src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/UserLocationRuleEntityTypeConfiguration.cs
@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.EntityConfigurations
 {
-    class UserLocationRuleEntityTypeConfiguration
+    internal class UserLocationRuleEntityTypeConfiguration
        : IEntityTypeConfiguration<UserLocationRule>
     {
         public void Configure(EntityTypeBuilder<UserLocationRule> builder)
diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index d89e15a7c..c768aad43 100644
--- a/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index 4c4207502..55146f415 100644
--- a/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Ordering.API.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;
diff --git a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTYpeConfiguration.cs b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTYpeConfiguration.cs
index 177f68d91..f7641bf0f 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTYpeConfiguration.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTYpeConfiguration.cs
@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class BuyerEntityTypeConfiguration
+    internal class BuyerEntityTypeConfiguration
         : IEntityTypeConfiguration<Buyer>
     {
         public void Configure(EntityTypeBuilder<Buyer> buyerConfiguration)
diff --git a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs
index cdac780a1..3838fa012 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs
@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class CardTypeEntityTypeConfiguration
+    internal class CardTypeEntityTypeConfiguration
         : IEntityTypeConfiguration<CardType>
     {
         public void Configure(EntityTypeBuilder<CardType> cardTypesConfiguration)
diff --git a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/ClientRequestEntityTypeConfiguration.cs b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/ClientRequestEntityTypeConfiguration.cs
index 5a5f8547e..c97b52c0d 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/ClientRequestEntityTypeConfiguration.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/ClientRequestEntityTypeConfiguration.cs
@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Idempotency;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class ClientRequestEntityTypeConfiguration
+    internal class ClientRequestEntityTypeConfiguration
         : IEntityTypeConfiguration<ClientRequest>
     {
         public void Configure(EntityTypeBuilder<ClientRequest> requestConfiguration)
diff --git a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderEntityTypeConfiguration.cs b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderEntityTypeConfiguration.cs
index d4eb1fb9a..fa4bd556d 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderEntityTypeConfiguration.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderEntityTypeConfiguration.cs
@@ -7,7 +7,8 @@ using System;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class OrderEntityTypeConfiguration : IEntityTypeConfiguration<Order>
+    internal class OrderEntityTypeConfiguration
+        : IEntityTypeConfiguration<Order>
     {
         public void Configure(EntityTypeBuilder<Order> orderConfiguration)
         {
diff --git a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderItemEntityTypeConfiguration.cs b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderItemEntityTypeConfiguration.cs
index ca16eddad..f472c0040 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderItemEntityTypeConfiguration.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderItemEntityTypeConfiguration.cs
@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class OrderItemEntityTypeConfiguration
+    internal class OrderItemEntityTypeConfiguration
         : IEntityTypeConfiguration<OrderItem>
     {
         public void Configure(EntityTypeBuilder<OrderItem> orderItemConfiguration)
diff --git a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderStatusEntityTypeConfiguration.cs b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderStatusEntityTypeConfiguration.cs
index f968d9011..0357b0f75 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderStatusEntityTypeConfiguration.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderStatusEntityTypeConfiguration.cs
@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class OrderStatusEntityTypeConfiguration
+    internal class OrderStatusEntityTypeConfiguration
         : IEntityTypeConfiguration<OrderStatus>
     {
         public void Configure(EntityTypeBuilder<OrderStatus> orderStatusConfiguration)
diff --git a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs
index 871c2057e..617749865 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs
@@ -6,7 +6,7 @@ using System;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class PaymentMethodEntityTypeConfiguration
+    internal class PaymentMethodEntityTypeConfiguration
         : IEntityTypeConfiguration<PaymentMethod>
     {
         public void Configure(EntityTypeBuilder<PaymentMethod> paymentConfiguration)
diff --git a/src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs b/src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs
index 82a7235a2..4a324c08e 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Ordering.Infrastructure
 {
-    static class MediatorExtension
+    internal static class MediatorExtension
     {
         public static async Task DispatchDomainEventsAsync(this IMediator mediator, OrderingContext ctx)
         {
diff --git a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
index a2cfb96a5..01889d3de 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
@@ -73,7 +73,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure
             return new OrderingContext(optionsBuilder.Options,new NoMediator());
         }
 
-        class NoMediator : IMediator
+        private class NoMediator : IMediator
         {
             public Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default(CancellationToken)) where TNotification : INotification
             {
diff --git a/src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs b/src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
index 72adaaa4d..c9bfb007a 100644
--- a/src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
+++ b/src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace WebMVC.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;
diff --git a/test/Services/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs b/test/Services/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
index 093ca4e97..ee093d48b 100644
--- a/test/Services/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
+++ b/test/Services/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace FunctionalTests.Middleware
 {
-    class AutoAuthorizeMiddleware
+    internal class AutoAuthorizeMiddleware
     {
         private readonly RequestDelegate _next;
         public AutoAuthorizeMiddleware(RequestDelegate rd)
diff --git a/test/Services/FunctionalTests/Services/Location/LocationsTestsStartup.cs b/test/Services/FunctionalTests/Services/Location/LocationsTestsStartup.cs
index fce808759..4baee0dba 100644
--- a/test/Services/FunctionalTests/Services/Location/LocationsTestsStartup.cs
+++ b/test/Services/FunctionalTests/Services/Location/LocationsTestsStartup.cs
@@ -26,7 +26,7 @@
             }
         }
 
-        class LocationAuthorizeMiddleware
+        private class LocationAuthorizeMiddleware
         {
             private readonly RequestDelegate _next;
 
diff --git a/test/Services/IntegrationTests/Middleware/AutoAuthorizeMiddleware.cs b/test/Services/IntegrationTests/Middleware/AutoAuthorizeMiddleware.cs
index 598e4d0dd..4d4aee644 100644
--- a/test/Services/IntegrationTests/Middleware/AutoAuthorizeMiddleware.cs
+++ b/test/Services/IntegrationTests/Middleware/AutoAuthorizeMiddleware.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace IntegrationTests.Middleware
 {
-    class AutoAuthorizeMiddleware
+    internal class AutoAuthorizeMiddleware
     {
         private readonly RequestDelegate _next;
         public AutoAuthorizeMiddleware(RequestDelegate rd)
diff --git a/test/Services/IntegrationTests/Services/Locations/LocationsTestsStartup.cs b/test/Services/IntegrationTests/Services/Locations/LocationsTestsStartup.cs
index bf19a1ca0..9efd19789 100644
--- a/test/Services/IntegrationTests/Services/Locations/LocationsTestsStartup.cs
+++ b/test/Services/IntegrationTests/Services/Locations/LocationsTestsStartup.cs
@@ -25,7 +25,7 @@
             }
         }
 
-        class LocationAuthorizeMiddleware
+        private class LocationAuthorizeMiddleware
         {
             private readonly RequestDelegate _next;
             public LocationAuthorizeMiddleware(RequestDelegate rd)