diff --git a/Mango.Nop.Core/Mango.Nop.Core.csproj b/Mango.Nop.Core/Mango.Nop.Core.csproj
index bcf90a8..2a7ca75 100644
--- a/Mango.Nop.Core/Mango.Nop.Core.csproj
+++ b/Mango.Nop.Core/Mango.Nop.Core.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="linq2db" Version="5.4.1" />
     <PackageReference Include="MessagePack.Annotations" Version="3.1.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.10" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\FruitBank\Libraries\Nop.Core\Nop.Core.csproj" />
-    <ProjectReference Include="..\..\..\..\FruitBank\Libraries\Nop.Data\Nop.Data.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Mango.Nop.Core/Interfaces/IMgDalBase.cs b/Mango.Nop.Data/Interfaces/IMgDalBase.cs
similarity index 92%
rename from Mango.Nop.Core/Interfaces/IMgDalBase.cs
rename to Mango.Nop.Data/Interfaces/IMgDalBase.cs
index c550f85..e679254 100644
--- a/Mango.Nop.Core/Interfaces/IMgDalBase.cs
+++ b/Mango.Nop.Data/Interfaces/IMgDalBase.cs
@@ -1,4 +1,4 @@
-namespace Mango.Nop.Core.Interfaces;
+namespace Mango.Nop.Data.Interfaces;
 
 public interface IMgDalBase //: IAcDalBase//: IDisposable
 {
diff --git a/Mango.Nop.Core/Interfaces/IMgDbContextBase.cs b/Mango.Nop.Data/Interfaces/IMgDbContextBase.cs
similarity index 95%
rename from Mango.Nop.Core/Interfaces/IMgDbContextBase.cs
rename to Mango.Nop.Data/Interfaces/IMgDbContextBase.cs
index 9458483..62513d5 100644
--- a/Mango.Nop.Core/Interfaces/IMgDbContextBase.cs
+++ b/Mango.Nop.Data/Interfaces/IMgDbContextBase.cs
@@ -4,7 +4,7 @@ using Nop.Core.Domain.Orders;
 using Nop.Data;
 using System.Transactions;
 
-namespace Mango.Nop.Core.Interfaces;
+namespace Mango.Nop.Data.Interfaces;
 
 public interface IMgDbContextBase //: IAcDbContextBase
 {
diff --git a/Mango.Nop.Core/Interfaces/IMgDbTableBase.cs b/Mango.Nop.Data/Interfaces/IMgDbTableBase.cs
similarity index 91%
rename from Mango.Nop.Core/Interfaces/IMgDbTableBase.cs
rename to Mango.Nop.Data/Interfaces/IMgDbTableBase.cs
index e9025e6..d8a21a9 100644
--- a/Mango.Nop.Core/Interfaces/IMgDbTableBase.cs
+++ b/Mango.Nop.Data/Interfaces/IMgDbTableBase.cs
@@ -1,7 +1,7 @@
 using Mango.Nop.Core.Entities;
 using Nop.Data;
 
-namespace Mango.Nop.Core.Interfaces;
+namespace Mango.Nop.Data.Interfaces;
 
 public interface IMgDbTableBase //: IAcDbTableBase
 {
diff --git a/Mango.Nop.Data/Mango.Nop.Data.csproj b/Mango.Nop.Data/Mango.Nop.Data.csproj
new file mode 100644
index 0000000..b7626e2
--- /dev/null
+++ b/Mango.Nop.Data/Mango.Nop.Data.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<BaseOutputPath>bin\FruitBank</BaseOutputPath>
+		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="MessagePack.Annotations" Version="3.1.4" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.10" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\..\..\FruitBank\Libraries\Nop.Core\Nop.Core.csproj" />
+		<ProjectReference Include="..\..\..\..\FruitBank\Libraries\Nop.Data\Nop.Data.csproj" />
+		<ProjectReference Include="..\Mango.Nop.Core\Mango.Nop.Core.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Reference Include="AyCode.Core">
+			<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Core.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Core.Server">
+			<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Core.Server.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Entities">
+			<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Entities.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Entities.Server">
+			<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Entities.Server.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Interfaces">
+			<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Interfaces.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Interfaces.Server">
+			<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Interfaces.Server.dll</HintPath>
+		</Reference>
+		<Reference Include="AyCode.Utils">
+			<HintPath>..\..\..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Utils.dll</HintPath>
+		</Reference>
+	</ItemGroup>
+</Project>
diff --git a/Mango.Nop.Core/Repositories/MgDalBase.cs b/Mango.Nop.Data/Repositories/MgDalBase.cs
similarity index 75%
rename from Mango.Nop.Core/Repositories/MgDalBase.cs
rename to Mango.Nop.Data/Repositories/MgDalBase.cs
index 14700c3..80b4491 100644
--- a/Mango.Nop.Core/Repositories/MgDalBase.cs
+++ b/Mango.Nop.Data/Repositories/MgDalBase.cs
@@ -1,14 +1,12 @@
 using System.Linq.Expressions;
 using System.Transactions;
-using Mango.Nop.Core.Interfaces;
+using Mango.Nop.Data.Interfaces;
 using Nop.Core;
 using Nop.Core.Caching;
 using Nop.Core.Configuration;
 using Nop.Core.Events;
-using Nop.Data;
-using Nop.Data.DataProviders;
 
-namespace Mango.Nop.Core.Repositories;
+namespace Mango.Nop.Data.Repositories;
 
 public abstract class MgDalBase<TDbContext> : IMgDalBase<TDbContext> where TDbContext : IMgDbContextBase
 {
diff --git a/Mango.Nop.Core/Repositories/MgDbContextBase.cs b/Mango.Nop.Data/Repositories/MgDbContextBase.cs
similarity index 98%
rename from Mango.Nop.Core/Repositories/MgDbContextBase.cs
rename to Mango.Nop.Data/Repositories/MgDbContextBase.cs
index d867a55..a483ed5 100644
--- a/Mango.Nop.Core/Repositories/MgDbContextBase.cs
+++ b/Mango.Nop.Data/Repositories/MgDbContextBase.cs
@@ -3,15 +3,15 @@ using AyCode.Core.Consts;
 using AyCode.Core.Helpers;
 using AyCode.Core.Loggers;
 using AyCode.Utils.Extensions;
-using Mango.Nop.Core.Interfaces;
 using Mango.Nop.Core.Loggers;
 using Mango.Nop.Core.Services;
+using Mango.Nop.Data.Interfaces;
 using Nop.Core.Caching;
 using Nop.Core.Domain.Catalog;
 using Nop.Core.Domain.Orders;
 using Nop.Data;
 
-namespace Mango.Nop.Core.Repositories;
+namespace Mango.Nop.Data.Repositories;
 
 
 public abstract class MgDbContextBase : IMgDbContextBase
diff --git a/Mango.Nop.Core/Repositories/MgDbTableBase.cs b/Mango.Nop.Data/Repositories/MgDbTableBase.cs
similarity index 98%
rename from Mango.Nop.Core/Repositories/MgDbTableBase.cs
rename to Mango.Nop.Data/Repositories/MgDbTableBase.cs
index 951f463..fe57fd6 100644
--- a/Mango.Nop.Core/Repositories/MgDbTableBase.cs
+++ b/Mango.Nop.Data/Repositories/MgDbTableBase.cs
@@ -1,7 +1,7 @@
 using AyCode.Interfaces.Entities;
 using AyCode.Interfaces.TimeStampInfo;
-using Mango.Nop.Core.Interfaces;
 using Mango.Nop.Core.Loggers;
+using Mango.Nop.Data.Interfaces;
 using Nop.Core;
 using Nop.Core.Caching;
 using Nop.Core.Configuration;
@@ -11,7 +11,7 @@ using Nop.Core.Events;
 using Nop.Data;
 using System.Linq.Expressions;
 
-namespace Mango.Nop.Core.Repositories;
+namespace Mango.Nop.Data.Repositories;
 
 public abstract class MgDbTableBase<TEntity>(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings)
     : EntityRepository<TEntity>(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings), IMgDbTableBase where TEntity : BaseEntity
diff --git a/Mango.Nop.Core/Repositories/MgDtoDbTableBase.cs b/Mango.Nop.Data/Repositories/MgDtoDbTableBase.cs
similarity index 99%
rename from Mango.Nop.Core/Repositories/MgDtoDbTableBase.cs
rename to Mango.Nop.Data/Repositories/MgDtoDbTableBase.cs
index 860e09d..a38ee2c 100644
--- a/Mango.Nop.Core/Repositories/MgDtoDbTableBase.cs
+++ b/Mango.Nop.Data/Repositories/MgDtoDbTableBase.cs
@@ -8,7 +8,7 @@ using Nop.Core.Domain.Orders;
 using Nop.Core.Events;
 using Nop.Data;
 
-namespace Mango.Nop.Core.Repositories;
+namespace Mango.Nop.Data.Repositories;
 
 public abstract class MgDtoDbTableBase<TDtoEntity, TMainEntity> : MgDbTableBase<TDtoEntity> where TDtoEntity : BaseEntity/*, IMgModelDtoBase<TDtoEntity>*/ where TMainEntity : BaseEntity
 {
diff --git a/Mango.Nop.Services/Loggers/NopLogWriter.cs b/Mango.Nop.Services/Loggers/NopLogWriter.cs
index f989eb9..10379ae 100644
--- a/Mango.Nop.Services/Loggers/NopLogWriter.cs
+++ b/Mango.Nop.Services/Loggers/NopLogWriter.cs
@@ -6,7 +6,7 @@ using LinqToDB;
 using LinqToDB.Data;
 using LinqToDB.DataProvider;
 using LinqToDB.DataProvider.SqlServer;
-using Mango.Nop.Core.Repositories;
+using Mango.Nop.Data.Repositories;
 using Nop.Core;
 using Nop.Core.Domain.Common;
 using Nop.Core.Domain.Customers;
diff --git a/Mango.Nop.Services/Mango.Nop.Services.csproj b/Mango.Nop.Services/Mango.Nop.Services.csproj
index 8a5d31f..650482f 100644
--- a/Mango.Nop.Services/Mango.Nop.Services.csproj
+++ b/Mango.Nop.Services/Mango.Nop.Services.csproj
@@ -18,6 +18,7 @@
     <ProjectReference Include="..\..\..\..\FruitBank\Libraries\Nop.Services\Nop.Services.csproj" />
     <ProjectReference Include="..\..\..\..\FruitBank\Presentation\Nop.Web.Framework\Nop.Web.Framework.csproj" />
     <ProjectReference Include="..\Mango.Nop.Core\Mango.Nop.Core.csproj" />
+    <ProjectReference Include="..\Mango.Nop.Data\Mango.Nop.Data.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Mango.Nop.Services/MgEventConsumerBase.cs b/Mango.Nop.Services/MgEventConsumerBase.cs
index ba55dae..1d023f0 100644
--- a/Mango.Nop.Services/MgEventConsumerBase.cs
+++ b/Mango.Nop.Services/MgEventConsumerBase.cs
@@ -1,7 +1,8 @@
 using AyCode.Core.Loggers;
 using Mango.Nop.Core.Interfaces;
 using Mango.Nop.Core.Loggers;
-using Mango.Nop.Core.Repositories;
+using Mango.Nop.Data.Interfaces;
+using Mango.Nop.Data.Repositories;
 using Microsoft.AspNetCore.Http;
 using Nop.Core.Domain.Catalog;
 using Nop.Core.Domain.Customers;