diff --git a/CncLib/App/App.Native.Ini.vb b/EgwProxy.MultiCncLib/App/App.Native.Ini.vb
similarity index 100%
rename from CncLib/App/App.Native.Ini.vb
rename to EgwProxy.MultiCncLib/App/App.Native.Ini.vb
diff --git a/CncLib/CNC/CNC.FANUC/CNC.FANUC.vb b/EgwProxy.MultiCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
similarity index 97%
rename from CncLib/CNC/CNC.FANUC/CNC.FANUC.vb
rename to EgwProxy.MultiCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
index 70b98889..81736c0e 100644
--- a/CncLib/CNC/CNC.FANUC/CNC.FANUC.vb
+++ b/EgwProxy.MultiCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
@@ -1,4 +1,4 @@
-Imports CncLib.Config.Settings
+Imports EgwProxy.MultiCncLib.Config.Settings
 
 Namespace CNC
 
@@ -433,7 +433,7 @@ Namespace CNC
             Throw New NcException("ERR pmc_wrpmcrng CNC.FANUC")
             Return False
           ElseIf nReturn <> Focas1.EW_OK Then
-            'CncLib.App.Runtime.Log.WW("ERR pmc_wrpmcrng on F_RW_Boolean CNC.FANUC", "Return=" & nReturn, True)
+            'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR pmc_wrpmcrng on F_RW_Boolean CNC.FANUC", "Return=" & nReturn, True)
             Return False
           End If
 
@@ -928,7 +928,7 @@ Namespace CNC
       iodbto_1_3 = New Focas1.IODBTO_1_3
       ofs_3 = New Focas1.OFS_3
 
-      nMaxUt = CncLib.CNC.Runtime.NC.MaxIdUtensile
+      nMaxUt = EgwProxy.MultiCncLib.CNC.Runtime.NC.MaxIdUtensile
 
       Dim n As Integer
       n = nMaxUt \ 100
@@ -1439,7 +1439,7 @@ Namespace CNC
         ' impostato a true x mostrare errore
         If False Then
           'If nReturn <> Focas1.EW_SOCKET Then 'tranne su errore di connessione
-          'CncLib.App.Runtime..Log.WW("ERR pmc_wrpmcrng on F_RW_DWord CNC.FANUC", "Return=" & nReturn, True)
+          'EgwProxy.MultiCncLib.App.Runtime..Log.WW("ERR pmc_wrpmcrng on F_RW_DWord CNC.FANUC", "Return=" & nReturn, True)
           MsgBox(szErrorDesc & vbLf & "Occurred in: " & Position, MsgBoxStyle.Exclamation + MsgBoxStyle.ApplicationModal, "Error on Fanuc CNC Data Window")
           'End If
         End If
@@ -1483,7 +1483,7 @@ Namespace CNC
         ''Stampo il messaggio
         'If (Config.Settings.Settings.Debug > 0) Then
         '    'If nReturn <> Focas1.EW_SOCKET Then 'tranne su errore di connessione
-        '    'CncLib.App.Runtime..Log.WW("ERR pmc_wrpmcrng on F_RW_DWord CNC.FANUC", "Return=" & nReturn, True)
+        '    'EgwProxy.MultiCncLib.App.Runtime..Log.WW("ERR pmc_wrpmcrng on F_RW_DWord CNC.FANUC", "Return=" & nReturn, True)
         '    MsgBox(szErrorDesc & vbLf & "Occurred in: " & Position, MsgBoxStyle.Exclamation + MsgBoxStyle.ApplicationModal, "Error on Fanuc CNC Data Window")
         '    'End If
         'End If
@@ -1515,8 +1515,8 @@ Namespace CNC
         ' leggo tutto!!!
         nReturn = Focas1.cnc_sysinfo(nLibHandle(nPathIdx), sysInfo)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_sysinfo CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_sysinfo CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_sysinfo CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_sysinfo CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1553,8 +1553,8 @@ Namespace CNC
         ' leggo tutto!!!
         nReturn = Focas1.cnc_pdf_rdmain(nLibHandle(nPathIdx), prgName)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_pdf_rdmain CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_pdf_rdmain CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_pdf_rdmain CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_pdf_rdmain CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       ElseIf Is16Series Then
         ' leggo tutto!!!
@@ -1562,8 +1562,8 @@ Namespace CNC
         prgName = "O" & prgNum.mdata.ToString()
 
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_pdf_rdmain CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_pdf_rdmain CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_pdf_rdmain CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_pdf_rdmain CNC.FANUC.EgwProxy.MultiCncLib")
         End If
 
       End If
@@ -1597,8 +1597,8 @@ Namespace CNC
         nReturn = Focas1.cnc_exeprgname(nLibHandle(nPathIdx), prgName)
 
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_exeprgname CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_exeprgname CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_exeprgname CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_exeprgname CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1626,8 +1626,8 @@ Namespace CNC
         ' leggo tutto!!!
         nReturn = Focas1.cnc_rdposition(nLibHandle(nPathIdx), -1, nNumAxisRead, posizAssi)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rdposition RefreshAxisPosition CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_rdposition RefreshAxisPosition CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_rdposition RefreshAxisPosition CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_rdposition RefreshAxisPosition CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1655,8 +1655,8 @@ Namespace CNC
         ' leggo tutto!!!
         nReturn = Focas1.cnc_rdsvmeter(nLibHandle(nPathIdx), nNumAxisRead, caricoAssi)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rdsvmeter RefreshAxisMeter CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_rdsvmeter RefreshAxisMeter CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_rdsvmeter RefreshAxisMeter CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_rdsvmeter RefreshAxisMeter CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1686,8 +1686,8 @@ Namespace CNC
         ' leggo feed globale
         nReturn = Focas1.cnc_actf(nLibHandle(nPathIdx), feedData)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_actf RefreshActFeedRate CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_actf RefreshActFeedRate CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_actf RefreshActFeedRate CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_actf RefreshActFeedRate CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1718,8 +1718,8 @@ Namespace CNC
         ' leggo feed globale
         nReturn = Focas1.cnc_rdspload(nLibHandle(nPathIdx), -1, allData)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rdspload RefreshAllSpindleLoad CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_rdspload RefreshAllSpindleLoad CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_rdspload RefreshAllSpindleLoad CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_rdspload RefreshAllSpindleLoad CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1750,8 +1750,8 @@ Namespace CNC
         '!!! non funziona: con -1 LEGGE 1 SOLO ASSE!!!
         'nReturn = Focas1.cnc_rddynamic2(nLibHandle(nPathIdx), -1, 28 + 4 * (4 * nNumAxisRead), allData)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rddynamic2 RefreshAllData CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_rddynamic2 RefreshAllData CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_rddynamic2 RefreshAllData CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_rddynamic2 RefreshAllData CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1787,8 +1787,8 @@ Namespace CNC
           ' leggo tutto!!!
           nReturn = Focas1.cnc_rdalmmsg2(nLibHandle(nPathIdx), -1, numAllarmi, allData)
 
-          If F_CheckRetError_Cnc(nReturn, "cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.CncLib") Then
-            Throw New NcException("ERR cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.CncLib")
+          If F_CheckRetError_Cnc(nReturn, "cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.EgwProxy.MultiCncLib") Then
+            Throw New NcException("ERR cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.EgwProxy.MultiCncLib")
             Return New Focas1.ODBALMMSG2
           End If
         Catch ex As Exception
@@ -1823,8 +1823,8 @@ Namespace CNC
         ' leggo tutto!!! 0-27 (28 elementi)
         nReturn = Focas1.cnc_rdgcode(nLibHandle(nPathIdx), -1, 1, 37, actGCode)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rdgcode RefreshPathGCode CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_rdgcode RefreshPathGCode CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_rdgcode RefreshPathGCode CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_rdgcode RefreshPathGCode CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1854,8 +1854,8 @@ Namespace CNC
         ' leggo tutto!!! 0-27 (28 elementi)
         nReturn = Focas1.cnc_rdgcode(nLibHandle(nPathIdx), -2, 1, 4, actGCode)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rdgcode RefreshPathGCode CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_rdgcode RefreshPathGCode CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_rdgcode RefreshPathGCode CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_rdgcode RefreshPathGCode CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1885,8 +1885,8 @@ Namespace CNC
         ' leggo tutto!!! 
         nReturn = Focas1.cnc_rd5axmandt(nLibHandle(nPathIdx), ttCoord)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rd3dtooltip RefreshPathTTCoord CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_rd3dtooltip RefreshPathTTCoord CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_rd3dtooltip RefreshPathTTCoord CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_rd3dtooltip RefreshPathTTCoord CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
@@ -1914,8 +1914,8 @@ Namespace CNC
         ' leggo tutto!!!
         nReturn = Focas1.cnc_rdspeed(nLibHandle(nPathIdx), -1, speedAssi)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rdspeed RefreshAxisSpeed CNC.FANUC.CncLib") Then
-          Throw New NcException("ERR cnc_rdspeed RefreshAxisSpeed CNC.FANUC.CncLib")
+        If F_CheckRetError_Cnc(nReturn, "cnc_rdspeed RefreshAxisSpeed CNC.FANUC.EgwProxy.MultiCncLib") Then
+          Throw New NcException("ERR cnc_rdspeed RefreshAxisSpeed CNC.FANUC.EgwProxy.MultiCncLib")
         End If
       End If
 
