diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs
index 13769570..c8905c9b 100644
--- a/Lux.API/Controllers/WindowController.cs
+++ b/Lux.API/Controllers/WindowController.cs
@@ -1,6 +1,6 @@
-using EgwMultiEngineManager;
+using EgwCoreLib.Lux.Data.Services;
+using EgwMultiEngineManager;
 using Lux.Data;
-using Lux.Data.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj
index 630e7d47..b39e5389 100644
--- a/Lux.API/Lux.API.csproj
+++ b/Lux.API/Lux.API.csproj
@@ -65,7 +65,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj" />
-        <ProjectReference Include="..\Lux.Data\Lux.Data.csproj" />
+        <ProjectReference Include="..\Lux.Data\EgwCoreLib.Lux.Data.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Lux.API/Program.cs b/Lux.API/Program.cs
index 84ba81f1..56ca5402 100644
--- a/Lux.API/Program.cs
+++ b/Lux.API/Program.cs
@@ -1,6 +1,6 @@
+using EgwCoreLib.Lux.Data.Services;
 using EgwMultiEngineManager;
 using Lux.API.Services;
-using Lux.Data.Services;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.OpenApi.Models;
 using NLog;
diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs
index 16de2309..50d0c6ba 100644
--- a/Lux.API/Services/ExternalMessageProcessor.cs
+++ b/Lux.API/Services/ExternalMessageProcessor.cs
@@ -1,6 +1,6 @@
-using EgwMultiEngineManager;
+using EgwCoreLib.Lux.Data.Services;
+using EgwMultiEngineManager;
 using Lux.Data;
-using Lux.Data.Services;
 using Newtonsoft.Json;
 using NLog;
 using StackExchange.Redis;
