diff --git a/MTC_Adapter/SCMA/AdapterESA.cs b/MTC_Adapter/SCMA/AdapterPLC/SCM/ESA.cs
similarity index 99%
rename from MTC_Adapter/SCMA/AdapterESA.cs
rename to MTC_Adapter/SCMA/AdapterPLC/SCM/ESA.cs
index 173d31d..b0eb3ac 100644
--- a/MTC_Adapter/SCMA/AdapterESA.cs
+++ b/MTC_Adapter/SCMA/AdapterPLC/SCM/ESA.cs
@@ -7,9 +7,9 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 
-namespace SCMA
+namespace SCMA.AdapterPLC.SCM
 {
-  public class AdapterESA : AdapterGeneric
+  public class ESA : AdapterGeneric
   {
     /// <summary>
     /// Configurazione valori da leggere IOT_Byte
@@ -245,7 +245,7 @@ namespace SCMA
     /// <param name="caller">FORM chaimante</param>  
     /// <param name="adpConf">CONFIGURAZIONE adapter</param>
     /// <param name="gatewayObj">OGGETTO gestione comunicazione OUT (tipologia e metodi)</param>
-    public AdapterESA(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
+    public ESA(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
     {
       string iniPath = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("defaultEsaFile"));
 
diff --git a/MTC_Adapter/SCMA/MainForm.cs b/MTC_Adapter/SCMA/MainForm.cs
index 162aa6c..35f2022 100644
--- a/MTC_Adapter/SCMA/MainForm.cs
+++ b/MTC_Adapter/SCMA/MainForm.cs
@@ -386,7 +386,7 @@ namespace SCMA
           start.Enabled = true;
           break;
         case tipoAdapter.ESAGV:
-          agObj = new AdapterESA(this, adpConf, currGateway);
+          agObj = new AdapterPLC.SCM.ESA(this, adpConf, currGateway);
           EnableTab(tabCtrlMain.TabPages[1], true);
           EnableTab(tabCtrlMain.TabPages[2], false);
           start.Enabled = true;
diff --git a/MTC_Adapter/SCMA/SCMA.csproj b/MTC_Adapter/SCMA/SCMA.csproj
index 106d603..d16a2c6 100644
--- a/MTC_Adapter/SCMA/SCMA.csproj
+++ b/MTC_Adapter/SCMA/SCMA.csproj
@@ -141,7 +141,7 @@
     <Compile Include="AdapterCom\GatewayMTC.cs" />
     <Compile Include="AdapterCom\GatewaySOURS.cs" />
     <Compile Include="AdapterConf.cs" />
-    <Compile Include="AdapterESA.cs" />
+    <Compile Include="AdapterPLC\SCM\ESA.cs" />
     <Compile Include="AdapterOsai.cs" />
     <Compile Include="AdapterSiemens.cs" />
     <Compile Include="AdapterGeneric.cs" />
@@ -398,7 +398,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="AdapterCNC\" />
+    <Folder Include="AdapterPLC\CMS\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.