diff --git a/Installer CMS/FANUC/AGENT/CMS.xml b/Installer CMS/AGENT/CMS.xml
similarity index 100%
rename from Installer CMS/FANUC/AGENT/CMS.xml
rename to Installer CMS/AGENT/CMS.xml
diff --git a/Installer CMS/FANUC/AGENT/desktop.ini b/Installer CMS/AGENT/desktop.ini
similarity index 100%
rename from Installer CMS/FANUC/AGENT/desktop.ini
rename to Installer CMS/AGENT/desktop.ini
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectAssets_1.2.xsd b/Installer CMS/AGENT/schemas/MTConnectAssets_1.2.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectAssets_1.2.xsd
rename to Installer CMS/AGENT/schemas/MTConnectAssets_1.2.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectAssets_1.3.xsd b/Installer CMS/AGENT/schemas/MTConnectAssets_1.3.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectAssets_1.3.xsd
rename to Installer CMS/AGENT/schemas/MTConnectAssets_1.3.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectAssets_1.3_1.0.xsd b/Installer CMS/AGENT/schemas/MTConnectAssets_1.3_1.0.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectAssets_1.3_1.0.xsd
rename to Installer CMS/AGENT/schemas/MTConnectAssets_1.3_1.0.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectDevices_1.2.xsd b/Installer CMS/AGENT/schemas/MTConnectDevices_1.2.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectDevices_1.2.xsd
rename to Installer CMS/AGENT/schemas/MTConnectDevices_1.2.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectDevices_1.3.xsd b/Installer CMS/AGENT/schemas/MTConnectDevices_1.3.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectDevices_1.3.xsd
rename to Installer CMS/AGENT/schemas/MTConnectDevices_1.3.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectDevices_1.3_1.0.xsd b/Installer CMS/AGENT/schemas/MTConnectDevices_1.3_1.0.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectDevices_1.3_1.0.xsd
rename to Installer CMS/AGENT/schemas/MTConnectDevices_1.3_1.0.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectError_1.2.xsd b/Installer CMS/AGENT/schemas/MTConnectError_1.2.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectError_1.2.xsd
rename to Installer CMS/AGENT/schemas/MTConnectError_1.2.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectError_1.3.xsd b/Installer CMS/AGENT/schemas/MTConnectError_1.3.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectError_1.3.xsd
rename to Installer CMS/AGENT/schemas/MTConnectError_1.3.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectError_1.3_1.0.xsd b/Installer CMS/AGENT/schemas/MTConnectError_1.3_1.0.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectError_1.3_1.0.xsd
rename to Installer CMS/AGENT/schemas/MTConnectError_1.3_1.0.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectStreams_1.2.xsd b/Installer CMS/AGENT/schemas/MTConnectStreams_1.2.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectStreams_1.2.xsd
rename to Installer CMS/AGENT/schemas/MTConnectStreams_1.2.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectStreams_1.3.xsd b/Installer CMS/AGENT/schemas/MTConnectStreams_1.3.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectStreams_1.3.xsd
rename to Installer CMS/AGENT/schemas/MTConnectStreams_1.3.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/MTConnectStreams_1.3_1.0.xsd b/Installer CMS/AGENT/schemas/MTConnectStreams_1.3_1.0.xsd
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/MTConnectStreams_1.3_1.0.xsd
rename to Installer CMS/AGENT/schemas/MTConnectStreams_1.3_1.0.xsd
diff --git a/Installer CMS/FANUC/AGENT/schemas/desktop.ini b/Installer CMS/AGENT/schemas/desktop.ini
similarity index 100%
rename from Installer CMS/FANUC/AGENT/schemas/desktop.ini
rename to Installer CMS/AGENT/schemas/desktop.ini
diff --git a/Installer CMS/FANUC/AGENT/styles/Streams.css b/Installer CMS/AGENT/styles/Streams.css
similarity index 100%
rename from Installer CMS/FANUC/AGENT/styles/Streams.css
rename to Installer CMS/AGENT/styles/Streams.css
diff --git a/Installer CMS/FANUC/AGENT/styles/Streams.xsl b/Installer CMS/AGENT/styles/Streams.xsl
similarity index 100%
rename from Installer CMS/FANUC/AGENT/styles/Streams.xsl
rename to Installer CMS/AGENT/styles/Streams.xsl
diff --git a/Installer CMS/FANUC/AGENT/styles/desktop.ini b/Installer CMS/AGENT/styles/desktop.ini
similarity index 100%
rename from Installer CMS/FANUC/AGENT/styles/desktop.ini
rename to Installer CMS/AGENT/styles/desktop.ini
diff --git a/Installer CMS/FANUC/AGENT/styles/favicon.ico b/Installer CMS/AGENT/styles/favicon.ico
similarity index 100%
rename from Installer CMS/FANUC/AGENT/styles/favicon.ico
rename to Installer CMS/AGENT/styles/favicon.ico
diff --git a/Installer CMS/FANUC/AGENT/tools/desktop.ini b/Installer CMS/AGENT/tools/desktop.ini
similarity index 100%
rename from Installer CMS/FANUC/AGENT/tools/desktop.ini
rename to Installer CMS/AGENT/tools/desktop.ini
diff --git a/Installer CMS/FANUC/AGENT/tools/dump_adapter.rb b/Installer CMS/AGENT/tools/dump_adapter.rb
similarity index 100%
rename from Installer CMS/FANUC/AGENT/tools/dump_adapter.rb
rename to Installer CMS/AGENT/tools/dump_adapter.rb
diff --git a/Installer CMS/FANUC/AGENT/tools/dump_agent.rb b/Installer CMS/AGENT/tools/dump_agent.rb
similarity index 100%
rename from Installer CMS/FANUC/AGENT/tools/dump_agent.rb
rename to Installer CMS/AGENT/tools/dump_agent.rb
diff --git a/Installer CMS/FANUC/AGENT/tools/long_pull.rb b/Installer CMS/AGENT/tools/long_pull.rb
similarity index 100%
rename from Installer CMS/FANUC/AGENT/tools/long_pull.rb
rename to Installer CMS/AGENT/tools/long_pull.rb
diff --git a/Installer CMS/FANUC/AGENT/tools/seq_test.rb b/Installer CMS/AGENT/tools/seq_test.rb
similarity index 100%
rename from Installer CMS/FANUC/AGENT/tools/seq_test.rb
rename to Installer CMS/AGENT/tools/seq_test.rb
diff --git a/Installer CMS/InstallerMTC.ps1 b/Installer CMS/InstallerMTC.ps1
index db4d724..dd855cd 100644
--- a/Installer CMS/InstallerMTC.ps1	
+++ b/Installer CMS/InstallerMTC.ps1	
@@ -1,16 +1,30 @@
 # --------------------------------------------------------------
 # Script installazione MTConnect Agent + MTConnect ADAPTER
