diff --git a/MTC_Sim/MTC_Sim/AdapterConf.cs b/MTC_Sim/MTC_Sim/AdapterConf.cs
index 8835f54..4c3c78b 100644
--- a/MTC_Sim/MTC_Sim/AdapterConf.cs
+++ b/MTC_Sim/MTC_Sim/AdapterConf.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace MTC_Sim
+namespace MTC_Adapter
 {
     #region -- AdapterConf Class --
     /// <summary>
diff --git a/MTC_Sim/MTC_Sim/AdapterDemo.cs b/MTC_Sim/MTC_Sim/AdapterDemo.cs
index fcbfd8c..9c4e513 100644
--- a/MTC_Sim/MTC_Sim/AdapterDemo.cs
+++ b/MTC_Sim/MTC_Sim/AdapterDemo.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MTC_Sim
+namespace MTC_Adapter
 {
     public class AdapterDemo : AdapterGeneric
     {
@@ -17,7 +17,7 @@ namespace MTC_Sim
         /// </summary>
         /// <param name="caller"></param>
         /// <param name="adpConf"></param>
-        public AdapterDemo(CMS_MachineSim caller, AdapterConf adpConf) : base(caller, adpConf)
+        public AdapterDemo(MainForm caller, AdapterConf adpConf) : base(caller, adpConf)
         {
             if (utils.CRB("verbose")) lg.Info("Start init Adapter DEMO");
             // IMPLICITO: carica da metodo base tutte le specifiche del conf...
diff --git a/MTC_Sim/MTC_Sim/AdapterFanuc.cs b/MTC_Sim/MTC_Sim/AdapterFanuc.cs
index 6e2c3b2..e1ce271 100644
--- a/MTC_Sim/MTC_Sim/AdapterFanuc.cs
+++ b/MTC_Sim/MTC_Sim/AdapterFanuc.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using CMSCncLib.CNC;
 using System.Runtime.InteropServices;
 
-namespace MTC_Sim
+namespace MTC_Adapter
 {
     public class AdapterFanuc : AdapterGeneric
     {
@@ -36,7 +36,7 @@ namespace MTC_Sim
         /// </summary>
         /// <param name="caller"></param>
         /// <param name="adpConf"></param>
-        public AdapterFanuc(CMS_MachineSim caller, AdapterConf adpConf) : base(caller, adpConf)
+        public AdapterFanuc(MainForm caller, AdapterConf adpConf) : base(caller, adpConf)
         {
             if (utils.CRB("verbose")) lg.Info("Start init Adapter FANUC all'IP {0}", utils.CRS("ipFanuc"));
 
diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
index 818f042..64238ec 100644
--- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs
+++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using NLog;
 
-namespace MTC_Sim
+namespace MTC_Adapter
 {
     using MTConnect;
     using System.Configuration;
@@ -555,7 +555,7 @@ namespace MTC_Sim
         /// <summary>
         /// Form chiamante
         /// </summary>
-        protected CMS_MachineSim parentForm;
+        protected MainForm parentForm;
         /// <summary>
         /// Conf adapter corrente
         /// </summary>
@@ -782,7 +782,7 @@ namespace MTC_Sim
         /// </summary>
         /// <param name="caller"></param>
         /// <param name="adpConf"></param>
-        public AdapterGeneric(CMS_MachineSim caller, AdapterConf adpConf)
+        public AdapterGeneric(MainForm caller, AdapterConf adpConf)
         {
             lg = LogManager.GetCurrentClassLogger();
             lg.Info("Avvio AdapterGeneric");
diff --git a/MTC_Sim/MTC_Sim/App.config b/MTC_Sim/MTC_Sim/App.config
index 4304e7b..f637708 100644
--- a/MTC_Sim/MTC_Sim/App.config
+++ b/MTC_Sim/MTC_Sim/App.config
@@ -31,7 +31,7 @@
     <add key="verbose" value="true"/>
 
 
-    <add key="autoLoadConf" value="true"/>
+    <add key="autoLoadConf" value="false"/>
     <add key="defaultConfFile" value="CMS_FANUC.xml"/>
     <add key="autoStartOnLoad" value="true"/>
     <add key="openDumpOnStart" value="true"/>
@@ -48,7 +48,6 @@
     
     <!--conf file-->
     <add key="adapterConfPath" value="AdapterConf"/>
-    <add key ="adapterConfPathFull" value="C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-MTConn\MTC_Sim\MTC_Sim\AdapterConf"/>
     <add key="AlarmList" value="AlarmList.txt"/>
     <add key="SubMode" value="SubMode.txt"/>
 
diff --git a/MTC_Sim/MTC_Sim/BinaryFormatter.cs b/MTC_Sim/MTC_Sim/BinaryFormatter.cs
index e25512d..fa43a75 100644
--- a/MTC_Sim/MTC_Sim/BinaryFormatter.cs
+++ b/MTC_Sim/MTC_Sim/BinaryFormatter.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using System.Globalization;
 using System.Numerics;
 
-namespace MTC_Sim
+namespace MTC_Adapter
 {
 
     public class BinaryFormatter : IFormatProvider, ICustomFormatter
diff --git a/MTC_Sim/MTC_Sim/EnumExtensions.cs b/MTC_Sim/MTC_Sim/EnumExtensions.cs
index dff1a80..58a4b05 100644
--- a/MTC_Sim/MTC_Sim/EnumExtensions.cs
+++ b/MTC_Sim/MTC_Sim/EnumExtensions.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MTC_Sim
+namespace MTC_Adapter
 {
 
     public static class EnumerationExtensions
diff --git a/MTC_Sim/MTC_Sim/MTC-Adapter.csproj b/MTC_Sim/MTC_Sim/MTC-Adapter.csproj
index fd9e498..bacf468 100644
--- a/MTC_Sim/MTC_Sim/MTC-Adapter.csproj
+++ b/MTC_Sim/MTC_Sim/MTC-Adapter.csproj
@@ -33,7 +33,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>CMS.ico</ApplicationIcon>
+    <ApplicationIcon>Resurces\CMS.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
@@ -59,15 +59,16 @@
       <Link>AdapterVers.cs</Link>
     </Compile>
     <Compile Include="AdapterConf.cs" />
+    <Compile Include="AdapterESA.cs" />
     <Compile Include="AdapterGeneric.cs" />
     <Compile Include="AdapterDemo.cs" />
     <Compile Include="AdapterFanuc.cs" />
     <Compile Include="BinaryFormatter.cs" />
-    <Compile Include="CMS_MachineSim.cs">
+    <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="CMS_MachineSim.Designer.cs">
-      <DependentUpon>CMS_MachineSim.cs</DependentUpon>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="EnumExtensions.cs" />
     <Compile Include="Program.cs" />
@@ -79,8 +80,8 @@
       <DependentUpon>SetupAdapter.cs</DependentUpon>
     </Compile>
     <Compile Include="utils.cs" />
-    <EmbeddedResource Include="CMS_MachineSim.resx">
-      <DependentUpon>CMS_MachineSim.cs</DependentUpon>
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -96,13 +97,15 @@
       <DependentUpon>SetupAdapter.cs</DependentUpon>
     </EmbeddedResource>
     <Content Include="Analisi tempi.txt" />
-    <Content Include="CMS.ico" />
+    <Content Include="Resurces\CMS.ico" />
     <Content Include="dump\dump.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="logs\.placeholder.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Resurces\SCM.ico" />
+    <Content Include="MTCA.ico" />
     <Content Include="SubMode.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -140,6 +143,10 @@
       <Project>{2d769ffd-1122-4276-a115-29246e6d23c5}</Project>
       <Name>CMSCncLib</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SCMCncLib\SCMCncLib.csproj">
+      <Project>{7a12fe26-9c58-4630-973d-d4872374dbaf}</Project>
+      <Name>SCMCncLib</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="AdapterConf\CMS_FANUC.xml">
diff --git a/MTC_Sim/MTC_Sim/Program.cs b/MTC_Sim/MTC_Sim/Program.cs
index 80a5e67..dda3b92 100644
--- a/MTC_Sim/MTC_Sim/Program.cs
+++ b/MTC_Sim/MTC_Sim/Program.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace MTC_Sim
+namespace MTC_Adapter
 {
     static class Program
     {
@@ -24,7 +24,7 @@ namespace MTC_Sim
 
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new CMS_MachineSim());
+            Application.Run(new MainForm());
 
             //FreeConsole();
         }
diff --git a/MTC_Sim/MTC_Sim/utils.cs b/MTC_Sim/MTC_Sim/utils.cs
index 2eb2420..c68cd25 100644
--- a/MTC_Sim/MTC_Sim/utils.cs
+++ b/MTC_Sim/MTC_Sim/utils.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MTC_Sim
+namespace MTC_Adapter
 {
     public class utils
     {
diff --git a/MTC_Sim/VersGen/AdapterVers.cs b/MTC_Sim/VersGen/AdapterVers.cs
index b75cdad..1a292be 100644
--- a/MTC_Sim/VersGen/AdapterVers.cs
+++ b/MTC_Sim/VersGen/AdapterVers.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.0.1.85")]
-[assembly: AssemblyFileVersion("1.0.1.85")]
-[assembly: AssemblyCopyright("Steamware-CMS-SCM © 2016-2016")]
-[assembly: AssemblyCompany("Steamware-CMS-SCM")]
+[assembly: AssemblyVersion("1.0.2.86")]
+[assembly: AssemblyFileVersion("1.0.2.86")]
+[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-2016")]
+[assembly: AssemblyCompany("Steamware-SCM-CMS")]
diff --git a/MTC_Sim/VersGen/AdapterVers.tt b/MTC_Sim/VersGen/AdapterVers.tt
index d0b3311..1ec7a1d 100644
--- a/MTC_Sim/VersGen/AdapterVers.tt
+++ b/MTC_Sim/VersGen/AdapterVers.tt
@@ -6,10 +6,10 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.0.1.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.0.1.<#= this.RevisionNumber #>")]
-[assembly: AssemblyCopyright("Steamware-CMS-SCM © 2016-<#= DateTime.Now.Year #>")]
-[assembly: AssemblyCompany("Steamware-CMS-SCM")]
+[assembly: AssemblyVersion("1.0.2.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.0.2.<#= this.RevisionNumber #>")]
+[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-<#= DateTime.Now.Year #>")]
+[assembly: AssemblyCompany("Steamware-SCM-CMS")]
 <#+
     int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2014,10,1)).TotalDays/7;
 #>
\ No newline at end of file