diff --git a/EShopOnAbp.sln b/EShopOnAbp.sln
index 3cdee83d..7c9f39d2 100644
--- a/EShopOnAbp.sln
+++ b/EShopOnAbp.sln
@@ -35,12 +35,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.PublicWeb", "app
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.CatalogService.HttpApi.Host", "services\catalog\src\EShopOnAbp.CatalogService.HttpApi.Host\EShopOnAbp.CatalogService.HttpApi.Host.csproj", "{3381E059-A2B5-4660-AFDA-5063DEE64154}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.HttpApi.Host", "services\basket\src\EShopOnAbp.BasketService.HttpApi.Host\EShopOnAbp.BasketService.HttpApi.Host.csproj", "{6AD19BC3-9B40-49AC-AD24-1769C57C60F1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.OrderingService.HttpApi.Host", "services\ordering\src\EShopOnAbp.OrderingService.HttpApi.Host\EShopOnAbp.OrderingService.HttpApi.Host.csproj", "{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.PaymentService.HttpApi.Host", "services\payment\src\EShopOnAbp.PaymentService.HttpApi.Host\EShopOnAbp.PaymentService.HttpApi.Host.csproj", "{7AE4C613-780E-4DA5-9B57-76F0D40D5146}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.BasketService", "services\basket\src\EShopOnAbp.BasketService\EShopOnAbp.BasketService.csproj", "{E373DD66-3247-4D95-B325-064BBBC337B1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -95,10 +95,6 @@ Global
 		{3381E059-A2B5-4660-AFDA-5063DEE64154}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3381E059-A2B5-4660-AFDA-5063DEE64154}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3381E059-A2B5-4660-AFDA-5063DEE64154}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AD19BC3-9B40-49AC-AD24-1769C57C60F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AD19BC3-9B40-49AC-AD24-1769C57C60F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AD19BC3-9B40-49AC-AD24-1769C57C60F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AD19BC3-9B40-49AC-AD24-1769C57C60F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -107,6 +103,10 @@ Global
 		{7AE4C613-780E-4DA5-9B57-76F0D40D5146}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AE4C613-780E-4DA5-9B57-76F0D40D5146}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AE4C613-780E-4DA5-9B57-76F0D40D5146}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E373DD66-3247-4D95-B325-064BBBC337B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E373DD66-3247-4D95-B325-064BBBC337B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E373DD66-3247-4D95-B325-064BBBC337B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E373DD66-3247-4D95-B325-064BBBC337B1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -124,9 +124,9 @@ Global
 		{2E0B715C-3AAD-47B3-B2EB-D34CB24CBEFA} = {1484E912-DCF3-4568-A72C-4C7622104DB8}
 		{969029FC-CFCF-4F95-9778-E5C69117711E} = {866DB6CC-FEA8-4CC2-A2E4-143537D197B6}
 		{3381E059-A2B5-4660-AFDA-5063DEE64154} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
-		{6AD19BC3-9B40-49AC-AD24-1769C57C60F1} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
 		{CE23F65B-BCDD-40D5-8AB5-80D9F52D3FA1} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
 		{7AE4C613-780E-4DA5-9B57-76F0D40D5146} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
+		{E373DD66-3247-4D95-B325-064BBBC337B1} = {F415FFFD-E52D-4EBE-98DC-067C1EFFFFE3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {26F82565-C6A4-439D-93A4-3251E3E7D5B0}
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/BasketProductEventHandler.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/BasketProductEventHandler.cs
index d670d30b..e8a673d1 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/BasketProductEventHandler.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/BasketProductEventHandler.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using EShopOnAbp.BasketService;
+using EShopOnAbp.BasketService.Services;
 using Microsoft.AspNetCore.SignalR;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Distributed;
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.Generated.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/BasketClientProxy.Generated.cs
similarity index 93%
rename from services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.Generated.cs
rename to apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/BasketClientProxy.Generated.cs
index 5bb60e34..868ef629 100644
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.Generated.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/BasketClientProxy.Generated.cs
@@ -6,10 +6,10 @@ using Volo.Abp.Http.Client;
 using Volo.Abp.Http.Modeling;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client.ClientProxying;
-using EShopOnAbp.BasketService;
+using EShopOnAbp.BasketService.Services;
 
 // ReSharper disable once CheckNamespace
-namespace EShopOnAbp.BasketService.ClientProxies;
+namespace EShopOnAbp.BasketService.Services.ClientProxies;
 
 [Dependency(ReplaceServices = true)]
 [ExposeServices(typeof(IBasketAppService), typeof(BasketClientProxy))]
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/BasketClientProxy.cs
similarity index 72%
rename from services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.cs
rename to apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/BasketClientProxy.cs
index 222238f4..eceec230 100644
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/BasketClientProxy.cs
@@ -1,6 +1,6 @@
 // This file is part of BasketClientProxy, you can customize it here
 // ReSharper disable once CheckNamespace
-namespace EShopOnAbp.BasketService.ClientProxies;
+namespace EShopOnAbp.BasketService.Services.ClientProxies;
 
 public partial class BasketClientProxy
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json b/apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/basket-generate-proxy.json
similarity index 75%
rename from services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json
rename to apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/basket-generate-proxy.json
index 901caad0..1f8a157d 100644
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/ClientProxies/basket-generate-proxy.json
@@ -4,10 +4,10 @@
       "rootPath": "basket",
       "remoteServiceName": "Basket",
       "controllers": {
-        "EShopOnAbp.BasketService.BasketAppService": {
+        "EShopOnAbp.BasketService.Services.BasketAppService": {
           "controllerName": "Basket",
           "controllerGroupName": "Basket",
-          "type": "EShopOnAbp.BasketService.BasketAppService",
+          "type": "EShopOnAbp.BasketService.Services.BasketAppService",
           "interfaces": [
             {
               "type": "Volo.Abp.Validation.IValidationEnabled"
@@ -19,7 +19,7 @@
               "type": "Volo.Abp.GlobalFeatures.IGlobalFeatureCheckingEnabled"
             },
             {
-              "type": "EShopOnAbp.BasketService.IBasketAppService"
+              "type": "EShopOnAbp.BasketService.Services.IBasketAppService"
             }
           ],
           "actions": {
@@ -54,11 +54,11 @@
                 }
               ],
               "returnValue": {
-                "type": "EShopOnAbp.BasketService.BasketDto",
-                "typeSimple": "EShopOnAbp.BasketService.BasketDto"
+                "type": "EShopOnAbp.BasketService.Services.BasketDto",
+                "typeSimple": "EShopOnAbp.BasketService.Services.BasketDto"
               },
               "allowAnonymous": null,
-              "implementFrom": "EShopOnAbp.BasketService.IBasketAppService"
+              "implementFrom": "EShopOnAbp.BasketService.Services.IBasketAppService"
             },
             "AddProductAsyncByInput": {
               "uniqueName": "AddProductAsyncByInput",
@@ -69,9 +69,9 @@
               "parametersOnMethod": [
                 {
                   "name": "input",
-                  "typeAsString": "EShopOnAbp.BasketService.AddProductDto, EShopOnAbp.BasketService.Application.Contracts",
-                  "type": "EShopOnAbp.BasketService.AddProductDto",
-                  "typeSimple": "EShopOnAbp.BasketService.AddProductDto",
+                  "typeAsString": "EShopOnAbp.BasketService.Services.AddProductDto, EShopOnAbp.BasketService.Contracts",
+                  "type": "EShopOnAbp.BasketService.Services.AddProductDto",
+                  "typeSimple": "EShopOnAbp.BasketService.Services.AddProductDto",
                   "isOptional": false,
                   "defaultValue": null
                 }
@@ -81,8 +81,8 @@
                   "nameOnMethod": "input",
                   "name": "input",
                   "jsonName": null,
-                  "type": "EShopOnAbp.BasketService.AddProductDto",
-                  "typeSimple": "EShopOnAbp.BasketService.AddProductDto",
+                  "type": "EShopOnAbp.BasketService.Services.AddProductDto",
+                  "typeSimple": "EShopOnAbp.BasketService.Services.AddProductDto",
                   "isOptional": false,
                   "defaultValue": null,
                   "constraintTypes": null,
@@ -91,11 +91,11 @@
                 }
               ],
               "returnValue": {
-                "type": "EShopOnAbp.BasketService.BasketDto",
-                "typeSimple": "EShopOnAbp.BasketService.BasketDto"
+                "type": "EShopOnAbp.BasketService.Services.BasketDto",
+                "typeSimple": "EShopOnAbp.BasketService.Services.BasketDto"
               },
               "allowAnonymous": null,
-              "implementFrom": "EShopOnAbp.BasketService.IBasketAppService"
+              "implementFrom": "EShopOnAbp.BasketService.Services.IBasketAppService"
             },
             "RemoveProductAsyncByInput": {
               "uniqueName": "RemoveProductAsyncByInput",
@@ -106,9 +106,9 @@
               "parametersOnMethod": [
                 {
                   "name": "input",
-                  "typeAsString": "EShopOnAbp.BasketService.RemoveProductDto, EShopOnAbp.BasketService.Application.Contracts",
-                  "type": "EShopOnAbp.BasketService.RemoveProductDto",
-                  "typeSimple": "EShopOnAbp.BasketService.RemoveProductDto",
+                  "typeAsString": "EShopOnAbp.BasketService.Services.RemoveProductDto, EShopOnAbp.BasketService.Contracts",
+                  "type": "EShopOnAbp.BasketService.Services.RemoveProductDto",
+                  "typeSimple": "EShopOnAbp.BasketService.Services.RemoveProductDto",
                   "isOptional": false,
                   "defaultValue": null
                 }
@@ -152,11 +152,11 @@
                 }
               ],
               "returnValue": {
-                "type": "EShopOnAbp.BasketService.BasketDto",
-                "typeSimple": "EShopOnAbp.BasketService.BasketDto"
+                "type": "EShopOnAbp.BasketService.Services.BasketDto",
+                "typeSimple": "EShopOnAbp.BasketService.Services.BasketDto"
               },
               "allowAnonymous": null,
-              "implementFrom": "EShopOnAbp.BasketService.IBasketAppService"
+              "implementFrom": "EShopOnAbp.BasketService.Services.IBasketAppService"
             }
           }
         }
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml
index 995a0f1a..08870a7f 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml
@@ -1,7 +1,7 @@
 @using EShopOnAbp.Localization
 @using EShopOnAbp.PublicWeb.Components.Purchase
 @using Microsoft.Extensions.Localization
-@model EShopOnAbp.BasketService.BasketDto
+@model EShopOnAbp.BasketService.Services.BasketDto
 @inject IStringLocalizer<EShopOnAbpResource> L
 
 <div>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Payment/PaymentWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Payment/PaymentWidgetViewComponent.cs
index 85020fde..d647c712 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Payment/PaymentWidgetViewComponent.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Payment/PaymentWidgetViewComponent.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using EShopOnAbp.BasketService;
-using EShopOnAbp.PaymentService.PaymentMethods;
+using EShopOnAbp.BasketService.Services;
 using EShopOnAbp.PublicWeb.ServiceProviders;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/PurchaseWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/PurchaseWidgetViewComponent.cs
index ca7699b5..a94967bf 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/PurchaseWidgetViewComponent.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Purchase/PurchaseWidgetViewComponent.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using EShopOnAbp.BasketService;
+using EShopOnAbp.BasketService.Services;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml
index 62cbfb03..5995e593 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml
@@ -1,8 +1,7 @@
-@using EShopOnAbp.BasketService.Localization
-@using EShopOnAbp.PublicWeb.Components.Basket
+@using EShopOnAbp.Localization
 @using Microsoft.AspNetCore.Mvc.Localization