+# S.E.L. e G.A.R. - Steamware 2016.10.17
 # --------------------------------------------------------------
 
+$ErrorActionPreference = "Stop"    # comportamento x errori minori
+
 # Fase 1: chiedo quale tipo di CNC sia (FANUC / ...)
 Write-Host "--------------------"
 Write-Host "- ADAPTER AMMESSI"
 Write-Host "--------------------"
 Write-Host "1 - FANUC CMS"
 #Write-Host "2 - ESA SCM"
-$adapter = read-host "Prego scegliere tipologia di ADAPTER da installare"
-$Date = Get-Date
-Write-Host "Adapter scelto:'$adapter' alle '$Date'"
+$adapter = read-host "Prego scegliere tipologia di ADAPTER da installare (default: 1 = Fanuc)"
+if(!$adapter) 
+{
+    $adapter = "1"
+}
+
+# directory di default...
+$AdpDir = ""
+switch($adapter)
+{
+    1 { $AdpDir = "FANUC" }
+    #2 { $AdpDir = "ESA" }
+    default { $AdpDir = "FANUC" }
+}
 
 # Fase 2: copia files adapter
 Write-Host "--------------------"
@@ -23,43 +37,41 @@ if(!$tgtFolder)
 }
 
 Write-Host "Sto copiando adapter BASE in '$tgtFolder'"
-Copy-Item -Recurse ".\FANUC\ADAPTER\*" "$tgtFolder\ADAPTER\"
+Copy-Item -Recurse  ".\$AdpDir\ADAPTER" "$tgtFolder\ADAPTER"
 
 
 # Fase 3: copia file di conf specifica
 Write-Host "Sto copiando files configurazioen matricola in '$tgtFolder'"
-Copy-Item -Recurse ".\FANUC\ADAPTER\ConfMacchina\*" "$tgtFolder\ADAPTER\"
+Copy-Item -Recurse ".\$AdpDir\ConfMacchina\*.*" "$tgtFolder\ADAPTER\"
 
 # Fase 4: copia dell'agent
 Write-Host "Sto copiando AGENT MTC in '$tgtFolder'"
-Copy-Item -Recurse ".\FANUC\AGENT\*" "$tgtFolder\AGENT\"
+Copy-Item -Recurse ".\AGENT\" "$tgtFolder\AGENT\"
 
 
 # Fase 4: registrazione dell'agent
 Write-Host "Sto registrazndo servizio AGENT MTC"
 cd $tgtFolder
-cd "\AGENT\bin"
+cd "AGENT\bin"
 .\agent.exe install .\agent.cfg
 
 #avvio servizio
 Write-Host "Servizio AGENT MTC installlato, avvio il servizio"
-#Start-Service 
+Get-Service "MTConnect Agent" | Start-Service
+Write-Host "Servizio AGENT MTC imposto avvio Automatico"
+Set-service "MTConnect Agent" -StartupType Automatic
 
+# Get-Service "MTConnect Agent" | Select -Property Name, Status | ft -auto
+Get-WmiObject -Class Win32_Service -Filter "Name='MTConnect Agent'" | Select Name,State,StartMode | ft -auto
 
 #apro console servizi x chiedere verifica ad utente
-Write-Host "Servizio installato ed avvioato, prego verificare registrazione avvio automatico"
+Write-Host "Servizio installato ed avviato, prego verificare registrazione avvio automatico (tramite msc services) e lo stato current (nella pagina del browser)"
 
 
 # fase 6: apro porta current x verifica agent e dati 
 services.msc
-
 # verifica porta 5000 (http://localhost:5000/)
-explorer http://localhost:5000/current
-
-
+explorer.exe 'http://localhost:5000/current'
 
 # Fase 7 manuale: registrazione script avvio differito... indicare di fare
-Write-Host "ADAPTER ed AGENT installati, prego ricordarsi di registrare con il servizio xxx l'avvio differito dell'agent allo startup"
-
-
-
+Write-Host "ADAPTER ed AGENT installati, prego ricordarsi di registrare con il sw appropriato l'avvio differito dell'agent allo startup"