diff --git a/Directory.Packages.props b/Directory.Packages.props
index 04cf0e7..710bf12 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -8,6 +8,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
+    <PackageVersion Include="Egw.Data" Version="2.8.9.716" />
     <PackageVersion Include="Egw.Window.Data" Version="2.8.1.2611" />
     <PackageVersion Include="EgwCoreLib.Lux.Core" Version="1.0.2603.2112" />
     <PackageVersion Include="EgwCoreLib.Lux.Data" Version="1.0.2603.2112" />
diff --git a/Test.UI/Components/Pages/BaseEdit.razor.cs b/Test.UI/Components/Pages/BaseEdit.razor.cs
index a521ac0..0264175 100644
--- a/Test.UI/Components/Pages/BaseEdit.razor.cs
+++ b/Test.UI/Components/Pages/BaseEdit.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using EgwCoreLib.Lux.Core;
 using EgwCoreLib.Lux.Core.RestPayload;
 using EgwCoreLib.Lux.Data.Services;
diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs
index c3b41af..f0a426e 100644
--- a/Test.UI/Components/Pages/EditJWD.razor.cs
+++ b/Test.UI/Components/Pages/EditJWD.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using EgwCoreLib.Lux.Core;
 using EgwCoreLib.Lux.Core.RestPayload;
 using EgwCoreLib.Lux.Data.DbModel.Config;
diff --git a/Test.UI/Components/Pages/Home.razor.cs b/Test.UI/Components/Pages/Home.razor.cs
index 20891c5..5178221 100644
--- a/Test.UI/Components/Pages/Home.razor.cs
+++ b/Test.UI/Components/Pages/Home.razor.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Components;
 using Newtonsoft.Json;
 using WebWindowConfigurator;
 using WebWindowComplex;
-using Egw.Window.Data;
+using Egw.Data.Window;
 using WebWindowComplex.DTO;
 using WebWindowConfigurator.DTO;
 
diff --git a/Test.UI/Components/Pages/SimpleEditOld.razor.cs b/Test.UI/Components/Pages/SimpleEditOld.razor.cs
index b0d1169..1a62806 100644
--- a/Test.UI/Components/Pages/SimpleEditOld.razor.cs
+++ b/Test.UI/Components/Pages/SimpleEditOld.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using EgwCoreLib.Lux.Core;
 using EgwCoreLib.Lux.Core.RestPayload;
 using EgwCoreLib.Lux.Data.Services;
diff --git a/Test.UI/Components/Pages/TestError.razor.cs b/Test.UI/Components/Pages/TestError.razor.cs
index 9444e87..932fe38 100644
--- a/Test.UI/Components/Pages/TestError.razor.cs
+++ b/Test.UI/Components/Pages/TestError.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using EgwCoreLib.Lux.Core;
 using EgwCoreLib.Lux.Core.RestPayload;
 using EgwCoreLib.Lux.Data.Services;
diff --git a/WebAedificaConfigurator/WebAedificaConfigurator.csproj b/WebAedificaConfigurator/WebAedificaConfigurator.csproj
index 2ef0cc2..41fcfe5 100644
--- a/WebAedificaConfigurator/WebAedificaConfigurator.csproj
+++ b/WebAedificaConfigurator/WebAedificaConfigurator.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Egw.Window.Data" />
+    <PackageReference Include="Egw.Data" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
   </ItemGroup>
 
diff --git a/WebAedificaConfigurator/WebAedificaMaker.razor.cs b/WebAedificaConfigurator/WebAedificaMaker.razor.cs
index 2f155ee..384c325 100644
--- a/WebAedificaConfigurator/WebAedificaMaker.razor.cs
+++ b/WebAedificaConfigurator/WebAedificaMaker.razor.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -62,7 +62,7 @@ namespace WebAedificaConfigurator
             using var reader = new StreamReader(stream);
             string rawContent = await reader.ReadToEndAsync();
             // parametri richiesta 
-            Args.Add("Mode", $"{(int)Enums.QuestionModes.PREVIEW}");
+            Args.Add("Mode", $"{(int)Egw.Data.Enums.QuestionModes.PREVIEW}");
             Args.Add("Btl", rawContent);
             await EC_OnSave.InvokeAsync(Args);
         }
