diff --git a/CMS-SC-Data/CMS-SC-Data.csproj b/CMS-SC-Data/CMS-SC-Data.csproj
index 6d601b3..97d0b55 100644
--- a/CMS-SC-Data/CMS-SC-Data.csproj
+++ b/CMS-SC-Data/CMS-SC-Data.csproj
@@ -98,12 +98,11 @@
     <None Include="SchemaComp_DevelopProd.scmp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\SteamWareLibrary\SteamWare\SteamWare.csproj">
+    <ProjectReference Include="..\..\Steamware\SteamWareLib\SteamWare.csproj">
       <Project>{2872dcfe-8b46-43b2-baa0-842a816a2dd5}</Project>
       <Name>SteamWare</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Content Include="UpdateSql\CMS-SC_2.1.132.sql" />
   </ItemGroup>
diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll
index 75c0a27..e3f5902 100644
Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ
diff --git a/CMS-SC-Data/bin/Release/NLog.config b/CMS-SC-Data/bin/Release/NLog.config
index ede1596..7a0f3aa 100644
--- a/CMS-SC-Data/bin/Release/NLog.config
+++ b/CMS-SC-Data/bin/Release/NLog.config
@@ -1,15 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
+      autoReload="true"
+      throwExceptions="false"
+      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
 
-  <!-- 
-  See https://github.com/nlog/nlog/wiki/Configuration-file 
+  <!-- optional, add some variables
+  https://github.com/nlog/NLog/wiki/Configuration-file#variables
+  -->
+  <variable name="myvar" value="myvalue"/>
+
+  <!--
+  See https://github.com/nlog/nlog/wiki/Configuration-file
   for information on customizing logging rules and outputs.
    -->
   <targets>
-    <!-- add your targets here -->
-    
+
     <!--
+    add your targets here
+    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
+    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
+    -->
+
+    <!--
+    Write events to a file with the date in the filename.
     <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
             layout="${longdate} ${uppercase:${level}} ${message}" />
     -->
@@ -17,9 +32,10 @@
 
   <rules>
     <!-- add your logging rules here -->
-    
+
     <!--
-    <logger name="*" minlevel="Trace" writeTo="f" />
+    Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
+    <logger name="*" minlevel="Debug" writeTo="f" />
     -->
   </rules>