diff --git a/Lux.API/Services/RedisSubscriberService.cs b/Lux.API/Services/RedisSubscriberService.cs
index b0c7412e..dcd82a60 100644
--- a/Lux.API/Services/RedisSubscriberService.cs
+++ b/Lux.API/Services/RedisSubscriberService.cs
@@ -1,5 +1,5 @@
-using Lux.Data;
-using Lux.Data.Services;
+using EgwCoreLib.Lux.Data.Services;
+using Lux.Data;
 
 namespace Lux.API.Services
 {
diff --git a/Lux.All.sln b/Lux.All.sln
index 874bc69c..8363c9b0 100644
--- a/Lux.All.sln
+++ b/Lux.All.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.14.36203.30
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwCoreLib.Lux.Core", "EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj", "{CCE87D58-1E6C-47B3-A28C-65BFCF5F1D0C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lux.Data", "Lux.Data\Lux.Data.csproj", "{9BA9FBAC-0D76-41CA-9970-A8DB982CC5F0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwCoreLib.Lux.Data", "Lux.Data\EgwCoreLib.Lux.Data.csproj", "{9BA9FBAC-0D76-41CA-9970-A8DB982CC5F0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.csproj", "{E94496AD-22BB-4443-9A81-11D19AFBE0A3}"
 EndProject
diff --git a/Lux.Data/AdminContext.cs b/Lux.Data/AdminContext.cs
index 1be804bc..7c2d437b 100644
--- a/Lux.Data/AdminContext.cs
+++ b/Lux.Data/AdminContext.cs
@@ -1,4 +1,4 @@
-using Lux.Data.DbModel;
+using EgwCoreLib.Lux.Data.DbModel;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using System;
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data
+namespace EgwCoreLib.Lux.Data
 {
     public partial class AdminContext : DbContext
     {
diff --git a/Lux.Data/Controllers/LuxController.cs b/Lux.Data/Controllers/LuxController.cs
index 8a3e31b6..48d55960 100644
--- a/Lux.Data/Controllers/LuxController.cs
+++ b/Lux.Data/Controllers/LuxController.cs
@@ -1,4 +1,4 @@
-using Lux.Data.DbModel;
+using EgwCoreLib.Lux.Data.DbModel;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using NLog;
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 
-namespace Lux.Data.Controllers
+namespace EgwCoreLib.Lux.Data.Controllers
 {
     public class LuxController
     {
@@ -128,7 +128,7 @@ namespace Lux.Data.Controllers
                         currRec.Description = newRec.Description;
                         currRec.IsService = newRec.IsService;
                         currRec.Margin = newRec.Margin;
-                        dbCtx.Entry(currRec).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+                        dbCtx.Entry(currRec).State = EntityState.Modified;
                     }
                     // se mancasse --> aggiungo
                     else
diff --git a/Lux.Data/DataLayerContext.cs b/Lux.Data/DataLayerContext.cs
index 811fbc67..90cdcf13 100644
--- a/Lux.Data/DataLayerContext.cs
+++ b/Lux.Data/DataLayerContext.cs
@@ -1,4 +1,4 @@
-using Lux.Data.DbModel;
+using EgwCoreLib.Lux.Data.DbModel;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using NLog;
@@ -8,12 +8,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data
+namespace EgwCoreLib.Lux.Data
 {
     public partial class DataLayerContext: DbContext
     {
 
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private static Logger Log = LogManager.GetCurrentClassLogger();
 
         private IConfiguration _configuration;
 
diff --git a/Lux.Data/DbAdmin.cs b/Lux.Data/DbAdmin.cs
index c63d594a..3349f5a1 100644
--- a/Lux.Data/DbAdmin.cs
+++ b/Lux.Data/DbAdmin.cs
@@ -6,13 +6,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data
+namespace EgwCoreLib.Lux.Data
 {
     public class DbAdmin : IDisposable
     {
         #region Private Fields
 
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private static Logger Log = LogManager.GetCurrentClassLogger();
 
         #endregion Private Fields
 
diff --git a/Lux.Data/DbConfig.cs b/Lux.Data/DbConfig.cs
index 507afdcc..9d91849e 100644
--- a/Lux.Data/DbConfig.cs
+++ b/Lux.Data/DbConfig.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data
+namespace EgwCoreLib.Lux.Data
 {
     public class DbConfig
     {
diff --git a/Lux.Data/DbModel/CountersModel.cs b/Lux.Data/DbModel/CountersModel.cs
index 97b1d5bc..ef4de190 100644
--- a/Lux.Data/DbModel/CountersModel.cs
+++ b/Lux.Data/DbModel/CountersModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/CustomerModel.cs b/Lux.Data/DbModel/CustomerModel.cs
index c070699c..0bb9b024 100644
--- a/Lux.Data/DbModel/CustomerModel.cs
+++ b/Lux.Data/DbModel/CustomerModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/DealerModel.cs b/Lux.Data/DbModel/DealerModel.cs
index 934f168a..45678c6c 100644
--- a/Lux.Data/DbModel/DealerModel.cs
+++ b/Lux.Data/DbModel/DealerModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/ItemGroupModel.cs b/Lux.Data/DbModel/ItemGroupModel.cs
index 63942a2d..e4c88aca 100644
--- a/Lux.Data/DbModel/ItemGroupModel.cs
+++ b/Lux.Data/DbModel/ItemGroupModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {    // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
     // </Auto-Generated>
diff --git a/Lux.Data/DbModel/ItemModel.cs b/Lux.Data/DbModel/ItemModel.cs
index 0820c2cd..b3278faa 100644
--- a/Lux.Data/DbModel/ItemModel.cs
+++ b/Lux.Data/DbModel/ItemModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/JobModel.cs b/Lux.Data/DbModel/JobModel.cs
index 1659744d..8d7effef 100644
--- a/Lux.Data/DbModel/JobModel.cs
+++ b/Lux.Data/DbModel/JobModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
 
     [Table("JobList")]
diff --git a/Lux.Data/DbModel/JobRowItemModel.cs b/Lux.Data/DbModel/JobRowItemModel.cs
index 343b752a..015e2173 100644
--- a/Lux.Data/DbModel/JobRowItemModel.cs
+++ b/Lux.Data/DbModel/JobRowItemModel.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     [Table("JobRowItemList")]
     public class JobRowItemModel
diff --git a/Lux.Data/DbModel/JobRowModel.cs b/Lux.Data/DbModel/JobRowModel.cs
index 9679e015..7c885d68 100644
--- a/Lux.Data/DbModel/JobRowModel.cs
+++ b/Lux.Data/DbModel/JobRowModel.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     [Table("JobRowList")]
     public class JobRowModel
diff --git a/Lux.Data/DbModel/MovTypeModel.cs b/Lux.Data/DbModel/MovTypeModel.cs
index 63c5a72e..b580edbc 100644
--- a/Lux.Data/DbModel/MovTypeModel.cs
+++ b/Lux.Data/DbModel/MovTypeModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {    // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
     // </Auto-Generated>
diff --git a/Lux.Data/DbModel/OfferModel.cs b/Lux.Data/DbModel/OfferModel.cs
index cae0c9dd..7a10fde3 100644
--- a/Lux.Data/DbModel/OfferModel.cs
+++ b/Lux.Data/DbModel/OfferModel.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using static EgwCoreLib.Lux.Core.Enum;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/OfferRowModel.cs b/Lux.Data/DbModel/OfferRowModel.cs
index 899a9c72..b65f59f9 100644
--- a/Lux.Data/DbModel/OfferRowModel.cs
+++ b/Lux.Data/DbModel/OfferRowModel.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/OrderModel.cs b/Lux.Data/DbModel/OrderModel.cs
index 6b46943c..50838a11 100644
--- a/Lux.Data/DbModel/OrderModel.cs
+++ b/Lux.Data/DbModel/OrderModel.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using static EgwCoreLib.Lux.Core.Enum;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/OrderRowModel.cs b/Lux.Data/DbModel/OrderRowModel.cs
index d0cc3e69..162720d4 100644
--- a/Lux.Data/DbModel/OrderRowModel.cs
+++ b/Lux.Data/DbModel/OrderRowModel.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/PhaseModel.cs b/Lux.Data/DbModel/PhaseModel.cs
index 7dd3c5fc..4a963625 100644
--- a/Lux.Data/DbModel/PhaseModel.cs
+++ b/Lux.Data/DbModel/PhaseModel.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
 
     [Table("RegPhase")]
diff --git a/Lux.Data/DbModel/ProductionBatchModel.cs b/Lux.Data/DbModel/ProductionBatchModel.cs
index 0bb16fe9..8a333ea2 100644
--- a/Lux.Data/DbModel/ProductionBatchModel.cs
+++ b/Lux.Data/DbModel/ProductionBatchModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/ProductionItemModel.cs b/Lux.Data/DbModel/ProductionItemModel.cs
index 485dd66a..802c0bb2 100644
--- a/Lux.Data/DbModel/ProductionItemModel.cs
+++ b/Lux.Data/DbModel/ProductionItemModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/ProductionItemRowModel.cs b/Lux.Data/DbModel/ProductionItemRowModel.cs
index 9df642b7..0a423ef0 100644
--- a/Lux.Data/DbModel/ProductionItemRowModel.cs
+++ b/Lux.Data/DbModel/ProductionItemRowModel.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     /// <summary>
     /// Tabella delel effettiva righe della fgasi di lavorazione x ogni item da produrre
diff --git a/Lux.Data/DbModel/ResourceModel.cs b/Lux.Data/DbModel/ResourceModel.cs
index 899fb48d..3b8d08e6 100644
--- a/Lux.Data/DbModel/ResourceModel.cs
+++ b/Lux.Data/DbModel/ResourceModel.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     [Table("RegResource")]
     public class ResourceModel
diff --git a/Lux.Data/DbModel/SellingItemModel.cs b/Lux.Data/DbModel/SellingItemModel.cs
index c1ea81ef..9f2d4101 100644
--- a/Lux.Data/DbModel/SellingItemModel.cs
+++ b/Lux.Data/DbModel/SellingItemModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/StockMovModel.cs b/Lux.Data/DbModel/StockMovModel.cs
index 035d871b..7e986260 100644
--- a/Lux.Data/DbModel/StockMovModel.cs
+++ b/Lux.Data/DbModel/StockMovModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/StockStatusModel.cs b/Lux.Data/DbModel/StockStatusModel.cs
index a2087777..15b7d604 100644
--- a/Lux.Data/DbModel/StockStatusModel.cs
+++ b/Lux.Data/DbModel/StockStatusModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/SupplierModel.cs b/Lux.Data/DbModel/SupplierModel.cs
index 817cec8f..a43db096 100644
--- a/Lux.Data/DbModel/SupplierModel.cs
+++ b/Lux.Data/DbModel/SupplierModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/TagsModel.cs b/Lux.Data/DbModel/TagsModel.cs
index 279441a4..6e2fbd5d 100644
--- a/Lux.Data/DbModel/TagsModel.cs
+++ b/Lux.Data/DbModel/TagsModel.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document
diff --git a/Lux.Data/DbModel/UserPrivModel.cs b/Lux.Data/DbModel/UserPrivModel.cs
index ff015921..fa2a83c6 100644
--- a/Lux.Data/DbModel/UserPrivModel.cs
+++ b/Lux.Data/DbModel/UserPrivModel.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.DbModel
+namespace EgwCoreLib.Lux.Data.DbModel
 {
     /// <summary>
     /// Tabella dei USER di MySql
diff --git a/Lux.Data/Lux.Data.csproj b/Lux.Data/EgwCoreLib.Lux.Data.csproj
similarity index 100%
rename from Lux.Data/Lux.Data.csproj
rename to Lux.Data/EgwCoreLib.Lux.Data.csproj
diff --git a/Lux.Data/Migrations/20250707171119_InitDb.Designer.cs b/Lux.Data/Migrations/20250707171119_InitDb.Designer.cs
index 2cfb76d5..c2fa5547 100644
--- a/Lux.Data/Migrations/20250707171119_InitDb.Designer.cs
+++ b/Lux.Data/Migrations/20250707171119_InitDb.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Lux.Data;
+using EgwCoreLib.Lux.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Lux.Data/Migrations/DataLayerContextModelSnapshot.cs b/Lux.Data/Migrations/DataLayerContextModelSnapshot.cs
index 2aeb3532..93c6d258 100644
--- a/Lux.Data/Migrations/DataLayerContextModelSnapshot.cs
+++ b/Lux.Data/Migrations/DataLayerContextModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Lux.Data;
+using EgwCoreLib.Lux.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Lux.Data/ModelBuilderExtensions.cs b/Lux.Data/ModelBuilderExtensions.cs
index 9338fa0c..9509be20 100644
--- a/Lux.Data/ModelBuilderExtensions.cs
+++ b/Lux.Data/ModelBuilderExtensions.cs
@@ -1,4 +1,4 @@
-using Lux.Data.DbModel;
+using EgwCoreLib.Lux.Data.DbModel;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data
+namespace EgwCoreLib.Lux.Data
 {
     public static class ModelBuilderExtensions
     {
diff --git a/Lux.Data/Services/BaseServ.cs b/Lux.Data/Services/BaseServ.cs
index d6545689..4823706f 100644
--- a/Lux.Data/Services/BaseServ.cs
+++ b/Lux.Data/Services/BaseServ.cs
@@ -10,7 +10,7 @@ using System.Runtime;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.Services
+namespace EgwCoreLib.Lux.Data.Services
 {
     public class BaseServ
     {
diff --git a/Lux.Data/Services/DataLayerServices.cs b/Lux.Data/Services/DataLayerServices.cs
index 02566b63..a3fa3bd1 100644
--- a/Lux.Data/Services/DataLayerServices.cs
+++ b/Lux.Data/Services/DataLayerServices.cs
@@ -1,4 +1,5 @@
-using Lux.Data.DbModel;
+using EgwCoreLib.Lux.Data.Controllers;
+using EgwCoreLib.Lux.Data.DbModel;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using NLog;
@@ -11,7 +12,7 @@ using System.Text;
 using System.Threading.Tasks;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 
-namespace Lux.Data.Services
+namespace EgwCoreLib.Lux.Data.Services
 {
     public class DataLayerServices : BaseServ
     {
@@ -27,7 +28,7 @@ namespace Lux.Data.Services
             }
             else
             {
-                dbController = new Controllers.LuxController();
+                dbController = new LuxController();
                 //dbController = new Controllers.LuxController(configuration);
                 StringBuilder sb = new StringBuilder();
                 sb.AppendLine($"DataLayerServices | LuxController OK");
@@ -39,7 +40,7 @@ namespace Lux.Data.Services
 
         #region Public Properties
 
-        public static Controllers.LuxController dbController { get; set; } = null!;
+        public static LuxController dbController { get; set; } = null!;
 
         #endregion Public Properties
 
diff --git a/Lux.Data/Services/IRedisService.cs b/Lux.Data/Services/IRedisService.cs
index ea03c9e8..11ee11b5 100644
--- a/Lux.Data/Services/IRedisService.cs
+++ b/Lux.Data/Services/IRedisService.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.Services
+namespace EgwCoreLib.Lux.Data.Services
 {
     /// <summary>
     /// Interfaccia servizio REDIS x pub/sub e caching
diff --git a/Lux.Data/Services/ImageCacheService.cs b/Lux.Data/Services/ImageCacheService.cs
index 02935041..2871e639 100644
--- a/Lux.Data/Services/ImageCacheService.cs
+++ b/Lux.Data/Services/ImageCacheService.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.Services
+namespace EgwCoreLib.Lux.Data.Services
 {
     public class ImageCacheService
     {
diff --git a/Lux.Data/Services/RedisService.cs b/Lux.Data/Services/RedisService.cs
index a042fe15..3265a1f3 100644
--- a/Lux.Data/Services/RedisService.cs
+++ b/Lux.Data/Services/RedisService.cs
@@ -10,7 +10,7 @@ using System.Runtime;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.Services
+namespace EgwCoreLib.Lux.Data.Services
 {
     /// <summary>
     /// Implementazione interfaccia REDIS:
diff --git a/Lux.Data/Services/RedisSubscriptionManager.cs b/Lux.Data/Services/RedisSubscriptionManager.cs
index 714cbaf1..17a1b628 100644
--- a/Lux.Data/Services/RedisSubscriptionManager.cs
+++ b/Lux.Data/Services/RedisSubscriptionManager.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Lux.Data.Services
+namespace EgwCoreLib.Lux.Data.Services
 {
     public class RedisSubscriptionManager
     {
diff --git a/Lux.UI/Components/Compo/OfferCheck.razor b/Lux.UI/Components/Compo/OfferCheck.razor
index 57dca7cd..397890d0 100644
--- a/Lux.UI/Components/Compo/OfferCheck.razor
+++ b/Lux.UI/Components/Compo/OfferCheck.razor
@@ -1,4 +1,5 @@
-<div class="alert alert-warning text-center display-4">
+@using EgwCoreLib.Lux.Data.DbModel
+<div class="alert alert-warning text-center display-4">
     display check finali
     <button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoCancel"><i class="fa-solid fa-arrow-rotate-right"></i></button>
 </div>
diff --git a/Lux.UI/Components/Compo/OfferMan.razor.cs b/Lux.UI/Components/Compo/OfferMan.razor.cs
index c89fa800..c7c8e64f 100644
--- a/Lux.UI/Components/Compo/OfferMan.razor.cs
+++ b/Lux.UI/Components/Compo/OfferMan.razor.cs
@@ -1,5 +1,5 @@
-using Lux.Data.DbModel;
-using Lux.Data.Services;
+using EgwCoreLib.Lux.Data.DbModel;
+using EgwCoreLib.Lux.Data.Services;
 using Microsoft.AspNetCore.Components;
 using System.Threading.Tasks;
 
diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor.cs b/Lux.UI/Components/Compo/OfferRowMan.razor.cs
index 1c270fd1..dffb3272 100644
--- a/Lux.UI/Components/Compo/OfferRowMan.razor.cs
+++ b/Lux.UI/Components/Compo/OfferRowMan.razor.cs
@@ -1,5 +1,5 @@
-using Lux.Data.DbModel;
-using Lux.Data.Services;
+using EgwCoreLib.Lux.Data.DbModel;
+using EgwCoreLib.Lux.Data.Services;
 using Microsoft.AspNetCore.Components;
 using static EgwCoreLib.Lux.Core.Enum;
 
diff --git a/Lux.UI/Components/Pages/Offers.razor.cs b/Lux.UI/Components/Pages/Offers.razor.cs
index 95912284..80c55acf 100644
--- a/Lux.UI/Components/Pages/Offers.razor.cs
+++ b/Lux.UI/Components/Pages/Offers.razor.cs
@@ -1,6 +1,6 @@
+using EgwCoreLib.Lux.Data.DbModel;
+using EgwCoreLib.Lux.Data.Services;
 using EgwCoreLib.Razor;
-using Lux.Data.DbModel;
-using Lux.Data.Services;
 using Microsoft.AspNetCore.Components;
 using NLog.LayoutRenderers;
 
diff --git a/Lux.UI/Components/Pages/ResetCache.razor b/Lux.UI/Components/Pages/ResetCache.razor
index d88232a4..7c1731e9 100644
--- a/Lux.UI/Components/Pages/ResetCache.razor
+++ b/Lux.UI/Components/Pages/ResetCache.razor
@@ -1,4 +1,5 @@
 @page "/ResetCache"
+@using EgwCoreLib.Lux.Data.Services
 @using Lux.Data.Services
 
 <LoadingData Title="Resetting Cache..." DisplaySize="LoadingData.CtrlSize.Large" DisplayMode="LoadingData.SpinMode.BounceLine"></LoadingData>
diff --git a/Lux.UI/Components/_Imports.razor b/Lux.UI/Components/_Imports.razor
index 0cf13ab0..f3babb2a 100644
--- a/Lux.UI/Components/_Imports.razor
+++ b/Lux.UI/Components/_Imports.razor
@@ -9,9 +9,9 @@
 @using Microsoft.JSInterop
 @using EgwCoreLib.Razor
 @using EgwCoreLib.Utils
-@using Lux.Data
-@using Lux.Data.Controllers
-@using Lux.Data.DbModel
+@using EgwCoreLib.Lux.Data
+@using EgwCoreLib.Lux.Data.Controllers
+@using EgwCoreLib.Lux.Data.DbModel
 @using Lux.UI
 @using Lux.UI.Client
 @using Lux.UI.Components
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj
index 1f500878..4fe31ff0 100644
--- a/Lux.UI/Lux.UI.csproj
+++ b/Lux.UI/Lux.UI.csproj
@@ -31,7 +31,7 @@
     <ItemGroup>
         <ProjectReference Include="..\EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj" />
         <ProjectReference Include="..\EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj" />
-        <ProjectReference Include="..\Lux.Data\Lux.Data.csproj" />
+        <ProjectReference Include="..\Lux.Data\EgwCoreLib.Lux.Data.csproj" />
         <ProjectReference Include="..\Lux.UI.Client\Lux.UI.Client.csproj" />
     </ItemGroup>
 
diff --git a/Lux.UI/Program.cs b/Lux.UI/Program.cs
index 1645bab6..1051d866 100644
--- a/Lux.UI/Program.cs
+++ b/Lux.UI/Program.cs
@@ -1,4 +1,4 @@
-using Lux.Data.Services;
+using EgwCoreLib.Lux.Data.Services;
 using Lux.UI.Client.Pages;
 using Lux.UI.Components;
 using Lux.UI.Components.Account;
diff --git a/TestApp/TestApp.csproj b/TestApp/TestApp.csproj
index 967d7cee..d18a3b2a 100644
--- a/TestApp/TestApp.csproj
+++ b/TestApp/TestApp.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\EgwCoreLib.Lux.Core\EgwCoreLib.Lux.Core.csproj" />
-    <ProjectReference Include="..\Lux.Data\Lux.Data.csproj" />
+    <ProjectReference Include="..\EgwCoreLib.Lux.Data\Lux.Data.csproj" />
   </ItemGroup>
 
 </Project>