diff --git a/WebWindowComplex/Compo/AreaSplit.razor.cs b/WebWindowComplex/Compo/AreaSplit.razor.cs
index 6a43079..6086ad6 100644
--- a/WebWindowComplex/Compo/AreaSplit.razor.cs
+++ b/WebWindowComplex/Compo/AreaSplit.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using WebWindowComplex.Models;
 
diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs
index 8622a7a..f2c60ee 100644
--- a/WebWindowComplex/Compo/CardFrame.razor.cs
+++ b/WebWindowComplex/Compo/CardFrame.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using WebWindowComplex.Models;
 
diff --git a/WebWindowComplex/Compo/CardSashGroup.razor.cs b/WebWindowComplex/Compo/CardSashGroup.razor.cs
index ddef48e..ebfc87e 100644
--- a/WebWindowComplex/Compo/CardSashGroup.razor.cs
+++ b/WebWindowComplex/Compo/CardSashGroup.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using WebWindowComplex.Models;
 using static WebWindowComplex.Json.WindowConst;
diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs
index b9d0ea1..7a4e85a 100644
--- a/WebWindowComplex/Compo/CardSplit.razor.cs
+++ b/WebWindowComplex/Compo/CardSplit.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using Newtonsoft.Json.Linq;
 using WebWindowComplex.Models;
diff --git a/WebWindowComplex/DTO/BaseListPayload.cs b/WebWindowComplex/DTO/BaseListPayload.cs
index c6c94f1..2dca813 100644
--- a/WebWindowComplex/DTO/BaseListPayload.cs
+++ b/WebWindowComplex/DTO/BaseListPayload.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
diff --git a/WebWindowComplex/DTO/ProfilePayload.cs b/WebWindowComplex/DTO/ProfilePayload.cs
index 9b04ded..99a3acd 100644
--- a/WebWindowComplex/DTO/ProfilePayload.cs
+++ b/WebWindowComplex/DTO/ProfilePayload.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/WebWindowComplex/DTO/SelectPayload.cs b/WebWindowComplex/DTO/SelectPayload.cs
index 0bc8d6b..6acefa7 100644
--- a/WebWindowComplex/DTO/SelectPayload.cs
+++ b/WebWindowComplex/DTO/SelectPayload.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs
index ef78933..5f367e1 100644
--- a/WebWindowComplex/Json/JsonUtility.cs
+++ b/WebWindowComplex/Json/JsonUtility.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.VisualBasic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs
index 0612210..5ea93b9 100644
--- a/WebWindowComplex/Models/Frame.cs
+++ b/WebWindowComplex/Models/Frame.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using System.ComponentModel.Design;
 using WebWindowComplex.Json;
 using static WebWindowComplex.Json.WindowConst;
diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs
index f72ad81..25545df 100644
--- a/WebWindowComplex/Models/Sash.cs
+++ b/WebWindowComplex/Models/Sash.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Newtonsoft.Json.Linq;
 using System.Data;
 using System.Xml.Serialization;
diff --git a/WebWindowComplex/SerialMan.cs b/WebWindowComplex/SerialMan.cs
index dbec0af..7e42967 100644
--- a/WebWindowComplex/SerialMan.cs
+++ b/WebWindowComplex/SerialMan.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 3cf224a..9a35360 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -1,4 +1,5 @@
-using Egw.Window.Data;
+using Egw.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using Newtonsoft.Json;
 using NLog;
@@ -1024,14 +1025,14 @@ namespace WebWindowComplex
         private Task DoReqTraduzione(List<string> lemmaList)
         {
             Log.Info("Richiesta Traduzione");
-            if(!prevLemmaList.SequenceEqual(lemmaList))
+            if (!prevLemmaList.SequenceEqual(lemmaList))
             {
                 prevLemmaList = lemmaList;
                 return EC_ReqTraduzione.InvokeAsync(lemmaList);
             }
             return null;
         }
-        
+
         /// <summary>
         /// Richiesta update anteprima SVG
         /// </summary>
@@ -1057,7 +1058,7 @@ namespace WebWindowComplex
                     prevJwd = CurrJwd;
                     prevReq = hideHw ? (int)DataReq.ReqSvgNoHw : (int)DataReq.ReqSvgWithHw;
                     Dictionary<string, string> Args = new Dictionary<string, string>();
-                    Args.Add("Mode", $"{(int)Enums.QuestionModes.PREVIEW}");
+                    Args.Add("Mode", $"{(int)Egw.Data.Enums.QuestionModes.PREVIEW}");
                     Args.Add("SerializedData", CalcJwd);
                     await EC_DoUpdate.InvokeAsync(Args);
                 }