-</nlog>
\ No newline at end of file
+</nlog>
diff --git a/CMS-SC-Data/bin/Release/SteamWare.dll b/CMS-SC-Data/bin/Release/SteamWare.dll
index ae281b6..6a2bbf7 100644
Binary files a/CMS-SC-Data/bin/Release/SteamWare.dll and b/CMS-SC-Data/bin/Release/SteamWare.dll differ
diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll
index 75c0a27..e3f5902 100644
Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ
diff --git a/CMS-SC.sln b/CMS-SC.sln
index bcffb38..4e25d42 100644
--- a/CMS-SC.sln
+++ b/CMS-SC.sln
@@ -1,16 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMS_SC", "CMS_SC\CMS_SC.csproj", "{DB9E1F1A-D6B2-4C87-B2BB-50546C25B6FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\SteamWareLibrary\SteamWare\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{133C59DA-6FC7-46C2-8209-A36BE0ED1340}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMS-SC-Data", "CMS-SC-Data\CMS-SC-Data.csproj", "{1E84A9DC-5231-4A68-9F44-DF1D88AB8DA8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\Steamware\SteamWareLib\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		218_SP|Any CPU = 218_SP|Any CPU
@@ -60,36 +60,6 @@ Global
 		{DB9E1F1A-D6B2-4C87-B2BB-50546C25B6FD}.Steamware|Any CPU.Build.0 = Release|Any CPU
 		{DB9E1F1A-D6B2-4C87-B2BB-50546C25B6FD}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU
 		{DB9E1F1A-D6B2-4C87-B2BB-50546C25B6FD}.WinLab|Any CPU.Build.0 = WinLab|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.ActiveCfg = 218_SP|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.Build.0 = 218_SP|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.ActiveCfg = 218_test|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.Build.0 = 218_test|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.ActiveCfg = Alumat|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.Build.0 = Alumat|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.CMS|Any CPU.ActiveCfg = Release|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.CMS|Any CPU.Build.0 = Release|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.ActiveCfg = DEMO|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.Build.0 = DEMO|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.ActiveCfg = deploy|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.Build.0 = deploy|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.ActiveCfg = EQUA|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.Build.0 = EQUA|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = ETS|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = ETS|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.ActiveCfg = ETS-218|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.Build.0 = ETS-218|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = SomaschiniUSA|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = SomaschiniUSA|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.ActiveCfg = Steamware|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.Build.0 = Steamware|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = WinLab|Any CPU
 		{133C59DA-6FC7-46C2-8209-A36BE0ED1340}.218_SP|Any CPU.ActiveCfg = Release|Any CPU
 		{133C59DA-6FC7-46C2-8209-A36BE0ED1340}.218_SP|Any CPU.Build.0 = Release|Any CPU
 		{133C59DA-6FC7-46C2-8209-A36BE0ED1340}.218_test|Any CPU.ActiveCfg = Release|Any CPU
@@ -150,6 +120,36 @@ Global
 		{1E84A9DC-5231-4A68-9F44-DF1D88AB8DA8}.Steamware|Any CPU.Build.0 = Release|Any CPU
 		{1E84A9DC-5231-4A68-9F44-DF1D88AB8DA8}.WinLab|Any CPU.ActiveCfg = Release|Any CPU
 		{1E84A9DC-5231-4A68-9F44-DF1D88AB8DA8}.WinLab|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.CMS|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.CMS|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.Build.0 = Debug|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.Build.0 = Debug|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.Build.0 = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = Release|Any CPU
+		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj
index 5043481..0b15e0f 100644
--- a/CMS_SC/CMS_SC.csproj
+++ b/CMS_SC/CMS_SC.csproj
@@ -886,7 +886,7 @@
     <Folder Include="sql\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\SteamWareLibrary\SteamWare\SteamWare.csproj">
+    <ProjectReference Include="..\..\Steamware\SteamWareLib\SteamWare.csproj">
       <Project>{2872dcfe-8b46-43b2-baa0-842a816a2dd5}</Project>
       <Name>SteamWare</Name>
     </ProjectReference>
diff --git a/CMS_SC/Services/WS_data.asmx.cs b/CMS_SC/Services/WS_data.asmx.cs
index 5c77bba..a184c51 100644
--- a/CMS_SC/Services/WS_data.asmx.cs
+++ b/CMS_SC/Services/WS_data.asmx.cs
@@ -26,9 +26,9 @@ namespace CMS_SC.Services
             // inizializzo risposta
             List<string> suggerimenti = new List<string>();
             // elenco candidati
-            DS_Utility.v_selMacchineDataTable tabella = DtProxy.man.taVSMacc.searchLike(prefixText);
+            CMS_SC_Data.DS_Utility.v_selMacchineDataTable tabella = DtProxy.man.taVSMacc.searchLike(prefixText);
             // aggiungo ogni riga...
-            foreach (DS_Utility.v_selMacchineRow riga in tabella)
+            foreach (CMS_SC_Data.DS_Utility.v_selMacchineRow riga in tabella)
             {
                 suggerimenti.Add(string.Format("{0}#{1}", riga.label, riga.value));
                 if (suggerimenti.Count == memLayer.ML.confReadInt("maxNumSuggest"))
diff --git a/CMS_SC/WebUserControls/mod_fileUpload.ascx.cs b/CMS_SC/WebUserControls/mod_fileUpload.ascx.cs
index 454e636..4d2c986 100644
--- a/CMS_SC/WebUserControls/mod_fileUpload.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_fileUpload.ascx.cs
@@ -112,7 +112,7 @@ namespace CMS_SC.WebUserControls
             int idxFile = int.Parse((sender as LinkButton).CommandArgument);
             byte[] bytes;
             string fileName, contentType;
-            DS_Utility.tblFilesRow fileRow = DtProxy.man.taFiles.getByKey(idxFile)[0];
+            CMS_SC_Data.DS_Utility.tblFilesRow fileRow = DtProxy.man.taFiles.getByKey(idxFile)[0];
             bytes = fileRow.Data;
             contentType = fileRow.ContentType;
             fileName = fileRow.FileName;
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index 75c0a27..e3f5902 100644
Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ
diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll
index 7f396bb..fed16f2 100644
Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ
diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll
index ae281b6..6a2bbf7 100644
Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ
diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll
index 0762425..9b8a032 100644
Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