diff --git a/WebWindowComplex/AreaFrame.razor.cs b/WebWindowComplex/AreaFrame.razor.cs
index e74d744..285533f 100644
--- a/WebWindowComplex/AreaFrame.razor.cs
+++ b/WebWindowComplex/AreaFrame.razor.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using WebWindowComplex.Models;
 
 namespace WebWindowComplex
 {
diff --git a/WebWindowComplex/AreaSplit.razor.cs b/WebWindowComplex/AreaSplit.razor.cs
index 0a37662..31efbe9 100644
--- a/WebWindowComplex/AreaSplit.razor.cs
+++ b/WebWindowComplex/AreaSplit.razor.cs
@@ -1,16 +1,11 @@
 using Microsoft.AspNetCore.Components;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using WebWindowComplex.Models;
 
 namespace WebWindowComplex
 {
     public partial class AreaSplit
     {
-        [Parameter]
-        public List<Splitted> CurrSplittedList { get; set; } = null;
+        #region Public Properties
 
         [Parameter]
         public List<Sash> CurrSashList { get; set; } = null;
@@ -18,9 +13,16 @@ namespace WebWindowComplex
         [Parameter]
         public Splitted CurrSplitted { get; set; } = null;
 
+        [Parameter]
+        public List<Splitted> CurrSplittedList { get; set; } = null;
+
         [Parameter]
         public EventCallback<int> EC_CopySash { get; set; }
 
+        #endregion Public Properties
+
+        #region Private Methods
+
         /// <summary>
         /// Sollevo evento richiesta copia sash
         /// </summary>
@@ -29,5 +31,7 @@ namespace WebWindowComplex
         {
             await EC_CopySash.InvokeAsync(indexCurrSash);
         }
+
+        #endregion Private Methods
     }
-}
+}
\ No newline at end of file
diff --git a/WebWindowComplex/General.razor.cs b/WebWindowComplex/General.razor.cs
index d6ef2ff..907f980 100644
--- a/WebWindowComplex/General.razor.cs
+++ b/WebWindowComplex/General.razor.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
-using Newtonsoft.Json.Linq;
 using WebWindowComplex.DTO;
+using WebWindowComplex.Models;
 
 namespace WebWindowComplex
 {
diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs
index a1edcdf..c60fe9b 100644
--- a/WebWindowComplex/Json/JsonUtility.cs
+++ b/WebWindowComplex/Json/JsonUtility.cs
@@ -3,6 +3,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
+using WebWindowComplex.Models;
 using static WebWindowComplex.Json.WindowConst;
 
 namespace WebWindowComplex.Json
diff --git a/WebWindowComplex/Window.cs b/WebWindowComplex/Models/Window.cs
similarity index 99%
rename from WebWindowComplex/Window.cs
rename to WebWindowComplex/Models/Window.cs
index 2ddbd63..c2de926 100644
--- a/WebWindowComplex/Window.cs
+++ b/WebWindowComplex/Models/Window.cs
@@ -13,7 +13,7 @@ using WebWindowComplex.Json;
 using static WebWindowComplex.Json.WindowConst;
 using static WebWindowComplex.ParametriOpzioni;
 
-namespace WebWindowComplex
+namespace WebWindowComplex.Models
 {
 
     public class Window
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 2d45657..736fbd4 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -1,14 +1,10 @@
 using Egw.Window.Data;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System.Reflection.Metadata;
-using System.Reflection.Metadata.Ecma335;
-using System.Runtime.InteropServices;
 using WebWindowComplex.DTO;
 using WebWindowComplex.Json;
+using WebWindowComplex.Models;
 using static WebWindowComplex.Json.WindowConst;
 
 namespace WebWindowComplex
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index e8aec1a..1ad4c53 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -51,3 +51,6 @@
 
 
 
+
+
+
diff --git a/WebWindowComplex/_Imports.razor b/WebWindowComplex/_Imports.razor
index 7728512..123a7e8 100644
--- a/WebWindowComplex/_Imports.razor
+++ b/WebWindowComplex/_Imports.razor
@@ -1 +1,3 @@
 @using Microsoft.AspNetCore.Components.Web
+@using WebWindowComplex
+@using WebWindowComplex.Models
\ No newline at end of file
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index df94faa..d08ba87 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -63,6 +63,14 @@
 
 
 
+
+
+
+
+
+
+
+