@@ -1084,8 +1085,8 @@ namespace WebWindowComplex
                     prevJwd = CurrJwd;
                     prevReq = (int)DataReq.ReqElement;
                     Dictionary<string, string> Args = new Dictionary<string, string>();
-                    Args.Add("Mode", $"{(int)Enums.QuestionModes.HARDWARE}");
-                    Args.Add("SubMode", $"{(int)Enums.QuestionHwSubModes.PROFILEDATAFROMAREA}");
+                    Args.Add("Mode", $"{(int)Egw.Data.Enums.QuestionModes.HARDWARE}");
+                    Args.Add("SubMode", $"{(int)Egw.Data.Window.Enums.QuestionHwSubModes.PROFILEDATAFROMAREA}");
                     Args.Add("SerializedData", CurrJwd);
                     string listGroupId = JsonConvert.SerializeObject(groupIdList);
                     Args.Add("GroupId", listGroupId);
@@ -1116,8 +1117,8 @@ namespace WebWindowComplex
                     prevJwd = CurrJwd;
                     prevReq = (int)DataReq.ReqHwOpt;
                     Dictionary<string, string> Args = new Dictionary<string, string>();
-                    Args.Add("Mode", $"{(int)Enums.QuestionModes.HARDWARE}");
-                    Args.Add("SubMode", $"{(int)Enums.QuestionHwSubModes.HARDWAREOPTIONS}");
+                    Args.Add("Mode", $"{(int)Egw.Data.Enums.QuestionModes.HARDWARE}");
+                    Args.Add("SubMode", $"{(int)Egw.Data.Window.Enums.QuestionHwSubModes.HARDWAREOPTIONS}");
                     Args.Add("SerializedData", CurrJwd);
                     string listGroupId = JsonConvert.SerializeObject(groupIdList);
                     Args.Add("GroupId", listGroupId);
@@ -1148,8 +1149,8 @@ namespace WebWindowComplex
                     prevJwd = CurrJwd;
                     prevReq = (int)DataReq.ReqShape;
                     Dictionary<string, string> Args = new Dictionary<string, string>();
-                    Args.Add("Mode", $"{(int)Enums.QuestionModes.HARDWARE}");
-                    Args.Add("SubMode", $"{(int)Enums.QuestionHwSubModes.SASHSHAPE}");
+                    Args.Add("Mode", $"{(int)Egw.Data.Enums.QuestionModes.HARDWARE}");
+                    Args.Add("SubMode", $"{(int)Egw.Data.Window.Enums.QuestionHwSubModes.SASHSHAPE}");
                     Args.Add("SerializedData", CurrJwd);
                     string listGroupId = JsonConvert.SerializeObject(groupIdList);
                     Args.Add("GroupId", listGroupId);