diff --git a/CncLib/CNC/CNC.FANUC/_/CNC.FANUC.Err.vb b/EgwProxy.MultiCncLib/CNC/CNC.FANUC/_/CNC.FANUC.Err.vb
similarity index 100%
rename from CncLib/CNC/CNC.FANUC/_/CNC.FANUC.Err.vb
rename to EgwProxy.MultiCncLib/CNC/CNC.FANUC/_/CNC.FANUC.Err.vb
diff --git a/CncLib/CNC/CNC.FANUC/_/fwlib32.vb b/EgwProxy.MultiCncLib/CNC/CNC.FANUC/_/fwlib32.vb
similarity index 100%
rename from CncLib/CNC/CNC.FANUC/_/fwlib32.vb
rename to EgwProxy.MultiCncLib/CNC/CNC.FANUC/_/fwlib32.vb
diff --git a/CncLib/CNC/CNC.OSAI/CNC.OSAI.vb b/EgwProxy.MultiCncLib/CNC/CNC.OSAI/CNC.OSAI.vb
similarity index 95%
rename from CncLib/CNC/CNC.OSAI/CNC.OSAI.vb
rename to EgwProxy.MultiCncLib/CNC/CNC.OSAI/CNC.OSAI.vb
index e9dd509f..2affa70b 100644
--- a/CncLib/CNC/CNC.OSAI/CNC.OSAI.vb
+++ b/EgwProxy.MultiCncLib/CNC/CNC.OSAI/CNC.OSAI.vb
@@ -2,7 +2,7 @@
 
 Imports T_memType = System.Collections.Generic.Dictionary(Of System.Int32, System.Collections.Generic.Dictionary(Of System.Int32, System.Object))
 Imports T_memDim = System.Collections.Generic.Dictionary(Of System.Int32, System.Object)
-Imports CncLib.Config.Settings
+Imports EgwProxy.MultiCncLib.Config.Settings
 
 Namespace CNC
 
@@ -95,12 +95,12 @@ Namespace CNC
       Dim sValue(0) As Short
       Dim TimeStart As Date
 
-      'CncLib.App.Runtime.Log.WI("TRY OpenSession CNC.OSAI", "RemoteName=" & _szRemoteName, CLog.Lev.Secondary)
+      'EgwProxy.MultiCncLib.App.Runtime.Log.WI("TRY OpenSession CNC.OSAI", "RemoteName=" & _szRemoteName, CLog.Lev.Secondary)
       nReturn = Cndex.OpenSession_C(_szRemoteName, _UserSession, _ErrClass, _ErrNum)
       If O_CheckRetError(nReturn, _ErrClass, _ErrNum, String.Format("OpenSession_C({0},{1}) Connect CNC.OSAI", _szRemoteName, _UserSession), szReturn) Then
         Throw New NcException(szReturn)
       Else
-        'CncLib.App.Runtime.Log.WI("OK  OpenSession CNC.OSAI", , CLog.Lev.Secondary)
+        'EgwProxy.MultiCncLib.App.Runtime.Log.WI("OK  OpenSession CNC.OSAI", , CLog.Lev.Secondary)
         'leggo in che fase di boot mi trovo
         nReturn = Cndex.BootPhaseEnquiry_C(_UserSession, pPhase, _ErrClass, _ErrNum)
         If O_CheckRetError(nReturn, _ErrClass, _ErrNum, String.Format("BootPhaseEnquiry_C({0},{1}) Connect CNC.OSAI", _UserSession, pPhase), szReturn) Then
@@ -108,7 +108,7 @@ Namespace CNC
           Throw New NcException(szReturn)
         Else
           'verifico che il sistema si trovi in una fase operativa "stabile"
-          'CncLib.App.Runtime.Log.WI("OK  BootPhaseEnquiry CNC.OSAI", "Phase=" & pPhase, CLog.Lev.Secondary)
+          'EgwProxy.MultiCncLib.App.Runtime.Log.WI("OK  BootPhaseEnquiry CNC.OSAI", "Phase=" & pPhase, CLog.Lev.Secondary)
           If pPhase = 4 Then 'SYSTEM_UP_PHASE
 
             'leggo matricola e verifico che sia diversa da zero
@@ -137,17 +137,17 @@ Namespace CNC
                   Case MsgBoxResult.Cancel : Exit Do
                 End Select
               End If
-              'CncLib.App.Runtime.Log.WI("OK  Connect CNC.OSAI but SERIAL NUMBER NOT YET INITIALIZED", , CLog.Lev.Secondary)
+              'EgwProxy.MultiCncLib.App.Runtime.Log.WI("OK  Connect CNC.OSAI but SERIAL NUMBER NOT YET INITIALIZED", , CLog.Lev.Secondary)
               'Application.DoEvents()
               Threading.Thread.Sleep(500) 'aspetto 500ms prima di ritentare
               'Application.DoEvents()
             Loop
 
             _bConnected = True
-            'CncLib.App.Runtime.Log.WI("OK  Connect CNC.OSAI", "Connected=" & _bConnected, CLog.Lev.Secondary)
+            'EgwProxy.MultiCncLib.App.Runtime.Log.WI("OK  Connect CNC.OSAI", "Connected=" & _bConnected, CLog.Lev.Secondary)
           Else
             _bConnected = False
-            'CncLib.App.Runtime.Log.WI("OK  Connect CNC.OSAI but PHASE NOT OK", "Phase=" & pPhase & " Connected=" & _bConnected, CLog.Lev.Secondary)
+            'EgwProxy.MultiCncLib.App.Runtime.Log.WI("OK  Connect CNC.OSAI but PHASE NOT OK", "Phase=" & pPhase & " Connected=" & _bConnected, CLog.Lev.Secondary)
             Throw New NcException("ERR BootPhase NOT OK CNC.OSAI")
           End If
         End If
@@ -187,21 +187,21 @@ Namespace CNC
             'Matricola
             nReturn = Cndex.ReadVarWord_C(_UserSession, Cndex.MW_CODE, 0, 3187, 1, sValue, _ErrClass, _ErrNum)
             If nReturn = ERRORE Then
-              'CncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
+              'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
             Else
               Me._Matricola = sValue(0)
             End If
             'Teste
             nReturn = Cndex.ReadVarWord_C(_UserSession, Cndex.MW_CODE, 0, 3161, 1, sValue, _ErrClass, _ErrNum)
             If nReturn = ERRORE Then
-              'CncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
+              'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
             Else
               Me._Teste = sValue(0)
             End If
             'Magazzini
             nReturn = Cndex.ReadVarWord_C(_UserSession, Cndex.MW_CODE, 0, 3163, 1, sValue, _ErrClass, _ErrNum)
             If nReturn = ERRORE Then
-              'CncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
+              'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
             Else
               Me._Magazzini = sValue(0)
             End If
@@ -211,14 +211,14 @@ Namespace CNC
               If i <= 8 Then
                 nReturn = Cndex.ReadVarWord_C(_UserSession, Cndex.MW_CODE, 0, 3164 + (i - 1), 1, sValue, _ErrClass, _ErrNum)
                 If nReturn = ERRORE Then
-                  'CncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
+                  'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
                 Else
                   Me._ManineMagazzino(i - 1) = sValue(0)
                 End If
               Else '8-20
                 nReturn = Cndex.ReadVarWord_C(_UserSession, Cndex.MW_CODE, 0, 3188 + (i - 1), 1, sValue, _ErrClass, _ErrNum)
                 If nReturn = ERRORE Then
-                  'CncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
+                  'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
                 Else
                   Me._ManineMagazzino(i - 1) = sValue(0)
                 End If
@@ -231,21 +231,21 @@ Namespace CNC
             'Matricola
             nReturn = Cndex.ReadVarWord_C(_UserSession, Cndex.MW_CODE, 0, 3403, 1, sValue, _ErrClass, _ErrNum)
             If nReturn = ERRORE Then
-              'CncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
+              'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
             Else
               Me._Matricola = sValue(0)
             End If
             'Teste
             nReturn = Cndex.ReadVarWord_C(_UserSession, Cndex.MW_CODE, 0, 3405, 1, sValue, _ErrClass, _ErrNum)
             If nReturn = ERRORE Then
-              'CncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
+              'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
             Else
               Me._Teste = sValue(0)
             End If
             'Magazzini
             nReturn = Cndex.ReadVarWord_C(_UserSession, Cndex.MW_CODE, 0, 3407, 1, sValue, _ErrClass, _ErrNum)
             If nReturn = ERRORE Then
-              'CncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
+              'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR GetStaticData CNC.OSAI", "Return=" & nReturn & " ErrClass=" & _ErrClass & " ErrNum=0x" & Hex(_ErrNum))
             Else
               Me._Magazzini = sValue(0)
             End If
diff --git a/CncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb b/EgwProxy.MultiCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb
similarity index 99%
rename from CncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb
rename to EgwProxy.MultiCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb
index e4df0897..3256e76e 100644
--- a/CncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb
+++ b/EgwProxy.MultiCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb
@@ -1,4 +1,4 @@
-Imports CncLib.Config.Settings
+Imports EgwProxy.MultiCncLib.Config.Settings
 
 Namespace CNC
 