-@inject IHtmlLocalizer<BasketServiceResource> L
-@model EShopOnAbp.BasketService.BasketDto
+@inject IHtmlLocalizer<EShopOnAbpResource> L
+@model EShopOnAbp.BasketService.Services.BasketDto
 <div id="shopping-cart" class="nav-link">
 
 	@if (Model == null)
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj
index 93b39a76..ee687dbb 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj
@@ -25,7 +25,7 @@
         <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.AspNetCore\EShopOnAbp.Shared.Hosting.AspNetCore.csproj" />
         <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Localization\EShopOnAbp.Shared.Localization.csproj" />
         <ProjectReference Include="..\..\..\..\services\catalog\src\EShopOnAbp.CatalogService.HttpApi.Client\EShopOnAbp.CatalogService.HttpApi.Client.csproj" />
-        <ProjectReference Include="..\..\..\..\services\basket\src\EShopOnAbp.BasketService.HttpApi.Client\EShopOnAbp.BasketService.HttpApi.Client.csproj" />
+        <ProjectReference Include="..\..\..\..\services\basket\src\EShopOnAbp.BasketService.Contracts\EShopOnAbp.BasketService.Contracts.csproj" />
         <ProjectReference Include="..\..\..\..\services\payment\src\EShopOnAbp.PaymentService.HttpApi.Client\EShopOnAbp.PaymentService.HttpApi.Client.csproj" />
         <ProjectReference Include="..\..\..\..\services\ordering\src\EShopOnAbp.OrderingService.HttpApi.Client\EShopOnAbp.OrderingService.HttpApi.Client.csproj" />
     </ItemGroup>
@@ -39,6 +39,11 @@
         </Content>
     </ItemGroup>
 
+    <ItemGroup>
+        <EmbeddedResource Include="**\*generate-proxy.json" />
+        <Content Remove="**\*generate-proxy.json" />
+    </ItemGroup>
+
     <ItemGroup>
         <Compile Remove="Logs\**" />
         <Content Remove="Logs\**" />
@@ -46,4 +51,8 @@
         <None Remove="Logs\**" />
     </ItemGroup>
 
+    <ItemGroup>
+      <_ContentIncludedByDefault Remove="ClientProxies\app-generate-proxy.json" />
+    </ItemGroup>
+
 </Project>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs
index b315177c..92595b3b 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicAutoMapperProfile.cs
@@ -1,5 +1,5 @@
 using AutoMapper;
-using EShopOnAbp.BasketService;
+using EShopOnAbp.BasketService.Services;
 using EShopOnAbp.OrderingService.Orders;
 using EShopOnAbp.PaymentService.PaymentRequests;
 using Volo.Abp.AutoMapper;
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
index 65a2ffca..367a4080 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
@@ -40,6 +40,7 @@ using EShopOnAbp.PublicWeb.PaymentMethods;
 using EShopOnAbp.PaymentService.PaymentMethods;
 using EShopOnAbp.PublicWeb.AnonymousUser;
 using Microsoft.Extensions.Configuration;
+using Volo.Abp.VirtualFileSystem;
 
 namespace EShopOnAbp.PublicWeb;
 
@@ -54,7 +55,7 @@ namespace EShopOnAbp.PublicWeb;
     typeof(EShopOnAbpSharedHostingAspNetCoreModule),
     typeof(EShopOnAbpSharedLocalizationModule),
     typeof(CatalogServiceHttpApiClientModule),
-    typeof(BasketServiceHttpApiClientModule),
+    typeof(BasketServiceContractsModule),
     typeof(OrderingServiceHttpApiClientModule),
     typeof(AbpAspNetCoreSignalRModule),
     typeof(PaymentServiceHttpApiClientModule),
@@ -79,6 +80,8 @@ public class EShopOnAbpPublicWebModule : AbpModule
         var hostingEnvironment = context.Services.GetHostingEnvironment();
         var configuration = context.Services.GetConfiguration();
 
+        ConfigureBasketHttpClient(context);
+
         context.Services.AddAutoMapperObjectMapper<EShopOnAbpPublicWebModule>();
         Configure<AbpAutoMapperOptions>(options => { options.AddMaps<EShopOnAbpPublicWebModule>(validate: true); });
 
@@ -159,6 +162,18 @@ public class EShopOnAbpPublicWebModule : AbpModule
             });
     }
 