@@ -1426,12 +1427,12 @@ namespace WebWindowComplex
                     if ((string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware)) &&
                         prevHardware != null && prevHardware.Count > 0)
                     {
-                        if(i >= prevHardware.Count)
+                        if (i >= prevHardware.Count)
                         {
                             SashGroupList.ElementAt(i).SetSelFamilyHardware(prevHardware.FirstOrDefault()!.FamilyName);
                             SashGroupList.ElementAt(i).SetSelHardwareFromId(prevHardware.FirstOrDefault()!.Id);
                         }
-                        else if(SashGroupList.ElementAt(i).nSashQty == prevHardware.ElementAt(i).SashQty)
+                        else if (SashGroupList.ElementAt(i).nSashQty == prevHardware.ElementAt(i).SashQty)
                         {
                             SashGroupList.ElementAt(i).SetSelFamilyHardware(prevHardware.ElementAt(i).FamilyName);
                             SashGroupList.ElementAt(i).SetSelHardwareFromId(prevHardware.ElementAt(i).Id);
@@ -1644,9 +1645,9 @@ namespace WebWindowComplex
                     overlapNameBottom = "Sash_Bottom";
                     overlapNameTop = "Mixed_Split_Top";
                 }
-                else 
+                else
                 {
-                    if(s.SelSplitShape is SplitShapes.HORIZONTAL || s.SelSplitShape is SplitShapes.VERTICAL)
+                    if (s.SelSplitShape is SplitShapes.HORIZONTAL || s.SelSplitShape is SplitShapes.VERTICAL)
                     {
                         if (indexAreaSplit == s.AreaList.Count() - 1)
                         {
@@ -1820,7 +1821,7 @@ namespace WebWindowComplex
             {
                 foreach (var item in LiveData.ProfElementList)
                 {
-                    if(item.Profiles != null)
+                    if (item.Profiles != null)
                     {
                         UpdateProfileElement(item.Profiles, item.GroupId, item.EntId);
                     }
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 3e14314..f47fdc9 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>3.1.9.714</Version>
+    <Version>3.1.9.718</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -32,7 +32,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Egw.Window.Data" />
+    <PackageReference Include="Egw.Data" />
     <PackageReference Include="EgwCoreLib.Razor" />
     <PackageReference Include="EgwCoreLib.Utils" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
@@ -120,6 +120,13 @@
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index d057bbc..a82a366 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>3.1.9.714</Version>
+        <Version>3.1.9.718</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -26,7 +26,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Egw.Window.Data" />
+        <PackageReference Include="Egw.Data" />
         <PackageReference Include="EgwCoreLib.Razor" />
         <PackageReference Include="EgwCoreLib.Utils" />
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
@@ -223,6 +223,11 @@
 
 
 
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/Window.cs b/WebWindowConfigurator/Window.cs
index 7e0f9c0..e7021df 100644
--- a/WebWindowConfigurator/Window.cs
+++ b/WebWindowConfigurator/Window.cs
@@ -6,7 +6,7 @@ using System.ComponentModel;
 using System.Drawing;
 using System.Runtime.Intrinsics.Arm;
 using System.Xml.Serialization;
-using Egw.Window.Data;
+using Egw.Data.Window;
 using WebWindowConfigurator.Json;
 using static WebWindowConfigurator.Json.WindowConst;
 
diff --git a/WebWindowConfigurator/_Imports.razor b/WebWindowConfigurator/_Imports.razor
index 3d528e2..d0b735c 100644
--- a/WebWindowConfigurator/_Imports.razor
+++ b/WebWindowConfigurator/_Imports.razor
@@ -1,2 +1,3 @@
 @using Microsoft.AspNetCore.Components.Web
-@using Egw.Window.Data
\ No newline at end of file
+@using Egw.Data
+@using Egw.Data.Window
diff --git a/WebWindowTest/Compo/AreaSplit.razor.cs b/WebWindowTest/Compo/AreaSplit.razor.cs
index 66d3d28..3433dc4 100644
--- a/WebWindowTest/Compo/AreaSplit.razor.cs
+++ b/WebWindowTest/Compo/AreaSplit.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using WebWindowTest.Models;
 
diff --git a/WebWindowTest/Compo/CardFrame.razor.cs b/WebWindowTest/Compo/CardFrame.razor.cs
index 7e9cfca..fb7812b 100644
--- a/WebWindowTest/Compo/CardFrame.razor.cs
+++ b/WebWindowTest/Compo/CardFrame.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using WebWindowTest.Models;
 
diff --git a/WebWindowTest/DTO/BaseListPayload.cs b/WebWindowTest/DTO/BaseListPayload.cs
index 06d1dee..223f608 100644
--- a/WebWindowTest/DTO/BaseListPayload.cs
+++ b/WebWindowTest/DTO/BaseListPayload.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 
 namespace WebWindowTest.DTO
 {
diff --git a/WebWindowTest/DTO/SelectPayload.cs b/WebWindowTest/DTO/SelectPayload.cs
index 2879370..0a5d2e7 100644
--- a/WebWindowTest/DTO/SelectPayload.cs
+++ b/WebWindowTest/DTO/SelectPayload.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
diff --git a/WebWindowTest/Json/JsonUtility.cs b/WebWindowTest/Json/JsonUtility.cs
index f52a07e..31dfa5d 100644
--- a/WebWindowTest/Json/JsonUtility.cs
+++ b/WebWindowTest/Json/JsonUtility.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.VisualBasic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/WebWindowTest/Models/Frame.cs b/WebWindowTest/Models/Frame.cs
index 9f0fc05..e316a9f 100644
--- a/WebWindowTest/Models/Frame.cs
+++ b/WebWindowTest/Models/Frame.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/WebWindowTest/Models/Sash.cs b/WebWindowTest/Models/Sash.cs
index 8d94ee7..98d3746 100644
--- a/WebWindowTest/Models/Sash.cs
+++ b/WebWindowTest/Models/Sash.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
diff --git a/WebWindowTest/Models/Window.cs b/WebWindowTest/Models/Window.cs
index 900e3f3..8757e1f 100644
--- a/WebWindowTest/Models/Window.cs
+++ b/WebWindowTest/Models/Window.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Collections;
diff --git a/WebWindowTest/Test.razor.cs b/WebWindowTest/Test.razor.cs
index 10e1484..7d621ee 100644
--- a/WebWindowTest/Test.razor.cs
+++ b/WebWindowTest/Test.razor.cs
@@ -1,4 +1,4 @@
-using Egw.Window.Data;
+using Egw.Data.Window;
 using Microsoft.AspNetCore.Components;
 using Newtonsoft.Json;
 using System.Threading.Tasks;
@@ -409,7 +409,7 @@ namespace WebWindowTest
                     prevJwd = CurrJwd;
                     prevReq = (int)DataReq.ReqSvg;
                     Dictionary<string, string> Args = new Dictionary<string, string>();
-                    Args.Add("Mode", $"{(int)Enums.QuestionModes.PREVIEW}");
+                    Args.Add("Mode", $"{(int)Egw.Data.Enums.QuestionModes.PREVIEW}");
                     Args.Add("SerializedData", CalcJwd);
                     await EC_DoUpdate.InvokeAsync(Args);
                 }
@@ -437,8 +437,8 @@ namespace WebWindowTest
                     prevJwd = CurrJwd;
                     prevReq = (int)DataReq.ReqHwOpt;
                     Dictionary<string, string> Args = new Dictionary<string, string>();
-                    Args.Add("Mode", $"{(int)Enums.QuestionModes.HARDWARE}");
-                    Args.Add("SubMode", $"{(int)Enums.QuestionHwSubModes.HARDWAREOPTIONS}");
+                    Args.Add("Mode", $"{(int)Egw.Data.Enums.QuestionModes.HARDWARE}");
+                    Args.Add("SubMode", $"{(int)Egw.Data.Window.Enums.QuestionHwSubModes.HARDWAREOPTIONS}");
                     Args.Add("SerializedData", CurrJwd);
                     string listGroupId = JsonConvert.SerializeObject(groupIdList);
                     Args.Add("GroupId", listGroupId);
@@ -468,8 +468,8 @@ namespace WebWindowTest
                     prevJwd = CurrJwd;
                     prevReq = (int)DataReq.ReqShape;
                     Dictionary<string, string> Args = new Dictionary<string, string>();
-                    Args.Add("Mode", $"{(int)Enums.QuestionModes.HARDWARE}");
-                    Args.Add("SubMode", $"{(int)Enums.QuestionHwSubModes.SASHSHAPE}");
+                    Args.Add("Mode", $"{(int)Egw.Data.Enums.QuestionModes.HARDWARE}");
+                    Args.Add("SubMode", $"{(int)Egw.Data.Window.Enums.QuestionHwSubModes.SASHSHAPE}");
                     Args.Add("SerializedData", CurrJwd);
                     string listGroupId = JsonConvert.SerializeObject(groupIdList);
                     Args.Add("GroupId", listGroupId);
diff --git a/WebWindowTest/WebWindowTest.csproj b/WebWindowTest/WebWindowTest.csproj
index 28df80e..e764dfc 100644
--- a/WebWindowTest/WebWindowTest.csproj
+++ b/WebWindowTest/WebWindowTest.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Egw.Window.Data" />
+    <PackageReference Include="Egw.Data" />
     <PackageReference Include="EgwCoreLib.Razor" />
     <PackageReference Include="EgwCoreLib.Utils" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000..84720d9
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <clear />
+        <!-- Rimuove tutte le sorgenti predefinite -->
+        <add key="nexus-proxy-v3" value="https://nexus.steamware.net/repository/nuget-proxy-v3/index.json" />
+        <add key="nexus-hosted" value="https://nexus.steamware.net/repository/nuget-hosted/" />
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+    <packageSourceCredentials>
+        <nexus-proxy-v3>
+            <add key="Username" value="nugetUser" />
+            <add key="ClearTextPassword" value="%NEXUS_PASSWD%" />
+        </nexus-proxy-v3>
+        <nexus-hosted>
+            <add key="Username" value="nugetUser" />
+            <add key="ClearTextPassword" value="%NEXUS_PASSWD%" />
+        </nexus-hosted>
+    </packageSourceCredentials>
+</configuration>
\ No newline at end of file