@@ -1101,8 +1101,8 @@ Retry: nRetry += 1
                 ' leggo tutto!!!
                 nReturn = Focas1.cnc_rdalmmsg2(nLibHandle(nPathIdx), -1, numAllarmi, allData)
 
-                If F_CheckRetError_Cnc(nReturn, "cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.CncLib") Then
-                    Throw New NcException("ERR cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.CncLib")
+                If F_CheckRetError_Cnc(nReturn, "cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.EgwProxy.MultiCncLib") Then
+                    Throw New NcException("ERR cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.EgwProxy.MultiCncLib")
                 End If
             End If
 
@@ -1134,8 +1134,8 @@ Retry: nRetry += 1
                 ' leggo tutto!!! 
                 nReturn = Focas1.cnc_rd5axmandt(nLibHandle(nPathIdx), ttCoord)
 
-                If F_CheckRetError_Cnc(nReturn, "cnc_rd3dtooltip RefreshPathTTCoord CNC.FANUC.CncLib") Then
-                    Throw New NcException("ERR cnc_rd3dtooltip RefreshPathTTCoord CNC.FANUC.CncLib")
+                If F_CheckRetError_Cnc(nReturn, "cnc_rd3dtooltip RefreshPathTTCoord CNC.FANUC.EgwProxy.MultiCncLib") Then
+                    Throw New NcException("ERR cnc_rd3dtooltip RefreshPathTTCoord CNC.FANUC.EgwProxy.MultiCncLib")
                 End If
             End If
 
diff --git a/CncLib/CNC/CNC.Runtime.vb b/EgwProxy.MultiCncLib/CNC/CNC.Runtime.vb
similarity index 82%
rename from CncLib/CNC/CNC.Runtime.vb
rename to EgwProxy.MultiCncLib/CNC/CNC.Runtime.vb
index 57a07e6c..32d74a6b 100644
--- a/CncLib/CNC/CNC.Runtime.vb
+++ b/EgwProxy.MultiCncLib/CNC/CNC.Runtime.vb
@@ -1,7 +1,7 @@
 Namespace CNC
 
   Public Class Runtime
-    Public Shared NC As CncLib.CNC.CNC
+    Public Shared NC As EgwProxy.MultiCncLib.CNC.CNC
 
 
     Public Shared Sub CreateNC(tipoNC As CNC.NcType, ipTarget As String, ipPort As String)
@@ -41,11 +41,11 @@
             'End Try
         End Select
 
-        'CncLib.App.Runtime.Log.WI("OK  crating NC  CNC.NC", , CLog.Lev.Principal)
+        'EgwProxy.MultiCncLib.App.Runtime.Log.WI("OK  crating NC  CNC.NC", , CLog.Lev.Principal)
       Catch ex As Exception
         Dim exStr As String
         exStr = ex.Message
-        'CncLib.App.Runtime.Log.WE("ERR crating NC  CNC.NC", ex.Message, True)
+        'EgwProxy.MultiCncLib.App.Runtime.Log.WE("ERR crating NC  CNC.NC", ex.Message, True)
       End Try
 
 
diff --git a/CncLib/CNC/CNC.SIEMENS/CNC.SIEMENS.vb b/EgwProxy.MultiCncLib/CNC/CNC.SIEMENS/CNC.SIEMENS.vb
similarity index 100%
rename from CncLib/CNC/CNC.SIEMENS/CNC.SIEMENS.vb
rename to EgwProxy.MultiCncLib/CNC/CNC.SIEMENS/CNC.SIEMENS.vb
diff --git a/CncLib/CNC/CNC/CNC.CNC.vb b/EgwProxy.MultiCncLib/CNC/CNC/CNC.CNC.vb
similarity index 100%
rename from CncLib/CNC/CNC/CNC.CNC.vb
rename to EgwProxy.MultiCncLib/CNC/CNC/CNC.CNC.vb
diff --git a/CncLib/CndexLinkDotNet.dll b/EgwProxy.MultiCncLib/CndexLinkDotNet.dll
similarity index 100%
rename from CncLib/CndexLinkDotNet.dll
rename to EgwProxy.MultiCncLib/CndexLinkDotNet.dll
diff --git a/CncLib/Config/Config.Options.vb b/EgwProxy.MultiCncLib/Config/Config.Options.vb
similarity index 98%
rename from CncLib/Config/Config.Options.vb
rename to EgwProxy.MultiCncLib/Config/Config.Options.vb
index b1a1f111..a22bfd8e 100644
--- a/CncLib/Config/Config.Options.vb
+++ b/EgwProxy.MultiCncLib/Config/Config.Options.vb
@@ -277,7 +277,7 @@
                     Me._ToolTable_SharedDB = Ini.GetBoolean("OPTIONS", "TOOLTABLE_SHAREDDB", 0)
                 End If
             Else
-                'CncLib.App.Runtime.Log.WW("ERR LoadOptions", String.Format("File {0} not found", szFileIni), True)
+                'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR LoadOptions", String.Format("File {0} not found", szFileIni), True)
             End If
 
         End Sub
diff --git a/CncLib/Config/Config.Settings.vb b/EgwProxy.MultiCncLib/Config/Config.Settings.vb
similarity index 98%
rename from CncLib/Config/Config.Settings.vb
rename to EgwProxy.MultiCncLib/Config/Config.Settings.vb
index 7df8e2a3..d0aaeb55 100644
--- a/CncLib/Config/Config.Settings.vb
+++ b/EgwProxy.MultiCncLib/Config/Config.Settings.vb
@@ -133,7 +133,7 @@ Namespace Config
                     End If
                 End With
             Else
-                'CncLib.App.Runtime.Log.WW("ERR LoadFromFile", String.Format("File {0} not found", szFileIni), True)
+                'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR LoadFromFile", String.Format("File {0} not found", szFileIni), True)
             End If
         End Sub
 
@@ -173,9 +173,9 @@ Namespace Config
                     Next
                 End With
 
-                'CncLib.App.Runtime.Log.WI("END SaveToFile", , CCncLib.App.Runtime.Log.Lev.Secondary)
+                'EgwProxy.MultiCncLib.App.Runtime.Log.WI("END SaveToFile", , CEgwProxy.MultiCncLib.App.Runtime.Log.Lev.Secondary)
             Else
-                'CncLib.App.Runtime.Log.WW("ERR SaveToFile", String.Format("File {0} not found", szFileIni), True)
+                'EgwProxy.MultiCncLib.App.Runtime.Log.WW("ERR SaveToFile", String.Format("File {0} not found", szFileIni), True)
             End If
         End Sub
 
diff --git a/CncLib/CncLib.vbproj b/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj
similarity index 56%
rename from CncLib/CncLib.vbproj
rename to EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj
index 64557fe6..ba94fbdc 100644
--- a/CncLib/CncLib.vbproj
+++ b/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{2D769FFD-1122-4276-A115-29246E6D23C5}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>CncLib</RootNamespace>
-    <AssemblyName>CncLib</AssemblyName>
+    <RootNamespace>EgwProxy.MultiCncLib</RootNamespace>
+    <AssemblyName>EgwProxy.MultiCncLib</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -20,7 +20,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
     <UseVSHostingProcess>true</UseVSHostingProcess>
@@ -33,7 +33,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
     <Prefer32Bit>false</Prefer32Bit>
@@ -54,7 +54,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FANUC|AnyCPU' ">
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\FANUC\</OutputPath>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -66,7 +66,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ESA|AnyCPU' ">
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\ESA\</OutputPath>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -79,7 +79,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\SIEMENS\</OutputPath>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -91,7 +91,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\OSAI\</OutputPath>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -105,7 +105,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x86\Debug\</OutputPath>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -116,7 +116,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x86\Release\</OutputPath>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -128,7 +128,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x86\FANUC\</OutputPath>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -140,7 +140,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x86\ESA\</OutputPath>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -152,7 +152,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x86\SIEMENS\</OutputPath>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -164,7 +164,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x86\OSAI\</OutputPath>
     <DefineConstants>FS30D=1,SIEMENS=1</DefineConstants>