+    private void ConfigureBasketHttpClient(ServiceConfigurationContext context)
+    {
+        context.Services.AddStaticHttpClientProxies(
+            typeof(BasketServiceContractsModule).Assembly, remoteServiceConfigurationName: BasketServiceConstants.RemoteServiceName
+        );
+        
+        Configure<AbpVirtualFileSystemOptions>(options =>
+        {
+            options.FileSets.AddEmbedded<EShopOnAbpPublicWebModule>();
+        });
+    }
+
     private void ConfigurePayment(IConfiguration configuration)
     {
         Configure<EShopOnAbpPublicWebPaymentOptions>(options =>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Payment.cshtml.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Payment.cshtml.cs
index 2d9aec56..8b1df272 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Payment.cshtml.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Payment.cshtml.cs
@@ -1,6 +1,4 @@
-using System;
-using EShopOnAbp.BasketService;
-using EShopOnAbp.PaymentService.PaymentRequests;
+using EShopOnAbp.PaymentService.PaymentRequests;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -8,6 +6,7 @@ using Microsoft.Extensions.Options;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using EShopOnAbp.BasketService.Services;
 using EShopOnAbp.OrderingService.Orders;
 using EShopOnAbp.PublicWeb.ServiceProviders;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/ServiceProviders/UserBasketProvider.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/ServiceProviders/UserBasketProvider.cs
index 6dba255a..a2af7272 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/ServiceProviders/UserBasketProvider.cs
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/ServiceProviders/UserBasketProvider.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Threading.Tasks;
-using EShopOnAbp.BasketService;
+using EShopOnAbp.BasketService.Services;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Users;
 
 namespace EShopOnAbp.PublicWeb.ServiceProviders
 {
diff --git a/services/basket/EShopOnAbp.BasketService.sln b/services/basket/EShopOnAbp.BasketService.sln
index 7af39ec3..acdd3ec2 100644
--- a/services/basket/EShopOnAbp.BasketService.sln
+++ b/services/basket/EShopOnAbp.BasketService.sln
@@ -3,33 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31717.71
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.Domain", "src\EShopOnAbp.BasketService.Domain\EShopOnAbp.BasketService.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.Application", "src\EShopOnAbp.BasketService.Application\EShopOnAbp.BasketService.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.Application.Tests", "test\EShopOnAbp.BasketService.Application.Tests\EShopOnAbp.BasketService.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.Domain.Shared", "src\EShopOnAbp.BasketService.Domain.Shared\EShopOnAbp.BasketService.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.Application.Contracts", "src\EShopOnAbp.BasketService.Application.Contracts\EShopOnAbp.BasketService.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.HttpApi", "src\EShopOnAbp.BasketService.HttpApi\EShopOnAbp.BasketService.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.HttpApi.Client", "src\EShopOnAbp.BasketService.HttpApi.Client\EShopOnAbp.BasketService.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.EntityFrameworkCore.Tests", "test\EShopOnAbp.BasketService.EntityFrameworkCore.Tests\EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.TestBase", "test\EShopOnAbp.BasketService.TestBase\EShopOnAbp.BasketService.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.Domain.Tests", "test\EShopOnAbp.BasketService.Domain.Tests\EShopOnAbp.BasketService.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp", "test\EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp\EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj", "{EF480016-9127-4916-8735-D2466BDBC582}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.BasketService", "src\EShopOnAbp.BasketService\EShopOnAbp.BasketService.csproj", "{83F0BE02-6B71-4695-B86F-18DEEE34B485}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopOnAbp.BasketService.HttpApi.Host", "src\EShopOnAbp.BasketService.HttpApi.Host\EShopOnAbp.BasketService.HttpApi.Host.csproj", "{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.BasketService.Contracts", "src\EShopOnAbp.BasketService.Contracts\EShopOnAbp.BasketService.Contracts.csproj", "{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,71 +17,21 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E512F4D9-9375-480F-A2F6-A46509F9D824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E512F4D9-9375-480F-A2F6-A46509F9D824}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E512F4D9-9375-480F-A2F6-A46509F9D824}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E512F4D9-9375-480F-A2F6-A46509F9D824}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF480016-9127-4916-8735-D2466BDBC582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF480016-9127-4916-8735-D2466BDBC582}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF480016-9127-4916-8735-D2466BDBC582}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF480016-9127-4916-8735-D2466BDBC582}.Release|Any CPU.Build.0 = Release|Any CPU
-		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83F0BE02-6B71-4695-B86F-18DEEE34B485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83F0BE02-6B71-4695-B86F-18DEEE34B485}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83F0BE02-6B71-4695-B86F-18DEEE34B485}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83F0BE02-6B71-4695-B86F-18DEEE34B485}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
-		{1A94A50E-06DC-43C1-80B5-B662820EC3EB} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
-		{50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
-		{42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
-		{520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
-		{4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
-		{3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
-		{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
-		{91853F21-9CD9-4132-BC29-A7D5D84FFFE7} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
-		{E512F4D9-9375-480F-A2F6-A46509F9D824} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
-		{EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE}
-		{748584B1-BA69-4F6A-81AA-F4BDE6BCE29D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{83F0BE02-6B71-4695-B86F-18DEEE34B485} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{D2C4E464-221E-42F3-B1BB-79ABC5C3AC64} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6AAFA1C6-603E-13FA-45E5-7910AA9F661D}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketServiceApplicationContractsModule.cs b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketServiceApplicationContractsModule.cs
deleted file mode 100644
index f88c26ce..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketServiceApplicationContractsModule.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Volo.Abp.Application;
-using Volo.Abp.Authorization;
-using Volo.Abp.Modularity;
-using Volo.Abp.ObjectExtending;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        typeof(BasketServiceDomainSharedModule),
-        typeof(AbpDddApplicationContractsModule),
-        typeof(AbpAuthorizationModule),
-        typeof(AbpObjectExtendingModule)
-    )]
-    public class BasketServiceApplicationContractsModule : AbpModule
-    {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            BasketServiceDtoExtensions.Configure();
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketServiceDtoExtensions.cs b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketServiceDtoExtensions.cs
deleted file mode 100644
index b9b9ec2e..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketServiceDtoExtensions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Volo.Abp.Threading;
-
-namespace EShopOnAbp.BasketService
-{
-    public static class BasketServiceDtoExtensions
-    {
-        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
-
-        public static void Configure()
-        {
-            OneTimeRunner.Run(() =>
-            {
-                /* You can add extension properties to DTOs
-                 * defined in the depended modules.
-                 *
-                 * Example:
-                 *
-                 * ObjectExtensionManager.Instance
-                 *   .AddOrUpdateProperty<IdentityRoleDto, string>("Title");
-                 *
-                 * See the documentation for more:
-                 * https://docs.abp.io/en/abp/latest/Object-Extensions
-                 */
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj
deleted file mode 100644
index 499b3a75..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/EShopOnAbp.BasketService.Application.Contracts.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EShopOnAbp.BasketService.Domain.Shared\EShopOnAbp.BasketService.Domain.Shared.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="5.1.2" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceAppService.cs b/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceAppService.cs
deleted file mode 100644
index c5141c68..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceAppService.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EShopOnAbp.BasketService.Localization;
-using Volo.Abp.Application.Services;
-
-namespace EShopOnAbp.BasketService
-{
-    /* Inherit your application services from this class.
-     */
-    public abstract class BasketServiceAppService : ApplicationService
-    {
-        protected BasketServiceAppService()
-        {
-            LocalizationResource = typeof(BasketServiceResource);
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceApplicationAutoMapperProfile.cs b/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceApplicationAutoMapperProfile.cs
deleted file mode 100644
index 781a2073..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceApplicationAutoMapperProfile.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using AutoMapper;
-using EShopOnAbp.CatalogService.Grpc;
-using EShopOnAbp.CatalogService.Products;
-
-namespace EShopOnAbp.BasketService
-{
-    public class BasketServiceApplicationAutoMapperProfile : Profile
-    {
-        public BasketServiceApplicationAutoMapperProfile()
-        {
-            CreateMap<ProductEto, ProductDto>();
-            CreateMap<ProductResponse, ProductDto>();
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceApplicationModule.cs b/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceApplicationModule.cs
deleted file mode 100644
index 74a9e542..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketServiceApplicationModule.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EShopOnAbp.CatalogService;
-using EShopOnAbp.CatalogService.Grpc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Volo.Abp.Application;
-using Volo.Abp.AutoMapper;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Modularity;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        typeof(BasketServiceDomainModule),
-        typeof(BasketServiceApplicationContractsModule),
-        typeof(AbpDddApplicationModule),
-        typeof(AbpAutoMapperModule),
-        typeof(CatalogServiceHttpApiClientModule)
-        )]
-    public class BasketServiceApplicationModule : AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            var configuration = context.Services.GetConfiguration();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddMaps<BasketServiceApplicationModule>();
-            });
-
-            context.Services.AddGrpcClient<ProductPublic.ProductPublicClient>((services, options) => 
-            {
-                var remoteServiceOptions = services.GetRequiredService<IOptionsMonitor<AbpRemoteServiceOptions>>().CurrentValue;
-                var catalogServiceConfiguration = remoteServiceOptions.RemoteServices.GetConfigurationOrDefault("Catalog");
-                var catalogGrpcUrl = catalogServiceConfiguration.GetOrDefault("GrpcUrl");
-                
-                options.Address = new Uri(catalogGrpcUrl);
-            });
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj b/services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj
deleted file mode 100644
index bbcbc805..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Application/EShopOnAbp.BasketService.Application.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EShopOnAbp.BasketService.Domain\EShopOnAbp.BasketService.Domain.csproj" />
-    <ProjectReference Include="..\EShopOnAbp.BasketService.Application.Contracts\EShopOnAbp.BasketService.Application.Contracts.csproj" />
-    <ProjectReference Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.HttpApi.Client\EShopOnAbp.CatalogService.HttpApi.Client.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="5.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.19.3" />
-    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.42.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.42.0" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Protobuf Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.Application.Contracts\Protos\product.proto" GrpcServices="Client" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/Properties/AssemblyInfo.cs b/services/basket/src/EShopOnAbp.BasketService.Application/Properties/AssemblyInfo.cs
deleted file mode 100644
index 788f548f..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Application/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-using System.Runtime.CompilerServices;
-[assembly:InternalsVisibleToAttribute("EShopOnAbp.BasketService.Application.Tests")]
diff --git a/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceConstants.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceConstants.cs
new file mode 100644
index 00000000..b650282d
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceConstants.cs
@@ -0,0 +1,6 @@
+namespace EShopOnAbp.BasketService;
+
+public static class BasketServiceConstants
+{
+    public static readonly string RemoteServiceName = "Basket";
+}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceContractsModule.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceContractsModule.cs
new file mode 100644
index 00000000..89eed5e3
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceContractsModule.cs
@@ -0,0 +1,39 @@
+using EShopOnAbp.BasketService.Localization;
+using EShopOnAbp.CatalogService;
+using Volo.Abp.Application;
+using Volo.Abp.Authorization;
+
+using Volo.Abp.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
+using Volo.Abp.Modularity;
+using Volo.Abp.Validation;
+using Volo.Abp.Validation.Localization;
+
+namespace EShopOnAbp.BasketService;
+
+[DependsOn(
+    typeof(CatalogServiceApplicationContractsModule),
+    typeof(AbpDddApplicationContractsModule),
+    typeof(AbpAuthorizationModule),
+    typeof(AbpValidationModule)
+)]
+public class BasketServiceContractsModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Add<BasketServiceResource>("en")
+                .AddBaseTypes(typeof(AbpValidationResource))
+                .AddVirtualJson("/Localization/BasketService");
+
+            options.DefaultResourceType = typeof(BasketServiceResource);
+        });
+
+        Configure<AbpExceptionLocalizationOptions>(options =>
+        {
+            options.MapCodeNamespace("BasketService", typeof(BasketServiceResource));
+        });
+    }
+}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceDomainErrorCodes.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceDomainErrorCodes.cs
new file mode 100644
index 00000000..4781d72a
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/BasketServiceDomainErrorCodes.cs
@@ -0,0 +1,7 @@
+namespace EShopOnAbp.BasketService;
+
+public static class BasketServiceDomainErrorCodes
+{
+    /* You can add your business exception error codes here, as constants */
+    public const string ProductNotFound = "ProductNotFound";
+}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj b/services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj
new file mode 100644
index 00000000..dd8be039
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/EShopOnAbp.BasketService.Contracts.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.1.2" />
+        <PackageReference Include="Volo.Abp.Authorization" Version="5.1.2" />
+        <PackageReference Include="Volo.Abp.Validation" Version="5.1.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.Application.Contracts\EShopOnAbp.CatalogService.Application.Contracts.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <EmbeddedResource Include="**\*generate-proxy.json" />
+        <Content Remove="**\*generate-proxy.json" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <EmbeddedResource Include="Localization\BasketService\*.json" />
+        <Content Remove="Localization\BasketService\*.json" />
+    </ItemGroup>
+    
+</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/ar.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/ar.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/ar.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/ar.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/cs.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/cs.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/cs.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/cs.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/de-DE.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/de-DE.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/de-DE.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/de-DE.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en-GB.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/en-GB.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en-GB.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/en-GB.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/en.json
similarity index 65%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/en.json
index f44c9b4a..5cc0a819 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en.json
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/en.json
@@ -3,10 +3,7 @@
   "texts": {
     "Menu:Home": "Home",
     "Welcome": "Welcome",
-    "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io.",
-    "Toolbar:Cart": "My Cart",
-    "Toolbar:BasketNotLoaded": "Couldn't Load!",
-    "Toolbar:CartEmpty": "Cart is Empty!",
+    "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io.",    
     "ProductNotFound": "Could not find the product!"
   }
 }
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/es.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/es.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/es.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/es.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/fi.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/fi.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/fi.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/fi.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/fr.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/fr.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/fr.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/fr.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/hi.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/hi.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/hi.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/hi.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/hu.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/hu.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/hu.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/hu.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/it.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/it.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/it.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/it.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/nl.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/nl.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/nl.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/nl.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/pl-PL.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/pl-PL.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/pl-PL.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/pl-PL.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/pt-BR.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/pt-BR.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/pt-BR.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/pt-BR.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/ro-RO.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/ro-RO.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/ro-RO.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/ro-RO.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/ru.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/ru.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/ru.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/ru.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/sk.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/sk.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/sk.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/sk.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/sl.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/sl.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/sl.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/sl.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/tr.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/tr.json
similarity index 59%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/tr.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/tr.json
index fc0fef09..361be51d 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/tr.json
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/tr.json
@@ -3,10 +3,7 @@
   "texts": {
     "Menu:Home": "Ana sayfa",
     "Welcome": "Hoşgeldiniz",
-    "LongWelcomeMessage": "Uygulamaya hoşgeldiniz. Bu, ABP framework'ü üzerine bina edilmiş bir başlangıç projesidir. Daha fazla bilgi için abp.io adresini ziyaret edebilirsiniz.",
-    "Toolbar:Cart": "Sepetim",
-    "Toolbar:BasketNotLoaded": "Sepet Hatası!",
-    "Toolbar:CartEmpty": "Sepetiniz Boş",
+    "LongWelcomeMessage": "Uygulamaya hoşgeldiniz. Bu, ABP framework'ü üzerine bina edilmiş bir başlangıç projesidir. Daha fazla bilgi için abp.io adresini ziyaret edebilirsiniz.",    
     "ProductNotFound": "Bu ürün bulunamadı!"
   }
 }
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/vi.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/vi.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/vi.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/vi.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/zh-Hans.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/zh-Hans.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/zh-Hans.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/zh-Hans.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/zh-Hant.json b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/zh-Hant.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/zh-Hant.json
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketService/zh-Hant.json
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketServiceResource.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketServiceResource.cs
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketServiceResource.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Localization/BasketServiceResource.cs
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/AddProductDto.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/AddProductDto.cs
similarity index 85%
rename from services/basket/src/EShopOnAbp.BasketService.Application.Contracts/AddProductDto.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/AddProductDto.cs
index f569c44e..92d8a511 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/AddProductDto.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/AddProductDto.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public class AddProductDto : IHasAnonymousId
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketDto.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/BasketDto.cs
similarity index 83%
rename from services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketDto.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/BasketDto.cs
index 49861381..4ef21695 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketDto.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/BasketDto.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public class BasketDto
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketItemDto.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/BasketItemDto.cs
similarity index 86%
rename from services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketItemDto.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/BasketItemDto.cs
index 3e2e3ef0..985e9ce6 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/BasketItemDto.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/BasketItemDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public class BasketItemDto
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IHasAnonymousId.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/IHasAnonymousId.cs
similarity index 70%
rename from services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IHasAnonymousId.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/IHasAnonymousId.cs
index 64c27687..dcd56d3d 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IHasAnonymousId.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/IHasAnonymousId.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace EShopOnAbp.BasketService
+namespace EShopOnAbp.BasketService.Services
 {
     public interface IHasAnonymousId
     {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/RemoveProductDto.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/RemoveProductDto.cs
similarity index 80%
rename from services/basket/src/EShopOnAbp.BasketService.Application.Contracts/RemoveProductDto.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/RemoveProductDto.cs
index e8cf0a2f..ae61d85e 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/RemoveProductDto.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Dtos/RemoveProductDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public class RemoveProductDto : IHasAnonymousId
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketProductUpdatedEto.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Etos/BasketProductUpdatedEto.cs
similarity index 75%
rename from services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketProductUpdatedEto.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Etos/BasketProductUpdatedEto.cs
index 14f4e141..9f8146cc 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketProductUpdatedEto.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Etos/BasketProductUpdatedEto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public class BasketProductUpdatedEto
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IBasketAppService.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/IBasketAppService.cs
similarity index 87%
rename from services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IBasketAppService.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/IBasketAppService.cs
index 6515ddbf..d4f8eed2 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IBasketAppService.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/IBasketAppService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public interface IBasketAppService : IApplicationService
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/IBasketProductService.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/IBasketProductService.cs
similarity index 83%
rename from services/basket/src/EShopOnAbp.BasketService.Application/IBasketProductService.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/IBasketProductService.cs
index 1288112c..4c72c688 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application/IBasketProductService.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/IBasketProductService.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using EShopOnAbp.CatalogService.Products;
 using JetBrains.Annotations;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public interface IBasketProductService
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/Permissions/BasketServicePermissionDefinitionProvider.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Permissions/BasketServicePermissionDefinitionProvider.cs
similarity index 92%
rename from services/basket/src/EShopOnAbp.BasketService.Application.Contracts/Permissions/BasketServicePermissionDefinitionProvider.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Permissions/BasketServicePermissionDefinitionProvider.cs
index ff68691c..147464a5 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/Permissions/BasketServicePermissionDefinitionProvider.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Permissions/BasketServicePermissionDefinitionProvider.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
 
-namespace EShopOnAbp.BasketService.Permissions
+namespace EShopOnAbp.BasketService.Services.Permissions
 {
     public class BasketServicePermissionDefinitionProvider : PermissionDefinitionProvider
     {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/Permissions/BasketServicePermissions.cs b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Permissions/BasketServicePermissions.cs
similarity index 80%
rename from services/basket/src/EShopOnAbp.BasketService.Application.Contracts/Permissions/BasketServicePermissions.cs
rename to services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Permissions/BasketServicePermissions.cs
index f6e7aa54..877cf2f9 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/Permissions/BasketServicePermissions.cs
+++ b/services/basket/src/EShopOnAbp.BasketService.Contracts/Services/Permissions/BasketServicePermissions.cs
@@ -1,4 +1,4 @@
-namespace EShopOnAbp.BasketService.Permissions
+namespace EShopOnAbp.BasketService.Services.Permissions
 {
     public static class BasketServicePermissions
     {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceDomainErrorCodes.cs b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceDomainErrorCodes.cs
deleted file mode 100644
index 7273e4dd..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceDomainErrorCodes.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EShopOnAbp.BasketService
-{
-    public static class BasketServiceDomainErrorCodes
-    {
-        /* You can add your business exception error codes here, as constants */
-        public const string ProductNotFound = "ProductNotFound";
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceDomainSharedModule.cs b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceDomainSharedModule.cs
deleted file mode 100644
index 73650d79..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceDomainSharedModule.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using EShopOnAbp.BasketService.Localization;
-using EShopOnAbp.OrderingService;
-using Volo.Abp.Localization;
-using Volo.Abp.Localization.ExceptionHandling;
-using Volo.Abp.Modularity;
-using Volo.Abp.Validation;
-using Volo.Abp.Validation.Localization;
-using Volo.Abp.VirtualFileSystem;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        typeof(AbpValidationModule),
-        typeof(OrderingServiceDomainSharedModule)
-        )]
-    public class BasketServiceDomainSharedModule : AbpModule
-    {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            BasketServiceGlobalFeatureConfigurator.Configure();
-            BasketServiceModuleExtensionConfigurator.Configure();
-        }
-
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<AbpVirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.AddEmbedded<BasketServiceDomainSharedModule>();
-            });
-
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Add<BasketServiceResource>("en")
-                    .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddVirtualJson("/Localization/BasketService");
-
-                options.DefaultResourceType = typeof(BasketServiceResource);
-            });
-
-            Configure<AbpExceptionLocalizationOptions>(options =>
-            {
-                options.MapCodeNamespace("BasketService", typeof(BasketServiceResource));
-            });
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceGlobalFeatureConfigurator.cs b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceGlobalFeatureConfigurator.cs
deleted file mode 100644
index 9c03b8f7..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceGlobalFeatureConfigurator.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Volo.Abp.Threading;
-
-namespace EShopOnAbp.BasketService
-{
-    public static class BasketServiceGlobalFeatureConfigurator
-    {
-        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
-
-        public static void Configure()
-        {
-            OneTimeRunner.Run(() =>
-            {
-                /* You can configure (enable/disable) global features of the used modules here.
-                 *
-                 * YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT!
-                 *
-                 * Please refer to the documentation to lear more about the Global Features System:
-                 * https://docs.abp.io/en/abp/latest/Global-Features
-                 */
-            });
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceModuleExtensionConfigurator.cs b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceModuleExtensionConfigurator.cs
deleted file mode 100644
index 04886c60..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/BasketServiceModuleExtensionConfigurator.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using Volo.Abp.Threading;
-
-namespace EShopOnAbp.BasketService
-{
-    public static class BasketServiceModuleExtensionConfigurator
-    {
-        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
-
-        public static void Configure()
-        {
-            OneTimeRunner.Run(() =>
-            {
-                ConfigureExistingProperties();
-                ConfigureExtraProperties();
-            });
-        }
-
-        private static void ConfigureExistingProperties()
-        {
-            /* You can change max lengths for properties of the
-             * entities defined in the modules used by your application.
-             *
-             * Example: Change user and role name max lengths
-
-               IdentityUserConsts.MaxNameLength = 99;
-               IdentityRoleConsts.MaxNameLength = 99;
-
-             * Notice: It is not suggested to change property lengths
-             * unless you really need it. Go with the standard values wherever possible.
-             *
-             * If you are using EF Core, you will need to run the add-migration command after your changes.
-             */
-        }
-
-        private static void ConfigureExtraProperties()
-        {
-            /* You can configure extra properties for the
-             * entities defined in the modules used by your application.
-             *
-             * This class can be used to define these extra properties
-             * with a high level, easy to use API.
-             *
-             * Example: Add a new property to the user entity of the identity module
-
-               ObjectExtensionManager.Instance.Modules()
-                  .ConfigureIdentity(identity =>
-                  {
-                      identity.ConfigureUser(user =>
-                      {
-                          user.AddOrUpdateProperty<string>( //property type: string
-                              "SocialSecurityNumber", //property name
-                              property =>
-                              {
-                                  //validation rules
-                                  property.Attributes.Add(new RequiredAttribute());
-                                  property.Attributes.Add(new StringLengthAttribute(64) {MinimumLength = 4});
-
-                                  //...other configurations for this property
-                              }
-                          );
-                      });
-                  });
-
-             * See the documentation for more:
-             * https://docs.abp.io/en/abp/latest/Module-Entity-Extensions
-             */
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj
deleted file mode 100644
index 18b9243f..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/EShopOnAbp.BasketService.Domain.Shared.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-  </PropertyGroup>
-
-  <ItemGroup>
-  <PackageReference Include="Volo.Abp.Validation" Version="5.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\ordering\src\EShopOnAbp.OrderingService.Domain.Shared\EShopOnAbp.OrderingService.Domain.Shared.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Localization\BasketService\*.json" />
-    <Content Remove="Localization\BasketService\*.json" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/BasketServiceDomainModule.cs b/services/basket/src/EShopOnAbp.BasketService.Domain/BasketServiceDomainModule.cs
deleted file mode 100644
index 39230157..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/BasketServiceDomainModule.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using Microsoft.Extensions.Caching.Distributed;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain;
-using Volo.Abp.Modularity;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        typeof(BasketServiceDomainSharedModule),
-        typeof(AbpDddDomainModule),
-        typeof(AbpCachingModule)
-    )]
-    public class BasketServiceDomainModule : AbpModule 
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<AbpDistributedCacheOptions>(options =>
-            {
-                options.CacheConfigurators.Add(cacheName =>
-                {
-                    if (cacheName == CacheNameAttribute.GetCacheName(typeof(Basket)))
-                    {
-                        return new DistributedCacheEntryOptions
-                        {
-                            SlidingExpiration = TimeSpan.FromDays(7)
-                        };
-                    }
-
-                    return null;
-                });
-            });
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj b/services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj
deleted file mode 100644
index 388f2288..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/EShopOnAbp.BasketService.Domain.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EShopOnAbp.BasketService.Domain.Shared\EShopOnAbp.BasketService.Domain.Shared.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.Caching" Version="5.1.2" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/Properties/AssemblyInfo.cs b/services/basket/src/EShopOnAbp.BasketService.Domain/Properties/AssemblyInfo.cs
deleted file mode 100644
index d83f67da..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-[assembly:InternalsVisibleToAttribute("EShopOnAbp.BasketService.Domain.Tests")]
-[assembly:InternalsVisibleToAttribute("EShopOnAbp.BasketService.TestBase")]
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/Settings/BasketServiceSettingDefinitionProvider.cs b/services/basket/src/EShopOnAbp.BasketService.Domain/Settings/BasketServiceSettingDefinitionProvider.cs
deleted file mode 100644
index 7af0661a..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/Settings/BasketServiceSettingDefinitionProvider.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Volo.Abp.Settings;
-
-namespace EShopOnAbp.BasketService.Settings
-{
-    public class BasketServiceSettingDefinitionProvider : SettingDefinitionProvider
-    {
-        public override void Define(ISettingDefinitionContext context)
-        {
-            //Define your own settings here. Example:
-            //context.Add(new SettingDefinition(BasketServiceSettings.MySetting1));
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/Settings/BasketServiceSettings.cs b/services/basket/src/EShopOnAbp.BasketService.Domain/Settings/BasketServiceSettings.cs
deleted file mode 100644
index 6705e811..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/Settings/BasketServiceSettings.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace EShopOnAbp.BasketService.Settings
-{
-    public static class BasketServiceSettings
-    {
-        private const string Prefix = "BasketService";
-
-        //Add your own setting names here. Example:
-        //public const string MySetting1 = Prefix + ".MySetting1";
-    }
-}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/BasketServiceHttpApiClientModule.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/BasketServiceHttpApiClientModule.cs
deleted file mode 100644
index 093c7352..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/BasketServiceHttpApiClientModule.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Modularity;
-using Volo.Abp.VirtualFileSystem;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        typeof(BasketServiceApplicationContractsModule),
-        typeof(AbpHttpClientModule)
-    )]
-    public class BasketServiceHttpApiClientModule : AbpModule
-    {
-        public const string RemoteServiceName = "Basket";
-
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            context.Services.AddStaticHttpClientProxies(
-                typeof(BasketServiceApplicationContractsModule).Assembly,
-                RemoteServiceName
-            );
-
-            Configure<AbpVirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.AddEmbedded<BasketServiceHttpApiClientModule>();
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj
deleted file mode 100644
index a2163e8a..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/EShopOnAbp.BasketService.HttpApi.Client.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EShopOnAbp.BasketService.Application.Contracts\EShopOnAbp.BasketService.Application.Contracts.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="5.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="**\*generate-proxy.json" />
-    <Content Remove="**\*generate-proxy.json" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/BasketServiceHttpApiHostModule.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/BasketServiceHttpApiHostModule.cs
deleted file mode 100644
index a1d990d5..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/BasketServiceHttpApiHostModule.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using EShopOnAbp.Shared.Hosting.AspNetCore;
-using EShopOnAbp.Shared.Hosting.Microservices;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Cors;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Extensions.Configuration;
-using Volo.Abp;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.AntiForgery;
-using Volo.Abp.Modularity;
-
-namespace EShopOnAbp.BasketService;
-
-[DependsOn(
-    typeof(BasketServiceHttpApiModule),
-    typeof(BasketServiceApplicationModule),
-    typeof(EShopOnAbpSharedHostingMicroservicesModule)
-)]
-public class BasketServiceHttpApiHostModule : AbpModule
-{
-    public override void ConfigureServices(ServiceConfigurationContext context)
-    {
-        Microsoft.IdentityModel.Logging.IdentityModelEventSource.ShowPII = true;
-
-        var configuration = context.Services.GetConfiguration();
-        var hostingEnvironment = context.Services.GetHostingEnvironment();
-
-        JwtBearerConfigurationHelper.Configure(context, "BasketService");
-
-        SwaggerWithAuthConfigurationHelper.Configure(
-            context: context,
-            authority: configuration["AuthServer:Authority"],
-            scopes: new
-                Dictionary<string, string> /* Requested scopes for authorization code request and descriptions for swagger UI only */
-                {
-                    {"BasketService", "Basket Service API"}
-                },
-            apiTitle: "Basket Service API"
-        );
-
-        context.Services.AddCors(options =>
-        {
-            options.AddDefaultPolicy(builder =>
-            {
-                builder
-                    .WithOrigins(
-                        configuration["App:CorsOrigins"]
-                            .Split(",", StringSplitOptions.RemoveEmptyEntries)
-                            .Select(o => o.Trim().RemovePostFix("/"))
-                            .ToArray()
-                    )
-                    .WithAbpExposedHeaders()
-                    .SetIsOriginAllowedToAllowWildcardSubdomains()
-                    .AllowAnyHeader()
-                    .AllowAnyMethod()
-                    .AllowCredentials();
-            });
-        });
-
-        Configure<AbpAspNetCoreMvcOptions>(options =>
-        {
-            options.ConventionalControllers.Create(
-                typeof(BasketServiceApplicationModule).Assembly, opts =>
-                {
-                    opts.RootPath = "basket";
-                    opts.RemoteServiceName = "Basket";
-                });
-        });
-
-        Configure<AbpAntiForgeryOptions>(options => { options.AutoValidate = false; });
-    }
-
-    public override void OnApplicationInitialization(ApplicationInitializationContext context)
-    {
-        var app = context.GetApplicationBuilder();
-        var env = context.GetEnvironment();
-
-        if (env.IsDevelopment())
-        {
-            app.UseDeveloperExceptionPage();
-        }
-
-        app.UseCorrelationId();
-        app.UseCors();
-        app.UseAbpRequestLocalization();
-        app.UseStaticFiles();
-        app.UseRouting();
-        app.UseAuthentication();
-        app.UseAbpClaimsMap();
-        app.UseAuthorization();
-        app.UseSwagger();
-        app.UseSwaggerUI(options =>
-        {
-            var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
-            options.SwaggerEndpoint("/swagger/v1/swagger.json", "Basket Service API");
-            options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
-            options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
-        });
-        app.UseAbpSerilogEnrichers();
-        app.UseAuditing();
-        app.UseUnitOfWork();
-        app.UseConfiguredEndpoints();
-    }
-}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Controllers/HomeController.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Controllers/HomeController.cs
deleted file mode 100644
index d9d431e8..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Controllers/HomeController.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc;
-
-namespace EShopOnAbp.BasketService.Controllers
-{
-    public class HomeController : AbpController
-    {
-        public ActionResult Index()
-        {
-            return Redirect("~/swagger");
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj
deleted file mode 100644
index baba3357..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-    <PreserveCompilationReferences>true</PreserveCompilationReferences>
-    <UserSecretsId>EShopOnAbp.BasketService-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EShopOnAbp.BasketService.Application\EShopOnAbp.BasketService.Application.csproj" />
-    <ProjectReference Include="..\EShopOnAbp.BasketService.HttpApi\EShopOnAbp.BasketService.HttpApi.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.Microservices\EShopOnAbp.Shared.Hosting.Microservices.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Logs\**" />
-    <Content Remove="Logs\**" />
-    <EmbeddedResource Remove="Logs\**" />
-    <None Remove="Logs\**" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/appsettings.Development.json b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/appsettings.Development.json
deleted file mode 100644
index 2c63c085..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/appsettings.Development.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/appsettings.secrets.json b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/appsettings.secrets.json
deleted file mode 100644
index 7a73a41b..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/appsettings.secrets.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/tempkey.rsa b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/tempkey.rsa
deleted file mode 100644
index f19e3e7d..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/tempkey.rsa
+++ /dev/null
@@ -1 +0,0 @@
-{"KeyId":"5eb863b25811a7099f9bc925c0fdf680","Parameters":{"D":"gqn7NAeMkug4twJJHFz/qPseDzQCx7R+6Maj649xrG4vPsMANV9mfR78Er2SuHUS0ZihM2MQEILI5Sf41Uuubv8swCNSE3Dw7GQrBIbTAJ7BZKbQMVgtGkMDtHrtri6d9cOi3EOTSJINICk9r80M49oBMOZihEKascfBSIUYVQvWLEMYfryEiDeFUPbobr10OxF5tZ1unvEKgZe190BdNKWQuFhJelcgsZumjEYNsOz5DHrK73WLhfTy01DmsTKx8i1XVnLtq6W89MqAhMZP9QO9Vj8lR0ANnmdOsY6hJfwUbXiI36t4V9rAZvXR5ESorjb4mnXzT6QPuOfy1fbdSQ==","DP":"ItYIpEqw6aDjDc/swDifUe0Dq6yl4yim3UyQ4B9NBPQR5M6b7D3vbCnvwql4zJK4s+0N4lRViBtkF+20Td1yc2v8S+THCYZCVxCf2e9Q7Ff/sKecJ9/JmdzHkztCfs0xb+4X3CPEQP+JIYtMGmwOLQgE5XgmUYKr0ahZDhYTCwE=","DQ":"v35mgxfyF/nwnWwWlR9cF3mg0v7SyPfKkwdxGaVnGH6G8nPWpPlO+zueflA5QDXEwGtk/1k3PAzI/OLUwJiKBubx/UMhsqt5+/bKTrFDNHxLANCvGNZggMZIzFZBYRucuXRZbiBe5qpCkKkniUct7w6jd/V1mnsESiJZ7btcxU0=","Exponent":"AQAB","InverseQ":"Vbg2a+wtaYvhTV8AzqJsVvaz0kfC4HFbmwEgA8+BAbS3GEoS3RHFSfB3DHndpnNihIg72DctDNLmV2GMMiTu18uyI+7AUaYNR836fByxptfyhPtSQfw4kINZ3V0GWKJGzzZ5NAOct4/FpRl8xliHetayCfUIuK9jwk0z9i6V6bA=","Modulus":"xlzmN1sBi2V1971MsPD5MTND9dAGncIzYqxa3H+9jx1mNDivY6JgKijUWm5a3D2Y1UPMB3kx6qUf3iH6pZHjq5bk938qRhxrPy9muW55U03HTiW4V5/ga0+OqXj5Tj4lz+29OiQHPErxLRgfXT+WBgrGb75ElzkHajKpJnPgzAZuarlUCwupJNQlav/crwOFrgkhGsnaOW13M8htiSLZozw5lxkbhYIei7YTTQZ3l6rVH1dPL8CvzRJJOTwbnU8k0sUmWiuOhrLzuinlr6uuOTocAVgbj943/witVFtN5B0yhetxEVgFCwxRDTOO1EKVHFtCiAyZBUOlK4gwZ+SbGQ==","P":"7dFfbAkZSdx/ieSMYJHoY1DKC4dLg80RObEEmuJ72MaVJLTtFuBPoRpYOrMUNuupIyPjZZsW8fHRlPRhKW7xFv+Q2aDudh1UaJzFZs3xYKoiXTU/j0B3TB3nrifVLMqsS+8kHOWOojwA4dMjI6GCYCpKmYVvMOE1cuJrQ9EYxoM=","Q":"1YdN8mLchLVoTEwD34Pi3T2U7EjjBDgDCzhjl7x5FBG73TyKMz1n7/KXkXcJ2rqIAsnLqCWpYUeRcWl+IQEQxFKoMwkvmQ33lRkOE0SBZ+FnUAMivRyxOD5qM9z4ccqx0ga4ZRgb1lR85f7VYtMSfIosOuSFxWAbV1e29utxhTM="}}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi/BasketServiceHttpApiModule.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi/BasketServiceHttpApiModule.cs
deleted file mode 100644
index 53cb7ebb..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi/BasketServiceHttpApiModule.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using EShopOnAbp.BasketService.Localization;
-using Localization.Resources.AbpUi;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.Localization;
-using Volo.Abp.Modularity;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        typeof(BasketServiceApplicationContractsModule),
-        typeof(AbpAspNetCoreMvcModule)
-        )]
-    public class BasketServiceHttpApiModule : AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            ConfigureLocalization();
-        }
-
-        private void ConfigureLocalization()
-        {
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<BasketServiceResource>()
-                    .AddBaseTypes(
-                        typeof(AbpUiResource)
-                    );
-            });
-        }
-    }
-}
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi/Controllers/BasketServiceController.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi/Controllers/BasketServiceController.cs
deleted file mode 100644
index 73dc08bf..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi/Controllers/BasketServiceController.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using EShopOnAbp.BasketService.Localization;
-using Volo.Abp.AspNetCore.Mvc;
-
-namespace EShopOnAbp.BasketService.Controllers
-{
-    /* Inherit your controllers from this class.
-     */
-    public abstract class BasketServiceController : AbpControllerBase
-    {
-        protected BasketServiceController()
-        {
-            LocalizationResource = typeof(BasketServiceResource);
-        }
-    }
-}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj b/services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj
deleted file mode 100644
index 5a965429..00000000
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi/EShopOnAbp.BasketService.HttpApi.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EShopOnAbp.BasketService.Application.Contracts\EShopOnAbp.BasketService.Application.Contracts.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.1.2" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService/BasketServiceAutoMapperProfile.cs b/services/basket/src/EShopOnAbp.BasketService/BasketServiceAutoMapperProfile.cs
new file mode 100644
index 00000000..b276ab1c
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService/BasketServiceAutoMapperProfile.cs
@@ -0,0 +1,14 @@
+using AutoMapper;
+using EShopOnAbp.CatalogService.Grpc;
+using EShopOnAbp.CatalogService.Products;
+
+namespace EShopOnAbp.BasketService;
+
+public class BasketServiceApplicationAutoMapperProfile : Profile
+{
+    public BasketServiceApplicationAutoMapperProfile()
+    {
+        CreateMap<ProductEto, ProductDto>();
+        CreateMap<ProductResponse, ProductDto>();
+    }
+}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs b/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs
new file mode 100644
index 00000000..d9e2585e
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService/BasketServiceModule.cs
@@ -0,0 +1,190 @@
+using EShopOnAbp.BasketService.Entities;
+using EShopOnAbp.CatalogService.Grpc;
+using EShopOnAbp.Shared.Hosting.AspNetCore;
+using EShopOnAbp.Shared.Hosting.Microservices;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+using Volo.Abp;
+using Volo.Abp.Application;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.AntiForgery;
+using Volo.Abp.AutoMapper;
+using Volo.Abp.Caching;
+using Volo.Abp.Domain;
+using Volo.Abp.Http.Client;
+using Volo.Abp.Modularity;
+using Volo.Abp.VirtualFileSystem;
+
+namespace EShopOnAbp.BasketService
+{
+    [DependsOn(
+        typeof(AbpAspNetCoreMvcModule),
+        typeof(AbpHttpClientModule),
+        typeof(AbpAutoMapperModule),
+        typeof(AbpCachingModule),
+        typeof(AbpDddApplicationModule),
+        typeof(AbpDddDomainModule),
+        typeof(BasketServiceContractsModule),
+        typeof(EShopOnAbpSharedHostingMicroservicesModule)
+    )]
+    public class BasketServiceModule : AbpModule 
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            var hostingEnvironment = context.Services.GetHostingEnvironment();
+
+            Microsoft.IdentityModel.Logging.IdentityModelEventSource.ShowPII = hostingEnvironment.IsDevelopment();
+            
+            var configuration = context.Services.GetConfiguration();
+
+            ConfigureAutoMapper();
+            ConfigureAspNetCoreRouting(context);
+            ConfigureGrpc(context);
+            ConfigureDistributedCache();
+            ConfigureVirtualFileSystem();
+            ConfigureAuthentication(context, configuration);
+            ConfigureSwagger(context, configuration);
+            ConfigureAutoApiControllers();
+        }
+
+        private void ConfigureAspNetCoreRouting(ServiceConfigurationContext context)
+        {
+            Configure<AbpAspNetCoreMvcOptions>(options =>
+            {
+                options.ConventionalControllers.Create(typeof(BasketServiceModule).Assembly, opts =>
+                {
+                    opts.RootPath = "basket";
+                    opts.RemoteServiceName = BasketServiceConstants.RemoteServiceName;
+                });
+            });
+        }
+
+        public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        {
+            var app = context.GetApplicationBuilder();
+            var env = context.GetEnvironment();
+
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            app.UseCorrelationId();
+            app.UseCors();
+            app.UseAbpRequestLocalization();
+            app.UseStaticFiles();
+            app.UseRouting();
+            app.UseAuthentication();
+            app.UseAbpClaimsMap();
+            app.UseAuthorization();
+            app.UseSwagger();
+            app.UseSwaggerUI(options =>
+            {
+                var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
+                options.SwaggerEndpoint("/swagger/v1/swagger.json", "Basket Service API");
+                options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
+                options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
+            });
+            app.UseAbpSerilogEnrichers();
+            app.UseAuditing();
+            app.UseUnitOfWork();
+            app.UseConfiguredEndpoints();
+        }
+        
+        private void ConfigureSwagger(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            SwaggerWithAuthConfigurationHelper.Configure(
+                context: context,
+                authority: configuration["AuthServer:Authority"],
+                scopes: new
+                    Dictionary<string, string> /* Requested scopes for authorization code request and descriptions for swagger UI only */
+                    {
+                        {"BasketService", "Basket Service API"}
+                    },
+                apiTitle: "Basket Service API"
+            );
+        }
+        
+        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
+        {
+            JwtBearerConfigurationHelper.Configure(context, "BasketService");
+
+            context.Services.AddCors(options =>
+            {
+                options.AddDefaultPolicy(builder =>
+                {
+                    builder
+                        .WithOrigins(
+                            configuration["App:CorsOrigins"]
+                                .Split(",", StringSplitOptions.RemoveEmptyEntries)
+                                .Select(o => o.Trim().RemovePostFix("/"))
+                                .ToArray()
+                        )
+                        .WithAbpExposedHeaders()
+                        .SetIsOriginAllowedToAllowWildcardSubdomains()
+                        .AllowAnyHeader()
+                        .AllowAnyMethod()
+                        .AllowCredentials();
+                });
+            });
+            
+            Configure<AbpAntiForgeryOptions>(options => { options.AutoValidate = false; });
+        }
+
+        private void ConfigureAutoApiControllers()
+        {
+            Configure<AbpAspNetCoreMvcOptions>(options =>
+            {
+                options.ConventionalControllers.Create(typeof(BasketServiceModule).Assembly);
+            });
+        }
+
+        private void ConfigureGrpc(ServiceConfigurationContext context)
+        {
+            context.Services.AddGrpcClient<ProductPublic.ProductPublicClient>((services, options) => 
+            {
+                var remoteServiceOptions = services.GetRequiredService<IOptionsMonitor<AbpRemoteServiceOptions>>().CurrentValue;
+                var catalogServiceConfiguration = remoteServiceOptions.RemoteServices.GetConfigurationOrDefault("Catalog");
+                var catalogGrpcUrl = catalogServiceConfiguration.GetOrDefault("GrpcUrl");
+                
+                options.Address = new Uri(catalogGrpcUrl);
+            });
+        }
+
+        private void ConfigureAutoMapper()
+        {
+            Configure<AbpAutoMapperOptions>(options =>
+            {
+                options.AddMaps<BasketServiceModule>();
+            });
+        }
+
+        private void ConfigureDistributedCache()
+        {
+            Configure<AbpDistributedCacheOptions>(options =>
+            {
+                options.CacheConfigurators.Add(cacheName =>
+                {
+                    if (cacheName == CacheNameAttribute.GetCacheName(typeof(Basket)))
+                    {
+                        return new DistributedCacheEntryOptions
+                        {
+                            SlidingExpiration = TimeSpan.FromDays(7)
+                        };
+                    }
+
+                    return null;
+                });
+            });
+        }
+
+        private void ConfigureVirtualFileSystem()
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<BasketServiceModule>();
+            });
+        }
+    }
+}
diff --git a/services/basket/src/EShopOnAbp.BasketService/Controllers/HomeController.cs b/services/basket/src/EShopOnAbp.BasketService/Controllers/HomeController.cs
new file mode 100644
index 00000000..3ff3cceb
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService/Controllers/HomeController.cs
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace EShopOnAbp.BasketService.Controllers;
+
+public class HomeController : AbpController
+{
+    public ActionResult Index()
+    {
+        return Redirect("~/swagger");
+    }
+}
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Dockerfile b/services/basket/src/EShopOnAbp.BasketService/Dockerfile
similarity index 90%
rename from services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Dockerfile
rename to services/basket/src/EShopOnAbp.BasketService/Dockerfile
index 9279ab5a..d5320a5d 100644
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Dockerfile
+++ b/services/basket/src/EShopOnAbp.BasketService/Dockerfile
@@ -24,7 +24,7 @@ COPY "shared/EShopOnAbp.Shared.Localization/EShopOnAbp.Shared.Localization.cspro
 # Microservices
 COPY "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj" "services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj"
 COPY "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj" "services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj"
-COPY *"services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj" "services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj"
+COPY *"services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj" "services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj"
 COPY *"services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj" "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj"
 COPY *"services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj" "services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj"
 COPY *"services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj" "services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj"
@@ -38,7 +38,7 @@ COPY "NuGet.Config" "NuGet.Config"
 RUN dotnet restore "EShopOnAbp.sln"
 COPY . .
 
-WORKDIR "/src/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host"
+WORKDIR "/src/services/basket/src/EShopOnAbp.BasketService"
 RUN dotnet publish -c Release -o /app 
 # Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 
@@ -48,4 +48,4 @@ FROM build AS publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "EShopOnAbp.BasketService.HttpApi.Host.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "EShopOnAbp.BasketService.dll"]
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Dockerfile.local b/services/basket/src/EShopOnAbp.BasketService/Dockerfile.local
similarity index 59%
rename from services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Dockerfile.local
rename to services/basket/src/EShopOnAbp.BasketService/Dockerfile.local
index c9ac1070..bbdd955b 100644
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Dockerfile.local
+++ b/services/basket/src/EShopOnAbp.BasketService/Dockerfile.local
@@ -1,4 +1,4 @@
   FROM mcr.microsoft.com/dotnet/aspnet:6.0
   COPY bin/Release/net6.0/publish/ app/
   WORKDIR /app
-  ENTRYPOINT ["dotnet", "EShopOnAbp.BasketService.HttpApi.Host.dll"]
\ No newline at end of file
+  ENTRYPOINT ["dotnet", "EShopOnAbp.BasketService.dll"]
\ No newline at end of file
diff --git a/services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj b/services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj
new file mode 100644
index 00000000..218321b5
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <Import Project="..\..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Google.Protobuf" Version="3.19.3" />
+        <PackageReference Include="Grpc.Net.ClientFactory" Version="2.42.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.42.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0" />
+
+        <PackageReference Include="Volo.Abp.Http.Client" Version="5.1.2" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.1.2" />
+        <PackageReference Include="Volo.Abp.AutoMapper" Version="5.1.2" />
+        <PackageReference Include="Volo.Abp.Caching" Version="5.1.2" />
+        <PackageReference Include="Volo.Abp.Ddd.Domain" Version="5.1.2" />
+        <PackageReference Include="Volo.Abp.Ddd.Application" Version="5.1.2" />        
+    </ItemGroup>
+    
+    <ItemGroup>
+        <ProjectReference Include="..\EShopOnAbp.BasketService.Contracts\EShopOnAbp.BasketService.Contracts.csproj" />
+        <ProjectReference Include="..\..\..\..\shared\EShopOnAbp.Shared.Hosting.Microservices\EShopOnAbp.Shared.Hosting.Microservices.csproj" />        
+    </ItemGroup>
+    
+    <ItemGroup>
+        <EmbeddedResource Include="**\*generate-proxy.json" />
+        <Content Remove="**\*generate-proxy.json" />
+    </ItemGroup>
+    
+    <ItemGroup>
+        <Protobuf Include="..\..\..\catalog\src\EShopOnAbp.CatalogService.Application.Contracts\Protos\product.proto" GrpcServices="Client" />
+    </ItemGroup>
+    
+    <ItemGroup>
+        <Compile Remove="Logs\**" />
+        <Content Remove="Logs\**" />
+        <EmbeddedResource Remove="Logs\**" />
+        <None Remove="Logs\**" />
+    </ItemGroup>
+    
+</Project>
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs b/services/basket/src/EShopOnAbp.BasketService/Entities/Basket.cs
similarity index 94%
rename from services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs
rename to services/basket/src/EShopOnAbp.BasketService/Entities/Basket.cs
index bafb2a90..efdf7e5d 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Entities/Basket.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Volo.Abp.Domain.Entities;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Entities;
 
 public class Basket : AggregateRoot<Guid>
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/BasketItem.cs b/services/basket/src/EShopOnAbp.BasketService/Entities/BasketItem.cs
similarity index 83%
rename from services/basket/src/EShopOnAbp.BasketService.Domain/BasketItem.cs
rename to services/basket/src/EShopOnAbp.BasketService/Entities/BasketItem.cs
index 4480a08f..49576247 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/BasketItem.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Entities/BasketItem.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Entities;
 
 public class BasketItem
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/BasketRepository.cs b/services/basket/src/EShopOnAbp.BasketService/Entities/BasketRepository.cs
similarity index 81%
rename from services/basket/src/EShopOnAbp.BasketService.Domain/BasketRepository.cs
rename to services/basket/src/EShopOnAbp.BasketService/Entities/BasketRepository.cs
index 0b851d72..b1d796ce 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/BasketRepository.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Entities/BasketRepository.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.Caching;
+using Volo.Abp.Caching;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Entities;
 
 public class BasketRepository : IBasketRepository
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/IBasketRepository.cs b/services/basket/src/EShopOnAbp.BasketService/Entities/IBasketRepository.cs
similarity index 66%
rename from services/basket/src/EShopOnAbp.BasketService.Domain/IBasketRepository.cs
rename to services/basket/src/EShopOnAbp.BasketService/Entities/IBasketRepository.cs
index 173ed00f..bd6dbadb 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/IBasketRepository.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Entities/IBasketRepository.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Entities;
 
 public interface IBasketRepository : IRepository
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/Orders/OrderPlacedEventHandler.cs b/services/basket/src/EShopOnAbp.BasketService/Entities/Orders/OrderPlacedEventHandler.cs
similarity index 91%
rename from services/basket/src/EShopOnAbp.BasketService.Domain/Orders/OrderPlacedEventHandler.cs
rename to services/basket/src/EShopOnAbp.BasketService/Entities/Orders/OrderPlacedEventHandler.cs
index d5b32341..0716d8fd 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Domain/Orders/OrderPlacedEventHandler.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Entities/Orders/OrderPlacedEventHandler.cs
@@ -1,10 +1,9 @@
 using EShopOnAbp.OrderingService.Orders;
-using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Uow;
 
-namespace EShopOnAbp.BasketService.Orders
+namespace EShopOnAbp.BasketService.Entities.Orders
 {
     public class OrderPlacedEventHandler : IDistributedEventHandler<OrderPlacedEto>, ITransientDependency
     {
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Program.cs b/services/basket/src/EShopOnAbp.BasketService/Program.cs
similarity index 82%
rename from services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Program.cs
rename to services/basket/src/EShopOnAbp.BasketService/Program.cs
index 2b661d9c..92622bd2 100644
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Program.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
-using Microsoft.AspNetCore.Builder;
 using Serilog;
 
 namespace EShopOnAbp.BasketService;
@@ -18,7 +15,7 @@ public class Program
         {
             Log.Information($"Starting {assemblyName}.");
             var app = await ApplicationBuilderHelper
-                .BuildApplicationAsync<BasketServiceHttpApiHostModule>(args);
+                .BuildApplicationAsync<BasketServiceModule>(args);
             await app.InitializeApplicationAsync();
             await app.RunAsync();
 
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Properties/launchSettings.json b/services/basket/src/EShopOnAbp.BasketService/Properties/launchSettings.json
similarity index 81%
rename from services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Properties/launchSettings.json
rename to services/basket/src/EShopOnAbp.BasketService/Properties/launchSettings.json
index 39e6c5ac..4764438c 100644
--- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Properties/launchSettings.json
+++ b/services/basket/src/EShopOnAbp.BasketService/Properties/launchSettings.json
@@ -1,27 +1,27 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "https://localhost:44355",
-      "sslPort": 44355
+      "applicationUrl": "https://localhost:44355"
     }
   },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
+    "EShopOnAbp.BasketService": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
+      "applicationUrl": "https://localhost:44355",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "EShopOnAbp.BasketService.HttpApi.Host": {
-      "commandName": "Project",
+    "IIS Express": {
+      "commandName": "IISExpress",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:44355",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs b/services/basket/src/EShopOnAbp.BasketService/Services/BasketAppService.cs
similarity index 92%
rename from services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs
rename to services/basket/src/EShopOnAbp.BasketService/Services/BasketAppService.cs
index 4858d8c8..e9b4899f 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Services/BasketAppService.cs
@@ -1,14 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Volo.Abp.Users;
+using EShopOnAbp.BasketService.Entities;
+using EShopOnAbp.BasketService.Localization;
 using EShopOnAbp.CatalogService.Products;
 using Volo.Abp;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Users;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
-public class BasketAppService : BasketServiceAppService, IBasketAppService
+public class BasketAppService : ApplicationService, IBasketAppService
 {
     private readonly IBasketRepository _basketRepository;
     private readonly IBasketProductService _basketProductService;
@@ -19,6 +18,7 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService
     {
         _basketRepository = basketRepository;
         _basketProductService = basketProductService;
+        LocalizationResource = typeof(BasketServiceResource);
     }
 
     public async Task<BasketDto> GetAsync(Guid? anonymousUserId)
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketProductEventHandler.cs b/services/basket/src/EShopOnAbp.BasketService/Services/BasketProductEventHandler.cs
similarity index 91%
rename from services/basket/src/EShopOnAbp.BasketService.Application/BasketProductEventHandler.cs
rename to services/basket/src/EShopOnAbp.BasketService/Services/BasketProductEventHandler.cs
index 334b47af..dc20ea48 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketProductEventHandler.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Services/BasketProductEventHandler.cs
@@ -1,13 +1,11 @@
-using System;
-using System.Threading.Tasks;
-using EShopOnAbp.CatalogService.Products;
+using EShopOnAbp.CatalogService.Products;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.ObjectMapping;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public class BasketProductEventHandler : IDistributedEventHandler<EntityUpdatedEto<ProductEto>>, ITransientDependency
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketProductService.cs b/services/basket/src/EShopOnAbp.BasketService/Services/BasketProductService.cs
similarity index 93%
rename from services/basket/src/EShopOnAbp.BasketService.Application/BasketProductService.cs
rename to services/basket/src/EShopOnAbp.BasketService/Services/BasketProductService.cs
index d764b479..b3a19472 100644
--- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketProductService.cs
+++ b/services/basket/src/EShopOnAbp.BasketService/Services/BasketProductService.cs
@@ -1,14 +1,11 @@
-using System;
-using System.Threading.Tasks;
 using EShopOnAbp.CatalogService.Grpc;
 using EShopOnAbp.CatalogService.Products;
-using Microsoft.Extensions.Logging;
 using Volo.Abp;
-using Volo.Abp.ObjectMapping;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.ObjectMapping;
 
-namespace EShopOnAbp.BasketService;
+namespace EShopOnAbp.BasketService.Services;
 
 public class BasketProductService : IBasketProductService, ITransientDependency
 {
diff --git a/services/basket/src/EShopOnAbp.BasketService/appsettings.Development.json b/services/basket/src/EShopOnAbp.BasketService/appsettings.Development.json
new file mode 100644
index 00000000..0c208ae9
--- /dev/null
+++ b/services/basket/src/EShopOnAbp.BasketService/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/appsettings.json b/services/basket/src/EShopOnAbp.BasketService/appsettings.json
similarity index 100%
rename from services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/appsettings.json
rename to services/basket/src/EShopOnAbp.BasketService/appsettings.json
diff --git a/services/basket/test/EShopOnAbp.BasketService.Application.Tests/BasketServiceApplicationTestBase.cs b/services/basket/test/EShopOnAbp.BasketService.Application.Tests/BasketServiceApplicationTestBase.cs
deleted file mode 100644
index 543ed4db..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.Application.Tests/BasketServiceApplicationTestBase.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EShopOnAbp.BasketService
-{
-    public abstract class BasketServiceApplicationTestBase : BasketServiceTestBase<BasketServiceApplicationTestModule> 
-    {
-
-    }
-}
diff --git a/services/basket/test/EShopOnAbp.BasketService.Application.Tests/BasketServiceApplicationTestModule.cs b/services/basket/test/EShopOnAbp.BasketService.Application.Tests/BasketServiceApplicationTestModule.cs
deleted file mode 100644
index 3b79fe98..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.Application.Tests/BasketServiceApplicationTestModule.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Volo.Abp.Modularity;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        typeof(BasketServiceApplicationModule),
-        typeof(BasketServiceDomainTestModule)
-        )]
-    public class BasketServiceApplicationTestModule : AbpModule
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/services/basket/test/EShopOnAbp.BasketService.Application.Tests/EShopOnAbp.BasketService.Application.Tests.csproj b/services/basket/test/EShopOnAbp.BasketService.Application.Tests/EShopOnAbp.BasketService.Application.Tests.csproj
deleted file mode 100644
index 431fed93..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.Application.Tests/EShopOnAbp.BasketService.Application.Tests.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\EShopOnAbp.BasketService.Application\EShopOnAbp.BasketService.Application.csproj" />
-    <ProjectReference Include="..\EShopOnAbp.BasketService.Domain.Tests\EShopOnAbp.BasketService.Domain.Tests.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/BasketServiceDomainTestBase.cs b/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/BasketServiceDomainTestBase.cs
deleted file mode 100644
index 42793a73..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/BasketServiceDomainTestBase.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EShopOnAbp.BasketService
-{
-    public abstract class BasketServiceDomainTestBase : BasketServiceTestBase<BasketServiceDomainTestModule> 
-    {
-
-    }
-}
diff --git a/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/BasketServiceDomainTestModule.cs b/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/BasketServiceDomainTestModule.cs
deleted file mode 100644
index ed20701f..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/BasketServiceDomainTestModule.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Volo.Abp.Modularity;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        )]
-    public class BasketServiceDomainTestModule : AbpModule
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/EShopOnAbp.BasketService.Domain.Tests.csproj b/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/EShopOnAbp.BasketService.Domain.Tests.csproj
deleted file mode 100644
index 0f0bce74..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.Domain.Tests/EShopOnAbp.BasketService.Domain.Tests.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EShopOnAbp.BasketService.EntityFrameworkCore.Tests\EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj b/services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj
deleted file mode 100644
index 89046d2a..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.EntityFrameworkCore.Tests/EShopOnAbp.BasketService.EntityFrameworkCore.Tests.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EShopOnAbp.BasketService.TestBase\EShopOnAbp.BasketService.TestBase.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="5.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/BasketServiceConsoleApiClientModule.cs b/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/BasketServiceConsoleApiClientModule.cs
deleted file mode 100644
index d600c5c3..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/BasketServiceConsoleApiClientModule.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Polly;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Http.Client.IdentityModel;
-using Volo.Abp.Modularity;
-
-namespace EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp
-{
-    [DependsOn(
-        typeof(BasketServiceHttpApiClientModule),
-        typeof(AbpHttpClientIdentityModelModule)
-        )]
-    public class BasketServiceConsoleApiClientModule : AbpModule
-    {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            PreConfigure<AbpHttpClientBuilderOptions>(options =>
-            {
-                options.ProxyClientBuildActions.Add((remoteServiceName, clientBuilder) =>
-                {
-                    clientBuilder.AddTransientHttpErrorPolicy(
-                        policyBuilder => policyBuilder.WaitAndRetryAsync(3, i => TimeSpan.FromSeconds(Math.Pow(2, i)))
-                    );
-                });
-            });
-        }
-    }
-}
diff --git a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs b/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs
deleted file mode 100644
index d65a1ceb..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.Extensions.Hosting;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-
-namespace EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp
-{
-    public class ConsoleTestAppHostedService : IHostedService
-    {
-        private readonly IConfiguration _configuration;
-
-        public ConsoleTestAppHostedService(IConfiguration configuration)
-        {
-            _configuration = configuration;
-        }
-
-        public async Task StartAsync(CancellationToken cancellationToken)
-        {
-            using (var application = AbpApplicationFactory.Create<BasketServiceConsoleApiClientModule>(options =>
-            {
-                options.Services.ReplaceConfiguration(_configuration);
-            }))
-            {
-                application.Initialize();
-
-                //var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                //await demo.RunAsync();
-
-                application.Shutdown();
-            }
-        }
-
-        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
-    }
-}
diff --git a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj b/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj
deleted file mode 100644
index d86ab585..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="appsettings.json" />
-    <Content Include="appsettings.json">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Remove="appsettings.secrets.json" />
-    <Content Include="appsettings.secrets.json">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="5.1.2" />
-    <ProjectReference Include="..\..\src\EShopOnAbp.BasketService.HttpApi.Client\EShopOnAbp.BasketService.HttpApi.Client.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/Program.cs b/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/Program.cs
deleted file mode 100644
index ac8f80ac..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/Program.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp
-{
-    class Program
-    {
-        static async Task Main(string[] args)
-        {
-            await CreateHostBuilder(args).RunConsoleAsync();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .AddAppSettingsSecretsJson()
-                .ConfigureServices((hostContext, services) =>
-                {
-                    services.AddHostedService<ConsoleTestAppHostedService>();
-                });
-    }
-}
diff --git a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/appsettings.json b/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/appsettings.json
deleted file mode 100644
index 30cf29e5..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/appsettings.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "RemoteServices": {
-    "Default": {
-      "BaseUrl": "https://localhost:44376"
-    }
-  },
-  "IdentityClients": {
-    "Default": {
-      "GrantType": "password",
-      "ClientId": "BasketService_App",
-      "ClientSecret": "1q2w3e*",
-      "UserName": "admin",
-      "UserPassword": "1q2w3E*",
-      "Authority": "https://localhost:44376",
-      "Scope": "BasketService"
-    }
-  }
-}
\ No newline at end of file
diff --git a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json b/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json
deleted file mode 100644
index 7a73a41b..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestBase.cs b/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestBase.cs
deleted file mode 100644
index ffc2b7c4..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestBase.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Modularity;
-using Volo.Abp.Uow;
-using Volo.Abp.Testing;
-
-namespace EShopOnAbp.BasketService
-{
-    /* All test classes are derived from this class, directly or indirectly.
-     */
-    public abstract class BasketServiceTestBase<TStartupModule> : AbpIntegratedTest<TStartupModule> 
-        where TStartupModule : IAbpModule
-    {
-        protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
-        {
-            options.UseAutofac();
-        }
-
-        protected virtual Task WithUnitOfWorkAsync(Func<Task> func)
-        {
-            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
-        }
-
-        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
-        {
-            using (var scope = ServiceProvider.CreateScope())
-            {
-                var uowManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
-
-                using (var uow = uowManager.Begin(options))
-                {
-                    await action();
-
-                    await uow.CompleteAsync();
-                }
-            }
-        }
-
-        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
-        {
-            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
-        }
-
-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
-        {
-            using (var scope = ServiceProvider.CreateScope())
-            {
-                var uowManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
-
-                using (var uow = uowManager.Begin(options))
-                {
-                    var result = await func();
-                    await uow.CompleteAsync();
-                    return result;
-                }
-            }
-        }
-    }
-}
diff --git a/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestBaseModule.cs b/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestBaseModule.cs
deleted file mode 100644
index a952ba0c..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestBaseModule.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Authorization;
-using Volo.Abp.Autofac;
-using Volo.Abp.Data;
-using Volo.Abp.Modularity;
-using Volo.Abp.Threading;
-
-namespace EShopOnAbp.BasketService
-{
-    [DependsOn(
-        typeof(AbpAutofacModule),
-        typeof(AbpTestBaseModule),
-        typeof(AbpAuthorizationModule),
-        typeof(BasketServiceDomainModule)
-        )]
-    public class BasketServiceTestBaseModule : AbpModule
-    {
-
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            //Configure<AbpBackgroundJobOptions>(options =>
-            //{
-            //    options.IsJobExecutionEnabled = false;
-            //});
-
-            context.Services.AddAlwaysAllowAuthorization();
-        }
-
-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            SeedTestData(context);
-        }
-
-        private static void SeedTestData(ApplicationInitializationContext context)
-        {
-            AsyncHelper.RunSync(async () =>
-            {
-                using (var scope = context.ServiceProvider.CreateScope())
-                {
-                    await scope.ServiceProvider
-                        .GetRequiredService<IDataSeeder>()
-                        .SeedAsync();
-                }
-            });
-        }
-    }
-}
diff --git a/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestDataSeedContributor.cs b/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestDataSeedContributor.cs
deleted file mode 100644
index c4192cb8..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.TestBase/BasketServiceTestDataSeedContributor.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-
-namespace EShopOnAbp.BasketService
-{
-    public class BasketServiceTestDataSeedContributor : IDataSeedContributor, ITransientDependency
-    {
-        public Task SeedAsync(DataSeedContext context)
-        {
-            /* Seed additional test data... */
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj b/services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj
deleted file mode 100644
index 1000f811..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.TestBase/EShopOnAbp.BasketService.TestBase.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>EShopOnAbp.BasketService</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.TestBase" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="5.1.2" />
-    <ProjectReference Include="..\..\src\EShopOnAbp.BasketService.Domain\EShopOnAbp.BasketService.Domain.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Shouldly" Version="4.0.3" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-  </ItemGroup>
-
-</Project>
diff --git a/services/basket/test/EShopOnAbp.BasketService.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/services/basket/test/EShopOnAbp.BasketService.TestBase/Security/FakeCurrentPrincipalAccessor.cs
deleted file mode 100644
index d0b20003..00000000
--- a/services/basket/test/EShopOnAbp.BasketService.TestBase/Security/FakeCurrentPrincipalAccessor.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Security.Claims;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Security.Claims;
-
-namespace EShopOnAbp.BasketService.Security
-{
-    [Dependency(ReplaceServices = true)]
-    public class FakeCurrentPrincipalAccessor : ThreadCurrentPrincipalAccessor
-    {
-        protected override ClaimsPrincipal GetClaimsPrincipal()
-        {
-            return GetPrincipal();
-        }
-
-        private ClaimsPrincipal _principal;
-
-        private ClaimsPrincipal GetPrincipal()
-        {
-            if (_principal == null)
-            {
-                lock (this)
-                {
-                    if (_principal == null)
-                    {
-                        _principal = new ClaimsPrincipal(
-                            new ClaimsIdentity(
-                                new List<Claim>
-                                {
-                                    new Claim(AbpClaimTypes.UserId,"2e701e62-0953-4dd3-910b-dc6cc93ccb0d"),
-                                    new Claim(AbpClaimTypes.UserName,"admin"),
-                                    new Claim(AbpClaimTypes.Email,"admin@abp.io")
-                                }
-                            )
-                        );
-                    }
-                }
-            }
-
-            return _principal;
-        }
-    }
-}
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/CatalogServiceApplicationContractsModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/CatalogServiceApplicationContractsModule.cs
index d73ef49b..26d4fbf1 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/CatalogServiceApplicationContractsModule.cs
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Application.Contracts/CatalogServiceApplicationContractsModule.cs
@@ -3,19 +3,18 @@ using Volo.Abp.Authorization;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
 
-namespace EShopOnAbp.CatalogService
+namespace EShopOnAbp.CatalogService;
+
+[DependsOn(
+    typeof(CatalogServiceDomainSharedModule),
+    typeof(AbpObjectExtendingModule),
+    typeof(AbpDddApplicationContractsModule),
+    typeof(AbpAuthorizationModule)
+)]
+public class CatalogServiceApplicationContractsModule : AbpModule
 {
-    [DependsOn(
-        typeof(CatalogServiceDomainSharedModule),
-        typeof(AbpObjectExtendingModule),
-        typeof(AbpDddApplicationContractsModule),
-        typeof(AbpAuthorizationModule)
-    )]
-    public class CatalogServiceApplicationContractsModule : AbpModule
+    public override void PreConfigureServices(ServiceConfigurationContext context)
     {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            CatalogServiceDtoExtensions.Configure();
-        }
+        CatalogServiceDtoExtensions.Configure();
     }
-}
+}
\ No newline at end of file
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Application/CatalogServiceApplicationModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.Application/CatalogServiceApplicationModule.cs
index b32e87d3..a68fdb7a 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Application/CatalogServiceApplicationModule.cs
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Application/CatalogServiceApplicationModule.cs
@@ -2,21 +2,17 @@
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
-namespace EShopOnAbp.CatalogService
+namespace EShopOnAbp.CatalogService;
+
+[DependsOn(
+    typeof(CatalogServiceDomainModule),
+    typeof(CatalogServiceApplicationContractsModule),
+    typeof(AbpDddApplicationModule)
+)]
+public class CatalogServiceApplicationModule : AbpModule
 {
-    [DependsOn(
-        typeof(CatalogServiceDomainModule),
-        typeof(CatalogServiceApplicationContractsModule),
-        typeof(AbpDddApplicationModule)
-    )]
-    public class CatalogServiceApplicationModule : AbpModule
+    public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddMaps<CatalogServiceApplicationModule>();
-            });
-        }
+        Configure<AbpAutoMapperOptions>(options => { options.AddMaps<CatalogServiceApplicationModule>(); });
     }
-}
+}
\ No newline at end of file
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/CatalogServiceDomainSharedModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/CatalogServiceDomainSharedModule.cs
index 6b3c0ee8..19e630b9 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/CatalogServiceDomainSharedModule.cs
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain.Shared/CatalogServiceDomainSharedModule.cs
@@ -1,4 +1,5 @@
 using EShopOnAbp.CatalogService.Localization;
