diff --git a/src/VirtoCommerce.XCatalog.Core/Models/SearchProductResponse.cs b/src/VirtoCommerce.XCatalog.Core/Models/SearchProductResponse.cs
index 86480a6..19ee14b 100644
--- a/src/VirtoCommerce.XCatalog.Core/Models/SearchProductResponse.cs
+++ b/src/VirtoCommerce.XCatalog.Core/Models/SearchProductResponse.cs
@@ -2,7 +2,7 @@
 using VirtoCommerce.CoreModule.Core.Currency;
 using VirtoCommerce.StoreModule.Core.Model;
 using VirtoCommerce.Xapi.Core.Models.Facets;
-using VirtoCommerce.XDigitalCatalog.Queries;
+using VirtoCommerce.XCatalog.Core.Queries;
 
 namespace VirtoCommerce.XCatalog.Core.Models
 {
diff --git a/src/VirtoCommerce.XCatalog.Core/Queries/ChildCategoriesQuery.cs b/src/VirtoCommerce.XCatalog.Core/Queries/ChildCategoriesQuery.cs
index 8fdde19..adef48d 100644
--- a/src/VirtoCommerce.XCatalog.Core/Queries/ChildCategoriesQuery.cs
+++ b/src/VirtoCommerce.XCatalog.Core/Queries/ChildCategoriesQuery.cs
@@ -2,9 +2,8 @@
 using GraphQL;
 using GraphQL.Types;
 using VirtoCommerce.XCatalog.Core.Models;
-using VirtoCommerce.XCatalog.Core.Queries;
 
-namespace VirtoCommerce.XDigitalCatalog.Queries;
+namespace VirtoCommerce.XCatalog.Core.Queries;
 
 public class ChildCategoriesQuery : CatalogQueryBase<ChildCategoriesQueryResponse>
 {
diff --git a/src/VirtoCommerce.XCatalog.Core/Queries/SearchProductQuery.cs b/src/VirtoCommerce.XCatalog.Core/Queries/SearchProductQuery.cs
index e6388c0..0208604 100644
--- a/src/VirtoCommerce.XCatalog.Core/Queries/SearchProductQuery.cs
+++ b/src/VirtoCommerce.XCatalog.Core/Queries/SearchProductQuery.cs
@@ -8,10 +8,9 @@
 using VirtoCommerce.Xapi.Core.Extensions;
 using VirtoCommerce.Xapi.Core.Infrastructure;
 using VirtoCommerce.XCatalog.Core.Models;
-using VirtoCommerce.XCatalog.Core.Queries;
 using static VirtoCommerce.Xapi.Core.ModuleConstants;
 
-namespace VirtoCommerce.XDigitalCatalog.Queries
+namespace VirtoCommerce.XCatalog.Core.Queries
 {
     public class SearchProductQuery : CatalogQueryBase<SearchProductResponse>, ISearchQuery
     {
diff --git a/src/VirtoCommerce.XCatalog.Data/Mapping/ProductMappingProfile.cs b/src/VirtoCommerce.XCatalog.Data/Mapping/ProductMappingProfile.cs
index 9324a28..f512f00 100644
--- a/src/VirtoCommerce.XCatalog.Data/Mapping/ProductMappingProfile.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Mapping/ProductMappingProfile.cs
@@ -13,7 +13,6 @@
 using VirtoCommerce.Xapi.Core.Models;
 using VirtoCommerce.XCatalog.Core.Models;
 using VirtoCommerce.XCatalog.Core.Queries;
-using VirtoCommerce.XDigitalCatalog.Queries;
 using ProductPrice = VirtoCommerce.Xapi.Core.Models.ProductPrice;
 
 namespace VirtoCommerce.XCatalog.Data.Mapping
diff --git a/src/VirtoCommerce.XCatalog.Data/Middlewares/EvalProductsDiscountsMiddleware.cs b/src/VirtoCommerce.XCatalog.Data/Middlewares/EvalProductsDiscountsMiddleware.cs
index 203d428..47bd370 100644
--- a/src/VirtoCommerce.XCatalog.Data/Middlewares/EvalProductsDiscountsMiddleware.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Middlewares/EvalProductsDiscountsMiddleware.cs
@@ -9,7 +9,7 @@
 using VirtoCommerce.Platform.Core.Modularity;
 using VirtoCommerce.Xapi.Core.Pipelines;
 using VirtoCommerce.XCatalog.Core.Models;
-using VirtoCommerce.XDigitalCatalog.Queries;
+using VirtoCommerce.XCatalog.Core.Queries;
 
 namespace VirtoCommerce.XCatalog.Data.Middlewares
 {
diff --git a/src/VirtoCommerce.XCatalog.Data/Middlewares/EvalProductsPricesMiddleware.cs b/src/VirtoCommerce.XCatalog.Data/Middlewares/EvalProductsPricesMiddleware.cs
index 20f3646..9373f43 100644
--- a/src/VirtoCommerce.XCatalog.Data/Middlewares/EvalProductsPricesMiddleware.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Middlewares/EvalProductsPricesMiddleware.cs
@@ -12,7 +12,7 @@
 using VirtoCommerce.Xapi.Core.Models;
 using VirtoCommerce.Xapi.Core.Pipelines;
 using VirtoCommerce.XCatalog.Core.Models;
-using VirtoCommerce.XDigitalCatalog.Queries;
+using VirtoCommerce.XCatalog.Core.Queries;
 
 namespace VirtoCommerce.XCatalog.Data.Middlewares
 {
diff --git a/src/VirtoCommerce.XCatalog.Data/Queries/ChildCategoriesQueryBuilder.cs b/src/VirtoCommerce.XCatalog.Data/Queries/ChildCategoriesQueryBuilder.cs
index ed01a5d..2c357b5 100644
--- a/src/VirtoCommerce.XCatalog.Data/Queries/ChildCategoriesQueryBuilder.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Queries/ChildCategoriesQueryBuilder.cs
@@ -13,7 +13,6 @@
 using VirtoCommerce.XCatalog.Core.Models;
 using VirtoCommerce.XCatalog.Core.Queries;
 using VirtoCommerce.XCatalog.Core.Schemas;
-using VirtoCommerce.XDigitalCatalog.Queries;
 
 namespace VirtoCommerce.XCatalog.Data.Queries;
 
diff --git a/src/VirtoCommerce.XCatalog.Data/Queries/ChildCategoriesQueryHandler.cs b/src/VirtoCommerce.XCatalog.Data/Queries/ChildCategoriesQueryHandler.cs
index 58e34ba..edc604b 100644
--- a/src/VirtoCommerce.XCatalog.Data/Queries/ChildCategoriesQueryHandler.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Queries/ChildCategoriesQueryHandler.cs
@@ -9,7 +9,7 @@
 using VirtoCommerce.Xapi.Core.Infrastructure;
 using VirtoCommerce.Xapi.Core.Models.Facets;
 using VirtoCommerce.XCatalog.Core.Models;
-using VirtoCommerce.XDigitalCatalog.Queries;
+using VirtoCommerce.XCatalog.Core.Queries;
 
 namespace VirtoCommerce.XCatalog.Data.Queries;
 
diff --git a/src/VirtoCommerce.XCatalog.Data/Queries/SearchCategoryQueryHandler.cs b/src/VirtoCommerce.XCatalog.Data/Queries/SearchCategoryQueryHandler.cs
index 3ee2d90..61a8341 100644
--- a/src/VirtoCommerce.XCatalog.Data/Queries/SearchCategoryQueryHandler.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Queries/SearchCategoryQueryHandler.cs
@@ -16,7 +16,6 @@
 using VirtoCommerce.XCatalog.Core.Models;
 using VirtoCommerce.XCatalog.Core.Queries;
 using VirtoCommerce.XCatalog.Data.Index;
-using VirtoCommerce.XDigitalCatalog.Queries;
 
 namespace VirtoCommerce.XCatalog.Data.Queries
 {
diff --git a/src/VirtoCommerce.XCatalog.Data/Queries/SearchProductQueryBuilder.cs b/src/VirtoCommerce.XCatalog.Data/Queries/SearchProductQueryBuilder.cs
index ec0fb64..c1362c2 100644
--- a/src/VirtoCommerce.XCatalog.Data/Queries/SearchProductQueryBuilder.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Queries/SearchProductQueryBuilder.cs
@@ -9,8 +9,8 @@
 using VirtoCommerce.Xapi.Core.Extensions;
 using VirtoCommerce.Xapi.Core.Helpers;
 using VirtoCommerce.XCatalog.Core.Models;
+using VirtoCommerce.XCatalog.Core.Queries;
 using VirtoCommerce.XCatalog.Core.Schemas;
-using VirtoCommerce.XDigitalCatalog.Queries;
 using static VirtoCommerce.Xapi.Core.ModuleConstants;
 
 namespace VirtoCommerce.XCatalog.Data.Queries
diff --git a/src/VirtoCommerce.XCatalog.Data/Queries/SearchProductQueryHandler.cs b/src/VirtoCommerce.XCatalog.Data/Queries/SearchProductQueryHandler.cs
index bd93d2b..7e076ff 100644
--- a/src/VirtoCommerce.XCatalog.Data/Queries/SearchProductQueryHandler.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Queries/SearchProductQueryHandler.cs
@@ -18,7 +18,6 @@
 using VirtoCommerce.XCatalog.Core.Models;
 using VirtoCommerce.XCatalog.Core.Queries;
 using VirtoCommerce.XCatalog.Data.Index;
-using VirtoCommerce.XDigitalCatalog.Queries;
 
 namespace VirtoCommerce.XCatalog.Data.Queries
 {
diff --git a/src/VirtoCommerce.XCatalog.Data/Queries/SearchPropertiesQueryHandler.cs b/src/VirtoCommerce.XCatalog.Data/Queries/SearchPropertiesQueryHandler.cs
index e428b45..797518c 100644
--- a/src/VirtoCommerce.XCatalog.Data/Queries/SearchPropertiesQueryHandler.cs
+++ b/src/VirtoCommerce.XCatalog.Data/Queries/SearchPropertiesQueryHandler.cs
@@ -10,7 +10,7 @@
 using VirtoCommerce.XCatalog.Core.Queries;
 using VirtoCommerce.XCatalog.Data.Services;
 
-namespace VirtoCommerce.XDigitalCatalog.Queries
+namespace VirtoCommerce.XCatalog.Data.Queries
 {
     public class SearchPropertiesQueryHandler : IRequestHandler<SearchPropertiesQuery, SearchPropertiesResponse>
     {
diff --git a/tests/VirtoCommerce.XCatalog.Tests/Middlewares/EvalProductsTaxMiddlewareTest.cs b/tests/VirtoCommerce.XCatalog.Tests/Middlewares/EvalProductsTaxMiddlewareTest.cs
index 3f89f1a..02adc3b 100644
--- a/tests/VirtoCommerce.XCatalog.Tests/Middlewares/EvalProductsTaxMiddlewareTest.cs
+++ b/tests/VirtoCommerce.XCatalog.Tests/Middlewares/EvalProductsTaxMiddlewareTest.cs
@@ -13,8 +13,8 @@
 using VirtoCommerce.Xapi.Core.Models;
 using VirtoCommerce.Xapi.Core.Pipelines;
 using VirtoCommerce.XCatalog.Core.Models;
+using VirtoCommerce.XCatalog.Core.Queries;
 using VirtoCommerce.XCatalog.Data.Middlewares;
-using VirtoCommerce.XDigitalCatalog.Queries;
 using Xunit;
 
 namespace VirtoCommerce.XCatalog.Tests.Middlewares