-    <DocumentationFile>CncLib.xml</DocumentationFile>
+    <DocumentationFile>EgwProxy.MultiCncLib.xml</DocumentationFile>
     <Optimize>true</Optimize>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -256,436 +256,436 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.AxesRefR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.AxesRefR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.BootModeR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.BootModeR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.BootPhaseEnquiryR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.BootPhaseEnquiryR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.BootRebootR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.BootRebootR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.BootShutDownR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.BootShutDownR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.CheckHistoryR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.CheckHistoryR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.CycleR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.CycleR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.DncDataR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.DncDataR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.DncEofR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.DncEofR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.DncInitR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.DncInitR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.DncStopR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.DncStopR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.EseExR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.EseExR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.EseR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.EseR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ExeR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ExeR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetActivePartProgramR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetActivePartProgramR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetAvailableCustomEventsR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetAvailableCustomEventsR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetAxesInfo3R.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetAxesInfo3R.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetAxesPositionR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetAxesPositionR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetAxOriginNumR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetAxOriginNumR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetBinaryFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetBinaryFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetBlkNumR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetBlkNumR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetCNCRegKeyR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetCNCRegKeyR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetCodeNumberR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetCodeNumberR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetDateTimeR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetDateTimeR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetGCodeR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetGCodeR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetHWKeyR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetHWKeyR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetMarkerInfoR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetMarkerInfoR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetMCodeR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetMCodeR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetNcInfo1R.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetNcInfo1R.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetNcInfo2R.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetNcInfo2R.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetOffsetTabRecordIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetOffsetTabRecordIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetOptionsR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetOptionsR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetOriginTabRecordIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetOriginTabRecordIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetPartProgramLinesR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetPartProgramLinesR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetProcessConfNumR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetProcessConfNumR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetProcessStatusR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetProcessStatusR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetProcInInputR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetProcInInputR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetProcVarDoubleR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetProcVarDoubleR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetProcVarWordR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetProcVarWordR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetPTechSizesR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetPTechSizesR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetSelectedProcessR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetSelectedProcessR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetSerialNumberR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetSerialNumberR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetServoParR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetServoParR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetSysTickR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetSysTickR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetToolNamesR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetToolNamesR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetToolTabRecordIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetToolTabRecordIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetUserTabRecordIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetUserTabRecordIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetVarJOGR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetVarJOGR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.GetVarRCMR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.GetVarRCMR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.HoldR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.HoldR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LoadPTechR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LoadPTechR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LockTableIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LockTableIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSAddDriveR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSAddDriveR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSChangeFileAttribR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSChangeFileAttribR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSCloseFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSCloseFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSCopyFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSCopyFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSCreateDirR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSCreateDirR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSCreateFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSCreateFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSFindCloseR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSFindCloseR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSFindFirstR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSFindFirstR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSFindNextR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSFindNextR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSGetDriveListR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSGetDriveListR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSGetDrivePathR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSGetDrivePathR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSGetFileAttribR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSGetFileAttribR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSGetFileSizeR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSGetFileSizeR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSGetHiddenDriveListR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSGetHiddenDriveListR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSGetInfoR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSGetInfoR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSGetNumDriveR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSGetNumDriveR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSGetSecurityLevelR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSGetSecurityLevelR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSLongFileNamesR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSLongFileNamesR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSOpenFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSOpenFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSReadRecordR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSReadRecordR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSReloadDriveListR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSReloadDriveListR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSRemoveDirR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSRemoveDirR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSRemoveDriveR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSRemoveDriveR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSRemoveFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSRemoveFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSRenameR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSRenameR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSSetFileAttribR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSSetFileAttribR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSSetSecurityLevelR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSSetSecurityLevelR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.LogFSWriteRecordR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.LogFSWriteRecordR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ManagePartProgramR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ManagePartProgramR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.MonAddVariableR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.MonAddVariableR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.MonCloseChannelR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.MonCloseChannelR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.MonDeleteVariableR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.MonDeleteVariableR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.MonGetVariableR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.MonGetVariableR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.MonOpenChannelR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.MonOpenChannelR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.MonStartSamplingR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.MonStartSamplingR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.MonStopSamplingR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.MonStopSamplingR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.PutBinaryFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.PutBinaryFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.PutFileR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.PutFileR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadCurrentAnomalyMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadCurrentAnomalyMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadCurrentEmergMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadCurrentEmergMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadCurrentErrorMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadCurrentErrorMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadErrMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadErrMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadHistoryAnomalyMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadHistoryAnomalyMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadHistoryEmergMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadHistoryEmergMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadHistoryErrorMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadHistoryErrorMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadHistoryLogMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadHistoryLogMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadPartProgramMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadPartProgramMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadRemapDefinitionsR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadRemapDefinitionsR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadVarDoubleR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadVarDoubleR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadVarTextR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadVarTextR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadVarWordR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadVarWordR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ReadWarningMsgR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ReadWarningMsgR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ResetR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ResetR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.ResetSingleTableIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.ResetSingleTableIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.RestoreBackupMemoryR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.RestoreBackupMemoryR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.RestoreSingleTableR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.RestoreSingleTableR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SaveBackupMemoryR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SaveBackupMemoryR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SaveSingleTableR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SaveSingleTableR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SaveTablesR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SaveTablesR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SelectPartProgramFromDriveR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SelectPartProgramFromDriveR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SelectPartProgramR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SelectPartProgramR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SelectProcAxisR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SelectProcAxisR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SelectProcessR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SelectProcessR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetDateTimeR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetDateTimeR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetFeedManOverR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetFeedManOverR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetFeedRapidOverR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetFeedRapidOverR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetFeedRateOverR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetFeedRateOverR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetIpAddressR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetIpAddressR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetManMovDirectionR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetManMovDirectionR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetMdiStringR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetMdiStringR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetOffsetTabRecordIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetOffsetTabRecordIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetOriginTabRecordIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetOriginTabRecordIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetProcessModeR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetProcessModeR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetProcVarDoubleR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetProcVarDoubleR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetProcVarWordR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetProcVarWordR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetServoParR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetServoParR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetSpeedRateOverR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetSpeedRateOverR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetToolTabRecordIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetToolTabRecordIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetUserTabRecordIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetUserTabRecordIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetVarJOGR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetVarJOGR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetVarRCMR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetVarRCMR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SetVarUASR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SetVarUASR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SkipPProgBlockR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SkipPProgBlockR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SndProcInpDataR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SndProcInpDataR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.SyncroCycleR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.SyncroCycleR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.UnLockTableIIR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.UnLockTableIIR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.WriteRemapDefinitionsR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.WriteRemapDefinitionsR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.WriteVarDoubleR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.WriteVarDoubleR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.WriteVarTextR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.WriteVarTextR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.WriteVarWordBitR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.WriteVarWordBitR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\OPENcontrol\CncLib.OPENcontrol.WriteVarWordR.datasource">
+    <None Include="Service References\OPENcontrol\EgwProxy.MultiCncLib.OPENcontrol.WriteVarWordR.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
     <None Include="Service References\OPENcontrol\OPENcontrol.wsdl" />
diff --git a/CncLib/ExtLib/CndexLinkDotNet.dll b/EgwProxy.MultiCncLib/ExtLib/CndexLinkDotNet.dll
similarity index 100%
rename from CncLib/ExtLib/CndexLinkDotNet.dll
rename to EgwProxy.MultiCncLib/ExtLib/CndexLinkDotNet.dll
diff --git a/CncLib/ExtLib/Siemens.Sinumerik.Operate.Services.Wrapper.dll b/EgwProxy.MultiCncLib/ExtLib/Siemens.Sinumerik.Operate.Services.Wrapper.dll
similarity index 100%
rename from CncLib/ExtLib/Siemens.Sinumerik.Operate.Services.Wrapper.dll
rename to EgwProxy.MultiCncLib/ExtLib/Siemens.Sinumerik.Operate.Services.Wrapper.dll
diff --git a/CncLib/ExtLib/Siemens.Sinumerik.Operate.Services.dll b/EgwProxy.MultiCncLib/ExtLib/Siemens.Sinumerik.Operate.Services.dll
similarity index 100%
rename from CncLib/ExtLib/Siemens.Sinumerik.Operate.Services.dll
rename to EgwProxy.MultiCncLib/ExtLib/Siemens.Sinumerik.Operate.Services.dll
diff --git a/CncLib/Modules/Conversions.vb b/EgwProxy.MultiCncLib/Modules/Conversions.vb
similarity index 100%
rename from CncLib/Modules/Conversions.vb
rename to EgwProxy.MultiCncLib/Modules/Conversions.vb
diff --git a/CncLib/Modules/General.vb b/EgwProxy.MultiCncLib/Modules/General.vb
similarity index 100%
rename from CncLib/Modules/General.vb
rename to EgwProxy.MultiCncLib/Modules/General.vb
diff --git a/CncLib/My Project/Application.Designer.vb b/EgwProxy.MultiCncLib/My Project/Application.Designer.vb
similarity index 100%
rename from CncLib/My Project/Application.Designer.vb
rename to EgwProxy.MultiCncLib/My Project/Application.Designer.vb
diff --git a/CncLib/My Project/Application.myapp b/EgwProxy.MultiCncLib/My Project/Application.myapp
similarity index 100%
rename from CncLib/My Project/Application.myapp
rename to EgwProxy.MultiCncLib/My Project/Application.myapp
diff --git a/CncLib/My Project/AssemblyInfo.vb b/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb
similarity index 91%
rename from CncLib/My Project/AssemblyInfo.vb
rename to EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb
index 9ba545d8..2fc16abb 100644
--- a/CncLib/My Project/AssemblyInfo.vb	
+++ b/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb	
@@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices
 
 ' Review the values of the assembly attributes
 
-<Assembly: AssemblyTitle("CncLib")> 
+<Assembly: AssemblyTitle("EgwProxy.MultiCncLib")> 
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("SteamWare")>
-<Assembly: AssemblyProduct("CncLib")>
+<Assembly: AssemblyProduct("EgwProxy.MultiCncLib")>
 <Assembly: AssemblyCopyright("Copyright ©2007-2017")>
 <Assembly: AssemblyTrademark("")> 
 