+using EShopOnAbp.OrderingService;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Modularity;
@@ -6,34 +7,34 @@ using Volo.Abp.Validation;
 using Volo.Abp.Validation.Localization;
 using Volo.Abp.VirtualFileSystem;
 
-namespace EShopOnAbp.CatalogService
+namespace EShopOnAbp.CatalogService;
+
+[DependsOn(
+    typeof(AbpValidationModule),
+    typeof(OrderingServiceDomainSharedModule)
+)]
+public class CatalogServiceDomainSharedModule : AbpModule
 {
-    [DependsOn(
-        typeof(AbpValidationModule)
-        )]
-    public class CatalogServiceDomainSharedModule : AbpModule
+    public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
+        Configure<AbpVirtualFileSystemOptions>(options =>
         {
-            Configure<AbpVirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.AddEmbedded<CatalogServiceDomainSharedModule>();
-            });
+            options.FileSets.AddEmbedded<CatalogServiceDomainSharedModule>();
+        });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Add<CatalogServiceResource>("en")
-                    .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddVirtualJson("/Localization/CatalogService");
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Resources
+                .Add<CatalogServiceResource>("en")
+                .AddBaseTypes(typeof(AbpValidationResource))
+                .AddVirtualJson("/Localization/CatalogService");
 
-                options.DefaultResourceType = typeof(CatalogServiceResource);
-            });
+            options.DefaultResourceType = typeof(CatalogServiceResource);
+        });
 
-            Configure<AbpExceptionLocalizationOptions>(options =>
-            {
-                options.MapCodeNamespace("CatalogService", typeof(CatalogServiceResource));
-            });
-        }
+        Configure<AbpExceptionLocalizationOptions>(options =>
+        {
+            options.MapCodeNamespace("CatalogService", typeof(CatalogServiceResource));
+        });
     }
-}
+}
\ No newline at end of file
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs b/services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs
index ecb0c0c5..94fea44e 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs
+++ b/services/catalog/src/EShopOnAbp.CatalogService.Domain/CatalogServiceDomainModule.cs
@@ -1,32 +1,26 @@
-using EShopOnAbp.OrderingService;
 using EShopOnAbp.CatalogService.Products;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.Modularity;
 
-namespace EShopOnAbp.CatalogService
+namespace EShopOnAbp.CatalogService;
+
+[DependsOn(
+    typeof(CatalogServiceDomainSharedModule),
+    typeof(AbpDddDomainModule),
+    typeof(AbpAutoMapperModule)
+)]
+public class CatalogServiceDomainModule : AbpModule
 {
-    [DependsOn(
-        typeof(CatalogServiceDomainSharedModule),
-        typeof(AbpDddDomainModule),
-        typeof(AbpAutoMapperModule),
-        typeof(OrderingServiceDomainSharedModule)
-    )]
-    public class CatalogServiceDomainModule : AbpModule
+    public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
+        Configure<AbpAutoMapperOptions>(options => { options.AddMaps<CatalogServiceDomainModule>(validate: true); });
+
+        Configure<AbpDistributedEntityEventOptions>(options =>
         {
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddMaps<CatalogServiceDomainModule>(validate: true);
-            });
-            
-            Configure<AbpDistributedEntityEventOptions>(options =>
-            {
-                options.AutoEventSelectors.Add<Product>();
-                options.EtoMappings.Add<Product, ProductEto>();
-            });
-        }
+            options.AutoEventSelectors.Add<Product>();
+            options.EtoMappings.Add<Product, ProductEto>();
+        });
     }