diff --git a/CncLib/My Project/Resources.Designer.vb b/EgwProxy.MultiCncLib/My Project/Resources.Designer.vb
similarity index 95%
rename from CncLib/My Project/Resources.Designer.vb
rename to EgwProxy.MultiCncLib/My Project/Resources.Designer.vb
index c9e03fe7..d04c579d 100644
--- a/CncLib/My Project/Resources.Designer.vb	
+++ b/EgwProxy.MultiCncLib/My Project/Resources.Designer.vb	
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("CncLib.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EgwProxy.MultiCncLib.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/CncLib/My Project/Resources.resx b/EgwProxy.MultiCncLib/My Project/Resources.resx
similarity index 100%
rename from CncLib/My Project/Resources.resx
rename to EgwProxy.MultiCncLib/My Project/Resources.resx
diff --git a/CncLib/My Project/Settings.Designer.vb b/EgwProxy.MultiCncLib/My Project/Settings.Designer.vb
similarity index 94%
rename from CncLib/My Project/Settings.Designer.vb
rename to EgwProxy.MultiCncLib/My Project/Settings.Designer.vb
index f5db2e15..eb2df98d 100644
--- a/CncLib/My Project/Settings.Designer.vb	
+++ b/EgwProxy.MultiCncLib/My Project/Settings.Designer.vb	
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.CncLib.My.MySettings
+        Friend ReadOnly Property Settings() As Global.EgwProxy.MultiCncLib.My.MySettings
             Get
-                Return Global.CncLib.My.MySettings.Default
+                Return Global.EgwProxy.MultiCncLib.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/CncLib/My Project/Settings.settings b/EgwProxy.MultiCncLib/My Project/Settings.settings
similarity index 100%
rename from CncLib/My Project/Settings.settings
rename to EgwProxy.MultiCncLib/My Project/Settings.settings
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.AxesRefR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.AxesRefR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.AxesRefR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.AxesRefR.datasource
index 134d5b6a..7d109dee 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.AxesRefR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.AxesRefR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="AxesRefR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.AxesRefR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.AxesRefR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootModeR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootModeR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootModeR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootModeR.datasource
index 9b199349..e79fc3f3 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootModeR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootModeR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="BootModeR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.BootModeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.BootModeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootPhaseEnquiryR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootPhaseEnquiryR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootPhaseEnquiryR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootPhaseEnquiryR.datasource
index 2a60c950..7979855e 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootPhaseEnquiryR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootPhaseEnquiryR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="BootPhaseEnquiryR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.BootPhaseEnquiryR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.BootPhaseEnquiryR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootRebootR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootRebootR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootRebootR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootRebootR.datasource
index f91f85d1..4e8e87d0 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootRebootR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootRebootR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="BootRebootR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.BootRebootR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.BootRebootR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootShutDownR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootShutDownR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootShutDownR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootShutDownR.datasource
index 733b8aef..298cc669 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootShutDownR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.BootShutDownR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="BootShutDownR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.BootShutDownR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.BootShutDownR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CheckHistoryR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CheckHistoryR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CheckHistoryR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CheckHistoryR.datasource
index 0b67a4f9..12dfa741 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CheckHistoryR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CheckHistoryR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="CheckHistoryR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.CheckHistoryR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.CheckHistoryR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CycleR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CycleR.datasource
similarity index 73%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CycleR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CycleR.datasource
index 24d552d5..a9695139 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CycleR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.CycleR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="CycleR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.CycleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.CycleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncDataR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncDataR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncDataR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncDataR.datasource
index d128e24d..a6d148aa 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncDataR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncDataR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="DncDataR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.DncDataR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.DncDataR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncEofR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncEofR.datasource
similarity index 73%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncEofR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncEofR.datasource
index d16a2cbe..8de22675 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncEofR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncEofR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="DncEofR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.DncEofR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.DncEofR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncInitR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncInitR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncInitR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncInitR.datasource
index 14fc0088..676f4697 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncInitR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncInitR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="DncInitR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.DncInitR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.DncInitR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncStopR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncStopR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncStopR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncStopR.datasource
index 325698c3..490a8abf 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncStopR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.DncStopR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="DncStopR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.DncStopR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.DncStopR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseExR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseExR.datasource
similarity index 73%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseExR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseExR.datasource
index 3561e471..57a3a885 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseExR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseExR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="EseExR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.EseExR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.EseExR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseR.datasource
similarity index 73%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseR.datasource
index 465cd847..3ce8af40 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.EseR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="EseR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.EseR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.EseR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ExeR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ExeR.datasource
similarity index 73%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ExeR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ExeR.datasource
index 495ddc2d..c70c4994 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ExeR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ExeR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ExeR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ExeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ExeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetActivePartProgramR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetActivePartProgramR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetActivePartProgramR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetActivePartProgramR.datasource
index 2f7f8812..57852259 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetActivePartProgramR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetActivePartProgramR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetActivePartProgramR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetActivePartProgramR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetActivePartProgramR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAvailableCustomEventsR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAvailableCustomEventsR.datasource
similarity index 71%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAvailableCustomEventsR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAvailableCustomEventsR.datasource
index 77bea450..920849b7 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAvailableCustomEventsR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAvailableCustomEventsR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetAvailableCustomEventsR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetAvailableCustomEventsR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetAvailableCustomEventsR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxOriginNumR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxOriginNumR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxOriginNumR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxOriginNumR.datasource
index cda2aff3..4c9f5106 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxOriginNumR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxOriginNumR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetAxOriginNumR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetAxOriginNumR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetAxOriginNumR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesInfo3R.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesInfo3R.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesInfo3R.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesInfo3R.datasource
index aff32885..881eb83f 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesInfo3R.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesInfo3R.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetAxesInfo3R" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetAxesInfo3R, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetAxesInfo3R, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesPositionR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesPositionR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesPositionR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesPositionR.datasource
index 55c48d2d..c0a0052c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesPositionR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetAxesPositionR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetAxesPositionR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetAxesPositionR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetAxesPositionR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBinaryFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBinaryFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBinaryFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBinaryFileR.datasource
index dd8f56c5..64e823c4 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBinaryFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBinaryFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetBinaryFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetBinaryFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetBinaryFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBlkNumR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBlkNumR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBlkNumR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBlkNumR.datasource
index febe9bb2..31459267 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBlkNumR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetBlkNumR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetBlkNumR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetBlkNumR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetBlkNumR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCNCRegKeyR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCNCRegKeyR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCNCRegKeyR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCNCRegKeyR.datasource
index 24d9ab9a..d58255fd 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCNCRegKeyR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCNCRegKeyR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetCNCRegKeyR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetCNCRegKeyR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetCNCRegKeyR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCodeNumberR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCodeNumberR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCodeNumberR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCodeNumberR.datasource
index a2123316..15a1f34e 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCodeNumberR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetCodeNumberR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetCodeNumberR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetCodeNumberR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetCodeNumberR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetDateTimeR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetDateTimeR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetDateTimeR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetDateTimeR.datasource
index d0e36804..452d9812 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetDateTimeR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetDateTimeR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetDateTimeR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetDateTimeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetDateTimeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetFileR.datasource
index 00b74669..2b9196c1 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetGCodeR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetGCodeR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetGCodeR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetGCodeR.datasource
index ab62a0b9..142934b1 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetGCodeR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetGCodeR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetGCodeR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetGCodeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetGCodeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetHWKeyR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetHWKeyR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetHWKeyR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetHWKeyR.datasource
index 842dc6a0..33ee74af 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetHWKeyR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetHWKeyR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetHWKeyR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetHWKeyR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetHWKeyR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMCodeR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMCodeR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMCodeR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMCodeR.datasource
index a862dac6..15bd881e 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMCodeR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMCodeR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetMCodeR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetMCodeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetMCodeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMarkerInfoR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMarkerInfoR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMarkerInfoR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMarkerInfoR.datasource
index 5d5eb7cd..44f28f41 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMarkerInfoR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetMarkerInfoR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetMarkerInfoR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetMarkerInfoR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetMarkerInfoR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo1R.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo1R.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo1R.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo1R.datasource
index bc221bd7..b9c32867 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo1R.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo1R.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetNcInfo1R" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetNcInfo1R, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetNcInfo1R, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo2R.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo2R.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo2R.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo2R.datasource
index a6a30fc5..c54208ab 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo2R.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetNcInfo2R.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetNcInfo2R" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetNcInfo2R, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetNcInfo2R, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOffsetTabRecordIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOffsetTabRecordIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOffsetTabRecordIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOffsetTabRecordIIR.datasource
index 19c4861d..1a1aeddc 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOffsetTabRecordIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOffsetTabRecordIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetOffsetTabRecordIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetOffsetTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetOffsetTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOptionsR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOptionsR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOptionsR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOptionsR.datasource
index 735995e6..2c856edb 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOptionsR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOptionsR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetOptionsR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetOptionsR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetOptionsR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOriginTabRecordIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOriginTabRecordIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOriginTabRecordIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOriginTabRecordIIR.datasource
index 2d471b94..8015f6e3 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOriginTabRecordIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetOriginTabRecordIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetOriginTabRecordIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetOriginTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetOriginTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPTechSizesR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPTechSizesR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPTechSizesR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPTechSizesR.datasource
index 1d28a02d..29ae97cc 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPTechSizesR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPTechSizesR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetPTechSizesR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetPTechSizesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetPTechSizesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPartProgramLinesR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPartProgramLinesR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPartProgramLinesR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPartProgramLinesR.datasource
index 942bbb8c..ed331a9e 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPartProgramLinesR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetPartProgramLinesR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetPartProgramLinesR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetPartProgramLinesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetPartProgramLinesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcInInputR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcInInputR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcInInputR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcInInputR.datasource
index 3e7315c7..2d9a0320 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcInInputR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcInInputR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetProcInInputR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetProcInInputR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetProcInInputR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarDoubleR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarDoubleR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarDoubleR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarDoubleR.datasource
index 577eb4b4..eabd221a 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarDoubleR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarDoubleR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetProcVarDoubleR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetProcVarDoubleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetProcVarDoubleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarWordR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarWordR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarWordR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarWordR.datasource
index 552bb43b..22c77338 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarWordR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcVarWordR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetProcVarWordR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetProcVarWordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetProcVarWordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessConfNumR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessConfNumR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessConfNumR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessConfNumR.datasource
index ff66c736..0460e8c8 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessConfNumR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessConfNumR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetProcessConfNumR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetProcessConfNumR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetProcessConfNumR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessStatusR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessStatusR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessStatusR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessStatusR.datasource
index 5a1574c3..6c4f53c8 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessStatusR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetProcessStatusR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetProcessStatusR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetProcessStatusR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetProcessStatusR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSelectedProcessR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSelectedProcessR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSelectedProcessR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSelectedProcessR.datasource
index 57da0a6e..9b615566 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSelectedProcessR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSelectedProcessR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetSelectedProcessR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetSelectedProcessR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetSelectedProcessR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSerialNumberR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSerialNumberR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSerialNumberR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSerialNumberR.datasource
index f8b7d4db..f46fee9f 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSerialNumberR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSerialNumberR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetSerialNumberR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetSerialNumberR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetSerialNumberR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetServoParR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetServoParR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetServoParR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetServoParR.datasource
index 409f6ec2..83e3a6ec 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetServoParR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetServoParR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetServoParR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetServoParR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetServoParR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSysTickR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSysTickR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSysTickR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSysTickR.datasource
index dd0bc441..a96b0fde 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSysTickR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetSysTickR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetSysTickR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetSysTickR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetSysTickR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolNamesR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolNamesR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolNamesR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolNamesR.datasource
index f2605e36..78c519e1 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolNamesR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolNamesR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetToolNamesR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetToolNamesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetToolNamesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolTabRecordIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolTabRecordIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolTabRecordIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolTabRecordIIR.datasource
index aab7ab0f..df570f16 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolTabRecordIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetToolTabRecordIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetToolTabRecordIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetToolTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetToolTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetUserTabRecordIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetUserTabRecordIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetUserTabRecordIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetUserTabRecordIIR.datasource
index b5fc2eef..e3fc9a03 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetUserTabRecordIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetUserTabRecordIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetUserTabRecordIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetUserTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetUserTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarJOGR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarJOGR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarJOGR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarJOGR.datasource
index b3efd6bf..e440584c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarJOGR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarJOGR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetVarJOGR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetVarJOGR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetVarJOGR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarRCMR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarRCMR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarRCMR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarRCMR.datasource
index 8c48f711..9fc7334f 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarRCMR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.GetVarRCMR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GetVarRCMR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.GetVarRCMR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.GetVarRCMR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.HoldR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.HoldR.datasource
similarity index 73%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.HoldR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.HoldR.datasource
index 73637875..faf661f5 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.HoldR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.HoldR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="HoldR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.HoldR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.HoldR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LoadPTechR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LoadPTechR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LoadPTechR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LoadPTechR.datasource
index 7d7331c2..910c4671 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LoadPTechR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LoadPTechR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LoadPTechR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LoadPTechR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LoadPTechR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LockTableIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LockTableIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LockTableIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LockTableIIR.datasource
index 19663ce7..8328834c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LockTableIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LockTableIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LockTableIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LockTableIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LockTableIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSAddDriveR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSAddDriveR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSAddDriveR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSAddDriveR.datasource
index 0f06a989..cdb41c4c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSAddDriveR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSAddDriveR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSAddDriveR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSAddDriveR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSAddDriveR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSChangeFileAttribR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSChangeFileAttribR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSChangeFileAttribR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSChangeFileAttribR.datasource
index 2be5fd2b..91a52276 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSChangeFileAttribR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSChangeFileAttribR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSChangeFileAttribR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSChangeFileAttribR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSChangeFileAttribR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCloseFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCloseFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCloseFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCloseFileR.datasource
index b7304163..51050772 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCloseFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCloseFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSCloseFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSCloseFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSCloseFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCopyFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCopyFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCopyFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCopyFileR.datasource
index bcda452f..953af69d 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCopyFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCopyFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSCopyFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSCopyFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSCopyFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateDirR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateDirR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateDirR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateDirR.datasource
index c44f4637..0fae391c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateDirR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateDirR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSCreateDirR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSCreateDirR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSCreateDirR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateFileR.datasource
index 65e7df57..3e1148ae 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSCreateFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSCreateFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSCreateFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSCreateFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindCloseR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindCloseR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindCloseR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindCloseR.datasource
index adc9027a..5faedf85 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindCloseR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindCloseR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSFindCloseR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSFindCloseR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSFindCloseR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindFirstR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindFirstR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindFirstR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindFirstR.datasource
index e6bc4fd7..71f3880d 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindFirstR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindFirstR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSFindFirstR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSFindFirstR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSFindFirstR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindNextR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindNextR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindNextR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindNextR.datasource
index d9482e01..69ef7ea2 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindNextR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSFindNextR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSFindNextR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSFindNextR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSFindNextR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDriveListR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDriveListR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDriveListR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDriveListR.datasource
index ce158c7e..58740005 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDriveListR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDriveListR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSGetDriveListR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSGetDriveListR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSGetDriveListR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDrivePathR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDrivePathR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDrivePathR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDrivePathR.datasource
index 012cf933..cb7e7c58 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDrivePathR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetDrivePathR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSGetDrivePathR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSGetDrivePathR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSGetDrivePathR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileAttribR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileAttribR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileAttribR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileAttribR.datasource
index 5b675259..c7db6a14 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileAttribR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileAttribR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSGetFileAttribR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSGetFileAttribR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSGetFileAttribR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileSizeR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileSizeR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileSizeR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileSizeR.datasource
index 63c9d230..ca40b015 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileSizeR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetFileSizeR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSGetFileSizeR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSGetFileSizeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSGetFileSizeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetHiddenDriveListR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetHiddenDriveListR.datasource
similarity index 71%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetHiddenDriveListR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetHiddenDriveListR.datasource
index 0da3fb55..091a727a 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetHiddenDriveListR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetHiddenDriveListR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSGetHiddenDriveListR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSGetHiddenDriveListR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSGetHiddenDriveListR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetInfoR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetInfoR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetInfoR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetInfoR.datasource
index f3e4849e..7bfb253c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetInfoR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetInfoR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSGetInfoR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSGetInfoR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSGetInfoR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetNumDriveR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetNumDriveR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetNumDriveR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetNumDriveR.datasource
index 61e2514c..0860f35d 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetNumDriveR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetNumDriveR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSGetNumDriveR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSGetNumDriveR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSGetNumDriveR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetSecurityLevelR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetSecurityLevelR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetSecurityLevelR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetSecurityLevelR.datasource
index f8a22648..59886a1f 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetSecurityLevelR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSGetSecurityLevelR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSGetSecurityLevelR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSGetSecurityLevelR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSGetSecurityLevelR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSLongFileNamesR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSLongFileNamesR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSLongFileNamesR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSLongFileNamesR.datasource
index b9b0beac..17207ded 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSLongFileNamesR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSLongFileNamesR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSLongFileNamesR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSLongFileNamesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSLongFileNamesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSOpenFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSOpenFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSOpenFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSOpenFileR.datasource
index e79bc941..6f733dc2 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSOpenFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSOpenFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSOpenFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSOpenFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSOpenFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReadRecordR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReadRecordR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReadRecordR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReadRecordR.datasource
index bac7b1d8..6ebfc0e0 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReadRecordR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReadRecordR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSReadRecordR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSReadRecordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSReadRecordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReloadDriveListR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReloadDriveListR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReloadDriveListR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReloadDriveListR.datasource
index 8286c90f..8ff30a8b 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReloadDriveListR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSReloadDriveListR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSReloadDriveListR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSReloadDriveListR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSReloadDriveListR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDirR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDirR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDirR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDirR.datasource
index 5f921528..78cf8860 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDirR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDirR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSRemoveDirR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSRemoveDirR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSRemoveDirR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDriveR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDriveR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDriveR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDriveR.datasource
index a80664f9..bc1c9d92 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDriveR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveDriveR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSRemoveDriveR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSRemoveDriveR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSRemoveDriveR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveFileR.datasource
index c8ff9c65..bf457f41 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRemoveFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSRemoveFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSRemoveFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSRemoveFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRenameR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRenameR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRenameR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRenameR.datasource
index 6d2ee4a2..868b6837 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRenameR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSRenameR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSRenameR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSRenameR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSRenameR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetFileAttribR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetFileAttribR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetFileAttribR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetFileAttribR.datasource
index 377c20ac..3632932b 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetFileAttribR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetFileAttribR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSSetFileAttribR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSSetFileAttribR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSSetFileAttribR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetSecurityLevelR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetSecurityLevelR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetSecurityLevelR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetSecurityLevelR.datasource
index 93b662d8..4daa0c37 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetSecurityLevelR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSSetSecurityLevelR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSSetSecurityLevelR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSSetSecurityLevelR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSSetSecurityLevelR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSWriteRecordR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSWriteRecordR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSWriteRecordR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSWriteRecordR.datasource
index f82734ab..1608c1ea 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSWriteRecordR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.LogFSWriteRecordR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="LogFSWriteRecordR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.LogFSWriteRecordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.LogFSWriteRecordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ManagePartProgramR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ManagePartProgramR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ManagePartProgramR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ManagePartProgramR.datasource
index e79f5a7a..65d61f50 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ManagePartProgramR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ManagePartProgramR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ManagePartProgramR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ManagePartProgramR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ManagePartProgramR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonAddVariableR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonAddVariableR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonAddVariableR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonAddVariableR.datasource
index 1bd78416..17a8f442 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonAddVariableR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonAddVariableR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="MonAddVariableR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.MonAddVariableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.MonAddVariableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonCloseChannelR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonCloseChannelR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonCloseChannelR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonCloseChannelR.datasource
index 5a5483a9..a002a936 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonCloseChannelR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonCloseChannelR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="MonCloseChannelR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.MonCloseChannelR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.MonCloseChannelR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonDeleteVariableR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonDeleteVariableR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonDeleteVariableR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonDeleteVariableR.datasource
index b464d877..9b30a1f3 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonDeleteVariableR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonDeleteVariableR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="MonDeleteVariableR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.MonDeleteVariableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.MonDeleteVariableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonGetVariableR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonGetVariableR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonGetVariableR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonGetVariableR.datasource
index 0af43f39..3678444b 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonGetVariableR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonGetVariableR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="MonGetVariableR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.MonGetVariableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.MonGetVariableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonOpenChannelR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonOpenChannelR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonOpenChannelR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonOpenChannelR.datasource
index 3d1c7195..4c22719c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonOpenChannelR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonOpenChannelR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="MonOpenChannelR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.MonOpenChannelR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.MonOpenChannelR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStartSamplingR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStartSamplingR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStartSamplingR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStartSamplingR.datasource
index 0f7dc81f..4e08413e 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStartSamplingR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStartSamplingR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="MonStartSamplingR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.MonStartSamplingR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.MonStartSamplingR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStopSamplingR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStopSamplingR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStopSamplingR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStopSamplingR.datasource
index 3ff00c1e..459a3194 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStopSamplingR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.MonStopSamplingR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="MonStopSamplingR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.MonStopSamplingR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.MonStopSamplingR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutBinaryFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutBinaryFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutBinaryFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutBinaryFileR.datasource
index 3df16227..944b88f8 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutBinaryFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutBinaryFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="PutBinaryFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.PutBinaryFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.PutBinaryFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutFileR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutFileR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutFileR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutFileR.datasource
index c8cf7390..2e3a3aac 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutFileR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.PutFileR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="PutFileR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.PutFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.PutFileR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentAnomalyMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentAnomalyMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentAnomalyMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentAnomalyMsgR.datasource
index 929e87ab..5cdfdb57 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentAnomalyMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentAnomalyMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadCurrentAnomalyMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadCurrentAnomalyMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadCurrentAnomalyMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentEmergMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentEmergMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentEmergMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentEmergMsgR.datasource
index 43fcfa0f..c0a8ffa0 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentEmergMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentEmergMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadCurrentEmergMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadCurrentEmergMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadCurrentEmergMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentErrorMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentErrorMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentErrorMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentErrorMsgR.datasource
index f864ff13..1dd7dc18 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentErrorMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadCurrentErrorMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadCurrentErrorMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadCurrentErrorMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadCurrentErrorMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadErrMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadErrMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadErrMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadErrMsgR.datasource
index df92838c..cdd5a555 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadErrMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadErrMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadErrMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadErrMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadErrMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryAnomalyMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryAnomalyMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryAnomalyMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryAnomalyMsgR.datasource
index 3d328d36..ec94a4db 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryAnomalyMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryAnomalyMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadHistoryAnomalyMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadHistoryAnomalyMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadHistoryAnomalyMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryEmergMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryEmergMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryEmergMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryEmergMsgR.datasource
index a5e813a3..bb6569e9 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryEmergMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryEmergMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadHistoryEmergMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadHistoryEmergMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadHistoryEmergMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryErrorMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryErrorMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryErrorMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryErrorMsgR.datasource
index 7b023c0f..b6dbe75c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryErrorMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryErrorMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadHistoryErrorMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadHistoryErrorMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadHistoryErrorMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryLogMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryLogMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryLogMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryLogMsgR.datasource
index 2a1b5a70..d39f7a80 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryLogMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadHistoryLogMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadHistoryLogMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadHistoryLogMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadHistoryLogMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadPartProgramMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadPartProgramMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadPartProgramMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadPartProgramMsgR.datasource
index 7555cbc2..631b6755 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadPartProgramMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadPartProgramMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadPartProgramMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadPartProgramMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadPartProgramMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadRemapDefinitionsR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadRemapDefinitionsR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadRemapDefinitionsR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadRemapDefinitionsR.datasource
index d48b0aaa..39b36ffb 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadRemapDefinitionsR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadRemapDefinitionsR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadRemapDefinitionsR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadRemapDefinitionsR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadRemapDefinitionsR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarDoubleR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarDoubleR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarDoubleR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarDoubleR.datasource
index 64e22df5..ce652ed6 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarDoubleR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarDoubleR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadVarDoubleR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadVarDoubleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadVarDoubleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarTextR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarTextR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarTextR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarTextR.datasource
index 57b521ed..861847aa 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarTextR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarTextR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadVarTextR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadVarTextR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadVarTextR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarWordR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarWordR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarWordR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarWordR.datasource
index fb6112bd..6f97a86d 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarWordR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadVarWordR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadVarWordR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadVarWordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadVarWordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadWarningMsgR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadWarningMsgR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadWarningMsgR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadWarningMsgR.datasource
index c30a72c4..e62a6004 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadWarningMsgR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ReadWarningMsgR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ReadWarningMsgR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ReadWarningMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ReadWarningMsgR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetR.datasource
similarity index 73%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetR.datasource
index b3fa2aa4..ef61eaa2 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ResetR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ResetR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ResetR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetSingleTableIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetSingleTableIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetSingleTableIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetSingleTableIIR.datasource
index 253a86c1..0808bf64 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetSingleTableIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.ResetSingleTableIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ResetSingleTableIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.ResetSingleTableIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.ResetSingleTableIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreBackupMemoryR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreBackupMemoryR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreBackupMemoryR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreBackupMemoryR.datasource
index 26e9e461..153cebdf 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreBackupMemoryR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreBackupMemoryR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="RestoreBackupMemoryR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.RestoreBackupMemoryR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.RestoreBackupMemoryR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreSingleTableR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreSingleTableR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreSingleTableR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreSingleTableR.datasource
index 9068e37b..334e5cb6 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreSingleTableR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.RestoreSingleTableR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="RestoreSingleTableR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.RestoreSingleTableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.RestoreSingleTableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveBackupMemoryR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveBackupMemoryR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveBackupMemoryR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveBackupMemoryR.datasource
index 5e8d8c8b..c00c2255 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveBackupMemoryR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveBackupMemoryR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SaveBackupMemoryR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SaveBackupMemoryR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SaveBackupMemoryR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveSingleTableR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveSingleTableR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveSingleTableR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveSingleTableR.datasource
index 235c6b34..d101bb7e 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveSingleTableR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveSingleTableR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SaveSingleTableR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SaveSingleTableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SaveSingleTableR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveTablesR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveTablesR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveTablesR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveTablesR.datasource
index 6ebe90b9..a9a1b656 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveTablesR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SaveTablesR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SaveTablesR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SaveTablesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SaveTablesR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramFromDriveR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramFromDriveR.datasource
similarity index 71%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramFromDriveR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramFromDriveR.datasource
index a73efdac..99f86a93 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramFromDriveR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramFromDriveR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SelectPartProgramFromDriveR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SelectPartProgramFromDriveR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SelectPartProgramFromDriveR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramR.datasource
index 07b3ce1a..6325ecf5 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectPartProgramR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SelectPartProgramR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SelectPartProgramR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SelectPartProgramR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcAxisR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcAxisR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcAxisR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcAxisR.datasource
index 6f63933f..17ef15ee 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcAxisR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcAxisR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SelectProcAxisR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SelectProcAxisR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SelectProcAxisR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcessR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcessR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcessR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcessR.datasource
index 20b58cba..1b866f8e 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcessR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SelectProcessR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SelectProcessR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SelectProcessR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SelectProcessR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetDateTimeR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetDateTimeR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetDateTimeR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetDateTimeR.datasource
index 736ce121..cfb3f83a 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetDateTimeR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetDateTimeR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetDateTimeR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetDateTimeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetDateTimeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedManOverR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedManOverR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedManOverR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedManOverR.datasource
index 8104d013..65187000 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedManOverR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedManOverR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetFeedManOverR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetFeedManOverR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetFeedManOverR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRapidOverR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRapidOverR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRapidOverR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRapidOverR.datasource
index 5af90c9d..9faa0ee3 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRapidOverR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRapidOverR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetFeedRapidOverR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetFeedRapidOverR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetFeedRapidOverR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRateOverR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRateOverR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRateOverR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRateOverR.datasource
index 6af2261f..d674f35d 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRateOverR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetFeedRateOverR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetFeedRateOverR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetFeedRateOverR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetFeedRateOverR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetIpAddressR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetIpAddressR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetIpAddressR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetIpAddressR.datasource
index 720042ad..babecf7c 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetIpAddressR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetIpAddressR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetIpAddressR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetIpAddressR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetIpAddressR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetManMovDirectionR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetManMovDirectionR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetManMovDirectionR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetManMovDirectionR.datasource
index 94e38d31..b855db08 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetManMovDirectionR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetManMovDirectionR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetManMovDirectionR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetManMovDirectionR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetManMovDirectionR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetMdiStringR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetMdiStringR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetMdiStringR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetMdiStringR.datasource
index edc50876..b9bc7a01 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetMdiStringR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetMdiStringR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetMdiStringR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetMdiStringR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetMdiStringR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOffsetTabRecordIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOffsetTabRecordIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOffsetTabRecordIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOffsetTabRecordIIR.datasource
index 82795167..b848c09d 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOffsetTabRecordIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOffsetTabRecordIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetOffsetTabRecordIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetOffsetTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetOffsetTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOriginTabRecordIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOriginTabRecordIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOriginTabRecordIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOriginTabRecordIIR.datasource
index 86f619a7..8c7ab4b8 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOriginTabRecordIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetOriginTabRecordIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetOriginTabRecordIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetOriginTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetOriginTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarDoubleR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarDoubleR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarDoubleR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarDoubleR.datasource
index 46c05157..6c083993 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarDoubleR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarDoubleR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetProcVarDoubleR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetProcVarDoubleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetProcVarDoubleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarWordR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarWordR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarWordR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarWordR.datasource
index 0d80f3bb..89279041 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarWordR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcVarWordR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetProcVarWordR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetProcVarWordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetProcVarWordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcessModeR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcessModeR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcessModeR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcessModeR.datasource
index cfbb27f7..a600a5e0 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcessModeR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetProcessModeR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetProcessModeR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetProcessModeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetProcessModeR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetServoParR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetServoParR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetServoParR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetServoParR.datasource
index cb5b64f8..bb77e668 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetServoParR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetServoParR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetServoParR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetServoParR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetServoParR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetSpeedRateOverR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetSpeedRateOverR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetSpeedRateOverR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetSpeedRateOverR.datasource
index 825118d3..de30d9de 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetSpeedRateOverR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetSpeedRateOverR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetSpeedRateOverR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetSpeedRateOverR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetSpeedRateOverR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetToolTabRecordIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetToolTabRecordIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetToolTabRecordIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetToolTabRecordIIR.datasource
index c6f6a332..90dfd5e0 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetToolTabRecordIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetToolTabRecordIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetToolTabRecordIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetToolTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetToolTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetUserTabRecordIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetUserTabRecordIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetUserTabRecordIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetUserTabRecordIIR.datasource
index 4763b3f2..2485b35e 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetUserTabRecordIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetUserTabRecordIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetUserTabRecordIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetUserTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetUserTabRecordIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarJOGR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarJOGR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarJOGR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarJOGR.datasource
index 161609b0..25fb98c1 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarJOGR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarJOGR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetVarJOGR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetVarJOGR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetVarJOGR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarRCMR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarRCMR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarRCMR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarRCMR.datasource
index c9f6538d..57633784 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarRCMR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarRCMR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetVarRCMR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetVarRCMR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetVarRCMR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarUASR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarUASR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarUASR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarUASR.datasource
index f4d06025..0e050f7d 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarUASR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SetVarUASR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SetVarUASR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SetVarUASR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SetVarUASR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SkipPProgBlockR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SkipPProgBlockR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SkipPProgBlockR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SkipPProgBlockR.datasource
index 3a6c1665..6f15015f 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SkipPProgBlockR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SkipPProgBlockR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SkipPProgBlockR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SkipPProgBlockR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SkipPProgBlockR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SndProcInpDataR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SndProcInpDataR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SndProcInpDataR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SndProcInpDataR.datasource
index 307ec90d..944ed982 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SndProcInpDataR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SndProcInpDataR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SndProcInpDataR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SndProcInpDataR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SndProcInpDataR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SyncroCycleR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SyncroCycleR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SyncroCycleR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SyncroCycleR.datasource
index 8b7d9f4c..db608a03 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SyncroCycleR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.SyncroCycleR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="SyncroCycleR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.SyncroCycleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.SyncroCycleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.UnLockTableIIR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.UnLockTableIIR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.UnLockTableIIR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.UnLockTableIIR.datasource
index da8ec342..648cd0c3 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.UnLockTableIIR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.UnLockTableIIR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="UnLockTableIIR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.UnLockTableIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.UnLockTableIIR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteRemapDefinitionsR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteRemapDefinitionsR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteRemapDefinitionsR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteRemapDefinitionsR.datasource
index f97364ea..30f9e08d 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteRemapDefinitionsR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteRemapDefinitionsR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="WriteRemapDefinitionsR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.WriteRemapDefinitionsR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.WriteRemapDefinitionsR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarDoubleR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarDoubleR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarDoubleR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarDoubleR.datasource
index 46ed79a9..1a62a52f 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarDoubleR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarDoubleR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="WriteVarDoubleR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.WriteVarDoubleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.WriteVarDoubleR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarTextR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarTextR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarTextR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarTextR.datasource
index d49288be..23e5d637 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarTextR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarTextR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="WriteVarTextR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.WriteVarTextR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.WriteVarTextR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordBitR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordBitR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordBitR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordBitR.datasource
index 0044aae1..26615c4b 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordBitR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordBitR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="WriteVarWordBitR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.WriteVarWordBitR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.WriteVarWordBitR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordR.datasource
similarity index 72%
rename from CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordR.datasource
index 059fb302..a5758aa3 100644
--- a/CncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordR.datasource	
+++ b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CMSCncLib.OPENcontrol.WriteVarWordR.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="WriteVarWordR" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CMSCncLib.OPENcontrol.WriteVarWordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>CMSEgwProxy.MultiCncLib.OPENcontrol.WriteVarWordR, Service References.OPENcontrol.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/CncLib/Service References/OPENcontrol/CncLib.OPENcontrol.BootPhaseEnquiryR.datasource b/EgwProxy.MultiCncLib/Service References/OPENcontrol/CncLib.OPENcontrol.BootPhaseEnquiryR.datasource
similarity index 100%
rename from CncLib/Service References/OPENcontrol/CncLib.OPENcontrol.BootPhaseEnquiryR.datasource
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/CncLib.OPENcontrol.BootPhaseEnquiryR.datasource
diff --git a/CncLib/Service References/OPENcontrol/OPENcontrol.wsdl b/EgwProxy.MultiCncLib/Service References/OPENcontrol/OPENcontrol.wsdl
similarity index 100%
rename from CncLib/Service References/OPENcontrol/OPENcontrol.wsdl
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/OPENcontrol.wsdl
diff --git a/CncLib/Service References/OPENcontrol/Reference.svcmap b/EgwProxy.MultiCncLib/Service References/OPENcontrol/Reference.svcmap
similarity index 100%
rename from CncLib/Service References/OPENcontrol/Reference.svcmap
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/Reference.svcmap
diff --git a/CncLib/Service References/OPENcontrol/Reference.vb b/EgwProxy.MultiCncLib/Service References/OPENcontrol/Reference.vb
similarity index 100%
rename from CncLib/Service References/OPENcontrol/Reference.vb
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/Reference.vb
diff --git a/CncLib/Service References/OPENcontrol/configuration.svcinfo b/EgwProxy.MultiCncLib/Service References/OPENcontrol/configuration.svcinfo
similarity index 100%
rename from CncLib/Service References/OPENcontrol/configuration.svcinfo
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/configuration.svcinfo
diff --git a/CncLib/Service References/OPENcontrol/configuration91.svcinfo b/EgwProxy.MultiCncLib/Service References/OPENcontrol/configuration91.svcinfo
similarity index 100%
rename from CncLib/Service References/OPENcontrol/configuration91.svcinfo
rename to EgwProxy.MultiCncLib/Service References/OPENcontrol/configuration91.svcinfo
diff --git a/CncLib/app.config b/EgwProxy.MultiCncLib/app.config
similarity index 100%
rename from CncLib/app.config
rename to EgwProxy.MultiCncLib/app.config
diff --git a/EgwProxy.OsaiCncLib/EgwProxy.OsaiCncLib.dll b/EgwProxy.OsaiCncLib/EgwProxy.OsaiCncLib.dll
index c7bb1b1e..b3bab9b9 100644
Binary files a/EgwProxy.OsaiCncLib/EgwProxy.OsaiCncLib.dll and b/EgwProxy.OsaiCncLib/EgwProxy.OsaiCncLib.dll differ