-}
+}
\ No newline at end of file
diff --git a/services/ordering/test/EShopOnAbp.OrderingService.TestBase/OrderingServiceTestDataSeedContributor.cs b/services/ordering/test/EShopOnAbp.OrderingService.TestBase/OrderingServiceTestDataSeedContributor.cs
index d45e0b19..86f2f617 100644
--- a/services/ordering/test/EShopOnAbp.OrderingService.TestBase/OrderingServiceTestDataSeedContributor.cs
+++ b/services/ordering/test/EShopOnAbp.OrderingService.TestBase/OrderingServiceTestDataSeedContributor.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using EShopOnAbp.OrderingService.Orders;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json
index 76dc07ce..b1d2db9f 100644
--- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json
+++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json
@@ -45,6 +45,9 @@
     "UserOrders:BuyAgain": "Buy Again",
     "UserOrders:ProductReturnDate": "Last date for product return:",
     "UserOrders:ReturnProducts": "Return products",
-    "UserOrders:AddReview": "Add product review"
+    "UserOrders:AddReview": "Add product review",
+    "Toolbar:Cart": "My Cart",
+    "Toolbar:BasketNotLoaded": "Couldn't Load!",
+    "Toolbar:CartEmpty": "Cart is Empty!"
   }
 }
diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json
index 838e7020..1eb45c5c 100644
--- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json
+++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json
@@ -43,6 +43,9 @@
     "UserOrders:BuyAgain": "Tekrar Satın Alın",
     "UserOrders:ProductReturnDate": "Ürünü iade edebileceğiniz son tarih:",
     "UserOrders:ReturnProducts": "Ürünleri iade et",
-    "UserOrders:AddReview": "Ürün yorumu yazın"
+    "UserOrders:AddReview": "Ürün yorumu yazın",
+    "Toolbar:Cart": "Sepetim",
+    "Toolbar:BasketNotLoaded": "Sepet Hatası!",
+    "Toolbar:CartEmpty": "Sepetiniz Boş"
   }
 }
diff --git a/tye.yaml b/tye.yaml
index f6f6586f..efcd5f22 100644
--- a/tye.yaml
+++ b/tye.yaml
@@ -37,7 +37,7 @@ services:
     - Kestrel__Certificates__Default__Password=8b6039b6-c67a-448b-977b-0ce6d3fcfd49
 
 - name: basket-service
-  project: services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/EShopOnAbp.BasketService.HttpApi.Host.csproj
+  project: services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj
   bindings:
     - protocol: https
       port: 44355