diff --git a/.env.development b/.env.development index 8bea584..b642bec 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_USE_CGI=false # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.416 +NEXT_PUBLIC_APP_VERSION=1.6.417 NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsmock (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) diff --git a/.env.production b/.env.production index cc7aebd..3120964 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_USE_CGI=true # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.416 +NEXT_PUBLIC_APP_VERSION=1.6.417 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/mocks/js-simulator/4000values/slot0.json b/mocks/device-cgi-simulator/4000values/slot0.json similarity index 100% rename from mocks/js-simulator/4000values/slot0.json rename to mocks/device-cgi-simulator/4000values/slot0.json diff --git a/mocks/js-simulator/4000values/slot1.json b/mocks/device-cgi-simulator/4000values/slot1.json similarity index 100% rename from mocks/js-simulator/4000values/slot1.json rename to mocks/device-cgi-simulator/4000values/slot1.json diff --git a/mocks/js-simulator/4000values/slot10.json b/mocks/device-cgi-simulator/4000values/slot10.json similarity index 100% rename from mocks/js-simulator/4000values/slot10.json rename to mocks/device-cgi-simulator/4000values/slot10.json diff --git a/mocks/js-simulator/4000values/slot11.json b/mocks/device-cgi-simulator/4000values/slot11.json similarity index 100% rename from mocks/js-simulator/4000values/slot11.json rename to mocks/device-cgi-simulator/4000values/slot11.json diff --git a/mocks/js-simulator/4000values/slot12.json b/mocks/device-cgi-simulator/4000values/slot12.json similarity index 100% rename from mocks/js-simulator/4000values/slot12.json rename to mocks/device-cgi-simulator/4000values/slot12.json diff --git a/mocks/js-simulator/4000values/slot13.json b/mocks/device-cgi-simulator/4000values/slot13.json similarity index 100% rename from mocks/js-simulator/4000values/slot13.json rename to mocks/device-cgi-simulator/4000values/slot13.json diff --git a/mocks/js-simulator/4000values/slot14.json b/mocks/device-cgi-simulator/4000values/slot14.json similarity index 100% rename from mocks/js-simulator/4000values/slot14.json rename to mocks/device-cgi-simulator/4000values/slot14.json diff --git a/mocks/js-simulator/4000values/slot15.json b/mocks/device-cgi-simulator/4000values/slot15.json similarity index 100% rename from mocks/js-simulator/4000values/slot15.json rename to mocks/device-cgi-simulator/4000values/slot15.json diff --git a/mocks/js-simulator/4000values/slot16.json b/mocks/device-cgi-simulator/4000values/slot16.json similarity index 100% rename from mocks/js-simulator/4000values/slot16.json rename to mocks/device-cgi-simulator/4000values/slot16.json diff --git a/mocks/js-simulator/4000values/slot17.json b/mocks/device-cgi-simulator/4000values/slot17.json similarity index 100% rename from mocks/js-simulator/4000values/slot17.json rename to mocks/device-cgi-simulator/4000values/slot17.json diff --git a/mocks/js-simulator/4000values/slot18.json b/mocks/device-cgi-simulator/4000values/slot18.json similarity index 100% rename from mocks/js-simulator/4000values/slot18.json rename to mocks/device-cgi-simulator/4000values/slot18.json diff --git a/mocks/js-simulator/4000values/slot19.json b/mocks/device-cgi-simulator/4000values/slot19.json similarity index 100% rename from mocks/js-simulator/4000values/slot19.json rename to mocks/device-cgi-simulator/4000values/slot19.json diff --git a/mocks/js-simulator/4000values/slot2.json b/mocks/device-cgi-simulator/4000values/slot2.json similarity index 100% rename from mocks/js-simulator/4000values/slot2.json rename to mocks/device-cgi-simulator/4000values/slot2.json diff --git a/mocks/js-simulator/4000values/slot20.json b/mocks/device-cgi-simulator/4000values/slot20.json similarity index 100% rename from mocks/js-simulator/4000values/slot20.json rename to mocks/device-cgi-simulator/4000values/slot20.json diff --git a/mocks/js-simulator/4000values/slot21.json b/mocks/device-cgi-simulator/4000values/slot21.json similarity index 100% rename from mocks/js-simulator/4000values/slot21.json rename to mocks/device-cgi-simulator/4000values/slot21.json diff --git a/mocks/js-simulator/4000values/slot22.json b/mocks/device-cgi-simulator/4000values/slot22.json similarity index 100% rename from mocks/js-simulator/4000values/slot22.json rename to mocks/device-cgi-simulator/4000values/slot22.json diff --git a/mocks/js-simulator/4000values/slot23.json b/mocks/device-cgi-simulator/4000values/slot23.json similarity index 100% rename from mocks/js-simulator/4000values/slot23.json rename to mocks/device-cgi-simulator/4000values/slot23.json diff --git a/mocks/js-simulator/4000values/slot24.json b/mocks/device-cgi-simulator/4000values/slot24.json similarity index 100% rename from mocks/js-simulator/4000values/slot24.json rename to mocks/device-cgi-simulator/4000values/slot24.json diff --git a/mocks/js-simulator/4000values/slot25.json b/mocks/device-cgi-simulator/4000values/slot25.json similarity index 100% rename from mocks/js-simulator/4000values/slot25.json rename to mocks/device-cgi-simulator/4000values/slot25.json diff --git a/mocks/js-simulator/4000values/slot26.json b/mocks/device-cgi-simulator/4000values/slot26.json similarity index 100% rename from mocks/js-simulator/4000values/slot26.json rename to mocks/device-cgi-simulator/4000values/slot26.json diff --git a/mocks/js-simulator/4000values/slot27.json b/mocks/device-cgi-simulator/4000values/slot27.json similarity index 100% rename from mocks/js-simulator/4000values/slot27.json rename to mocks/device-cgi-simulator/4000values/slot27.json diff --git a/mocks/js-simulator/4000values/slot28.json b/mocks/device-cgi-simulator/4000values/slot28.json similarity index 100% rename from mocks/js-simulator/4000values/slot28.json rename to mocks/device-cgi-simulator/4000values/slot28.json diff --git a/mocks/js-simulator/4000values/slot29.json b/mocks/device-cgi-simulator/4000values/slot29.json similarity index 100% rename from mocks/js-simulator/4000values/slot29.json rename to mocks/device-cgi-simulator/4000values/slot29.json diff --git a/mocks/js-simulator/4000values/slot3.json b/mocks/device-cgi-simulator/4000values/slot3.json similarity index 100% rename from mocks/js-simulator/4000values/slot3.json rename to mocks/device-cgi-simulator/4000values/slot3.json diff --git a/mocks/js-simulator/4000values/slot30.json b/mocks/device-cgi-simulator/4000values/slot30.json similarity index 100% rename from mocks/js-simulator/4000values/slot30.json rename to mocks/device-cgi-simulator/4000values/slot30.json diff --git a/mocks/js-simulator/4000values/slot31.json b/mocks/device-cgi-simulator/4000values/slot31.json similarity index 100% rename from mocks/js-simulator/4000values/slot31.json rename to mocks/device-cgi-simulator/4000values/slot31.json diff --git a/mocks/js-simulator/4000values/slot4.json b/mocks/device-cgi-simulator/4000values/slot4.json similarity index 100% rename from mocks/js-simulator/4000values/slot4.json rename to mocks/device-cgi-simulator/4000values/slot4.json diff --git a/mocks/js-simulator/4000values/slot5.json b/mocks/device-cgi-simulator/4000values/slot5.json similarity index 100% rename from mocks/js-simulator/4000values/slot5.json rename to mocks/device-cgi-simulator/4000values/slot5.json diff --git a/mocks/js-simulator/4000values/slot6.json b/mocks/device-cgi-simulator/4000values/slot6.json similarity index 100% rename from mocks/js-simulator/4000values/slot6.json rename to mocks/device-cgi-simulator/4000values/slot6.json diff --git a/mocks/js-simulator/4000values/slot7.json b/mocks/device-cgi-simulator/4000values/slot7.json similarity index 100% rename from mocks/js-simulator/4000values/slot7.json rename to mocks/device-cgi-simulator/4000values/slot7.json diff --git a/mocks/js-simulator/4000values/slot8.json b/mocks/device-cgi-simulator/4000values/slot8.json similarity index 100% rename from mocks/js-simulator/4000values/slot8.json rename to mocks/device-cgi-simulator/4000values/slot8.json diff --git a/mocks/js-simulator/4000values/slot9.json b/mocks/device-cgi-simulator/4000values/slot9.json similarity index 100% rename from mocks/js-simulator/4000values/slot9.json rename to mocks/device-cgi-simulator/4000values/slot9.json diff --git a/mocks/js-simulator/SERVICE/SystemMockData.js b/mocks/device-cgi-simulator/SERVICE/SystemMockData.js similarity index 100% rename from mocks/js-simulator/SERVICE/SystemMockData.js rename to mocks/device-cgi-simulator/SERVICE/SystemMockData.js diff --git a/mocks/js-simulator/SERVICE/analogeEingaengeMockData.js b/mocks/device-cgi-simulator/SERVICE/analogeEingaengeMockData.js similarity index 100% rename from mocks/js-simulator/SERVICE/analogeEingaengeMockData.js rename to mocks/device-cgi-simulator/SERVICE/analogeEingaengeMockData.js diff --git a/mocks/js-simulator/SERVICE/digitaleAusgaengeMockData.js b/mocks/device-cgi-simulator/SERVICE/digitaleAusgaengeMockData.js similarity index 100% rename from mocks/js-simulator/SERVICE/digitaleAusgaengeMockData.js rename to mocks/device-cgi-simulator/SERVICE/digitaleAusgaengeMockData.js diff --git a/mocks/js-simulator/SERVICE/digitaleEingaengeMockData.js b/mocks/device-cgi-simulator/SERVICE/digitaleEingaengeMockData.js similarity index 100% rename from mocks/js-simulator/SERVICE/digitaleEingaengeMockData.js rename to mocks/device-cgi-simulator/SERVICE/digitaleEingaengeMockData.js diff --git a/mocks/js-simulator/SERVICE/kabelueberwachungMockData.js b/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js similarity index 100% rename from mocks/js-simulator/SERVICE/kabelueberwachungMockData.js rename to mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot0.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot0.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot0.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot0.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot1.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot1.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot1.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot1.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot10.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot10.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot10.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot10.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot11.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot11.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot11.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot11.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot12.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot12.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot12.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot12.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot13.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot13.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot13.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot13.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot14.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot14.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot14.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot14.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot15.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot15.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot15.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot15.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot16.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot16.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot16.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot16.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot17.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot17.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot17.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot17.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot18.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot18.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot18.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot18.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot19.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot19.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot19.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot19.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot2.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot2.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot2.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot2.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot20.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot20.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot20.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot20.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot21.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot21.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot21.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot21.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot22.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot22.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot22.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot22.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot23.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot23.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot23.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot23.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot24.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot24.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot24.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot24.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot25.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot25.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot25.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot25.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot26.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot26.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot26.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot26.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot27.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot27.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot27.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot27.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot28.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot28.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot28.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot28.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot29.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot29.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot29.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot29.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot3.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot3.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot3.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot3.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot30.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot30.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot30.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot30.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot31.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot31.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot31.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot31.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot4.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot4.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot4.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot4.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot5.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot5.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot5.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot5.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot6.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot6.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot6.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot6.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot7.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot7.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot7.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot7.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot8.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot8.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot8.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot8.js diff --git a/mocks/js-simulator/SERVICE/knotenpunkte/slot9.js b/mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot9.js similarity index 100% rename from mocks/js-simulator/SERVICE/knotenpunkte/slot9.js rename to mocks/device-cgi-simulator/SERVICE/knotenpunkte/slot9.js diff --git a/mocks/js-simulator/SERVICE/last20MessagesMockData.js b/mocks/device-cgi-simulator/SERVICE/last20MessagesMockData.js similarity index 100% rename from mocks/js-simulator/SERVICE/last20MessagesMockData.js rename to mocks/device-cgi-simulator/SERVICE/last20MessagesMockData.js diff --git a/mocks/js-simulator/SERVICE/opcuaMockData.js b/mocks/device-cgi-simulator/SERVICE/opcuaMockData.js similarity index 100% rename from mocks/js-simulator/SERVICE/opcuaMockData.js rename to mocks/device-cgi-simulator/SERVICE/opcuaMockData.js diff --git a/mocks/js-simulator/SERVICE/systemVoltTempMockData.js b/mocks/device-cgi-simulator/SERVICE/systemVoltTempMockData.js similarity index 100% rename from mocks/js-simulator/SERVICE/systemVoltTempMockData.js rename to mocks/device-cgi-simulator/SERVICE/systemVoltTempMockData.js diff --git a/mocks/js-simulator/TDM/slot0.json b/mocks/device-cgi-simulator/TDM/slot0.json similarity index 100% rename from mocks/js-simulator/TDM/slot0.json rename to mocks/device-cgi-simulator/TDM/slot0.json diff --git a/mocks/js-simulator/TDM/slot1.json b/mocks/device-cgi-simulator/TDM/slot1.json similarity index 100% rename from mocks/js-simulator/TDM/slot1.json rename to mocks/device-cgi-simulator/TDM/slot1.json diff --git a/mocks/js-simulator/TDM/slot10.json b/mocks/device-cgi-simulator/TDM/slot10.json similarity index 100% rename from mocks/js-simulator/TDM/slot10.json rename to mocks/device-cgi-simulator/TDM/slot10.json diff --git a/mocks/js-simulator/TDM/slot11.json b/mocks/device-cgi-simulator/TDM/slot11.json similarity index 100% rename from mocks/js-simulator/TDM/slot11.json rename to mocks/device-cgi-simulator/TDM/slot11.json diff --git a/mocks/js-simulator/TDM/slot12.json b/mocks/device-cgi-simulator/TDM/slot12.json similarity index 100% rename from mocks/js-simulator/TDM/slot12.json rename to mocks/device-cgi-simulator/TDM/slot12.json diff --git a/mocks/js-simulator/TDM/slot13.json b/mocks/device-cgi-simulator/TDM/slot13.json similarity index 100% rename from mocks/js-simulator/TDM/slot13.json rename to mocks/device-cgi-simulator/TDM/slot13.json diff --git a/mocks/js-simulator/TDM/slot14.json b/mocks/device-cgi-simulator/TDM/slot14.json similarity index 100% rename from mocks/js-simulator/TDM/slot14.json rename to mocks/device-cgi-simulator/TDM/slot14.json diff --git a/mocks/js-simulator/TDM/slot15.json b/mocks/device-cgi-simulator/TDM/slot15.json similarity index 100% rename from mocks/js-simulator/TDM/slot15.json rename to mocks/device-cgi-simulator/TDM/slot15.json diff --git a/mocks/js-simulator/TDM/slot16.json b/mocks/device-cgi-simulator/TDM/slot16.json similarity index 100% rename from mocks/js-simulator/TDM/slot16.json rename to mocks/device-cgi-simulator/TDM/slot16.json diff --git a/mocks/js-simulator/TDM/slot17.json b/mocks/device-cgi-simulator/TDM/slot17.json similarity index 100% rename from mocks/js-simulator/TDM/slot17.json rename to mocks/device-cgi-simulator/TDM/slot17.json diff --git a/mocks/js-simulator/TDM/slot18.json b/mocks/device-cgi-simulator/TDM/slot18.json similarity index 100% rename from mocks/js-simulator/TDM/slot18.json rename to mocks/device-cgi-simulator/TDM/slot18.json diff --git a/mocks/js-simulator/TDM/slot19.json b/mocks/device-cgi-simulator/TDM/slot19.json similarity index 100% rename from mocks/js-simulator/TDM/slot19.json rename to mocks/device-cgi-simulator/TDM/slot19.json diff --git a/mocks/js-simulator/TDM/slot2.json b/mocks/device-cgi-simulator/TDM/slot2.json similarity index 100% rename from mocks/js-simulator/TDM/slot2.json rename to mocks/device-cgi-simulator/TDM/slot2.json diff --git a/mocks/js-simulator/TDM/slot20.json b/mocks/device-cgi-simulator/TDM/slot20.json similarity index 100% rename from mocks/js-simulator/TDM/slot20.json rename to mocks/device-cgi-simulator/TDM/slot20.json diff --git a/mocks/js-simulator/TDM/slot21.json b/mocks/device-cgi-simulator/TDM/slot21.json similarity index 100% rename from mocks/js-simulator/TDM/slot21.json rename to mocks/device-cgi-simulator/TDM/slot21.json diff --git a/mocks/js-simulator/TDM/slot22.json b/mocks/device-cgi-simulator/TDM/slot22.json similarity index 100% rename from mocks/js-simulator/TDM/slot22.json rename to mocks/device-cgi-simulator/TDM/slot22.json diff --git a/mocks/js-simulator/TDM/slot23.json b/mocks/device-cgi-simulator/TDM/slot23.json similarity index 100% rename from mocks/js-simulator/TDM/slot23.json rename to mocks/device-cgi-simulator/TDM/slot23.json diff --git a/mocks/js-simulator/TDM/slot24.json b/mocks/device-cgi-simulator/TDM/slot24.json similarity index 100% rename from mocks/js-simulator/TDM/slot24.json rename to mocks/device-cgi-simulator/TDM/slot24.json diff --git a/mocks/js-simulator/TDM/slot25.json b/mocks/device-cgi-simulator/TDM/slot25.json similarity index 100% rename from mocks/js-simulator/TDM/slot25.json rename to mocks/device-cgi-simulator/TDM/slot25.json diff --git a/mocks/js-simulator/TDM/slot26.json b/mocks/device-cgi-simulator/TDM/slot26.json similarity index 100% rename from mocks/js-simulator/TDM/slot26.json rename to mocks/device-cgi-simulator/TDM/slot26.json diff --git a/mocks/js-simulator/TDM/slot27.json b/mocks/device-cgi-simulator/TDM/slot27.json similarity index 100% rename from mocks/js-simulator/TDM/slot27.json rename to mocks/device-cgi-simulator/TDM/slot27.json diff --git a/mocks/js-simulator/TDM/slot28.json b/mocks/device-cgi-simulator/TDM/slot28.json similarity index 100% rename from mocks/js-simulator/TDM/slot28.json rename to mocks/device-cgi-simulator/TDM/slot28.json diff --git a/mocks/js-simulator/TDM/slot29.json b/mocks/device-cgi-simulator/TDM/slot29.json similarity index 100% rename from mocks/js-simulator/TDM/slot29.json rename to mocks/device-cgi-simulator/TDM/slot29.json diff --git a/mocks/js-simulator/TDM/slot3.json b/mocks/device-cgi-simulator/TDM/slot3.json similarity index 100% rename from mocks/js-simulator/TDM/slot3.json rename to mocks/device-cgi-simulator/TDM/slot3.json diff --git a/mocks/js-simulator/TDM/slot30.json b/mocks/device-cgi-simulator/TDM/slot30.json similarity index 100% rename from mocks/js-simulator/TDM/slot30.json rename to mocks/device-cgi-simulator/TDM/slot30.json diff --git a/mocks/js-simulator/TDM/slot31.json b/mocks/device-cgi-simulator/TDM/slot31.json similarity index 100% rename from mocks/js-simulator/TDM/slot31.json rename to mocks/device-cgi-simulator/TDM/slot31.json diff --git a/mocks/js-simulator/TDM/slot4.json b/mocks/device-cgi-simulator/TDM/slot4.json similarity index 100% rename from mocks/js-simulator/TDM/slot4.json rename to mocks/device-cgi-simulator/TDM/slot4.json diff --git a/mocks/js-simulator/TDM/slot5.json b/mocks/device-cgi-simulator/TDM/slot5.json similarity index 100% rename from mocks/js-simulator/TDM/slot5.json rename to mocks/device-cgi-simulator/TDM/slot5.json diff --git a/mocks/js-simulator/TDM/slot6.json b/mocks/device-cgi-simulator/TDM/slot6.json similarity index 100% rename from mocks/js-simulator/TDM/slot6.json rename to mocks/device-cgi-simulator/TDM/slot6.json diff --git a/mocks/js-simulator/TDM/slot7.json b/mocks/device-cgi-simulator/TDM/slot7.json similarity index 100% rename from mocks/js-simulator/TDM/slot7.json rename to mocks/device-cgi-simulator/TDM/slot7.json diff --git a/mocks/js-simulator/TDM/slot8.json b/mocks/device-cgi-simulator/TDM/slot8.json similarity index 100% rename from mocks/js-simulator/TDM/slot8.json rename to mocks/device-cgi-simulator/TDM/slot8.json diff --git a/mocks/js-simulator/TDM/slot9.json b/mocks/device-cgi-simulator/TDM/slot9.json similarity index 100% rename from mocks/js-simulator/TDM/slot9.json rename to mocks/device-cgi-simulator/TDM/slot9.json diff --git a/mocks/js-simulator/TDR/0.json b/mocks/device-cgi-simulator/TDR/0.json similarity index 100% rename from mocks/js-simulator/TDR/0.json rename to mocks/device-cgi-simulator/TDR/0.json diff --git a/mocks/js-simulator/TDR/1.json b/mocks/device-cgi-simulator/TDR/1.json similarity index 100% rename from mocks/js-simulator/TDR/1.json rename to mocks/device-cgi-simulator/TDR/1.json diff --git a/mocks/js-simulator/TDR/10.json b/mocks/device-cgi-simulator/TDR/10.json similarity index 100% rename from mocks/js-simulator/TDR/10.json rename to mocks/device-cgi-simulator/TDR/10.json diff --git a/mocks/js-simulator/TDR/100.json b/mocks/device-cgi-simulator/TDR/100.json similarity index 100% rename from mocks/js-simulator/TDR/100.json rename to mocks/device-cgi-simulator/TDR/100.json diff --git a/mocks/js-simulator/TDR/101.json b/mocks/device-cgi-simulator/TDR/101.json similarity index 100% rename from mocks/js-simulator/TDR/101.json rename to mocks/device-cgi-simulator/TDR/101.json diff --git a/mocks/js-simulator/TDR/102.json b/mocks/device-cgi-simulator/TDR/102.json similarity index 100% rename from mocks/js-simulator/TDR/102.json rename to mocks/device-cgi-simulator/TDR/102.json diff --git a/mocks/js-simulator/TDR/103.json b/mocks/device-cgi-simulator/TDR/103.json similarity index 100% rename from mocks/js-simulator/TDR/103.json rename to mocks/device-cgi-simulator/TDR/103.json diff --git a/mocks/js-simulator/TDR/104.json b/mocks/device-cgi-simulator/TDR/104.json similarity index 100% rename from mocks/js-simulator/TDR/104.json rename to mocks/device-cgi-simulator/TDR/104.json diff --git a/mocks/js-simulator/TDR/105.json b/mocks/device-cgi-simulator/TDR/105.json similarity index 100% rename from mocks/js-simulator/TDR/105.json rename to mocks/device-cgi-simulator/TDR/105.json diff --git a/mocks/js-simulator/TDR/106.json b/mocks/device-cgi-simulator/TDR/106.json similarity index 100% rename from mocks/js-simulator/TDR/106.json rename to mocks/device-cgi-simulator/TDR/106.json diff --git a/mocks/js-simulator/TDR/107.json b/mocks/device-cgi-simulator/TDR/107.json similarity index 100% rename from mocks/js-simulator/TDR/107.json rename to mocks/device-cgi-simulator/TDR/107.json diff --git a/mocks/js-simulator/TDR/108.json b/mocks/device-cgi-simulator/TDR/108.json similarity index 100% rename from mocks/js-simulator/TDR/108.json rename to mocks/device-cgi-simulator/TDR/108.json diff --git a/mocks/js-simulator/TDR/109.json b/mocks/device-cgi-simulator/TDR/109.json similarity index 100% rename from mocks/js-simulator/TDR/109.json rename to mocks/device-cgi-simulator/TDR/109.json diff --git a/mocks/js-simulator/TDR/11.json b/mocks/device-cgi-simulator/TDR/11.json similarity index 100% rename from mocks/js-simulator/TDR/11.json rename to mocks/device-cgi-simulator/TDR/11.json diff --git a/mocks/js-simulator/TDR/110.json b/mocks/device-cgi-simulator/TDR/110.json similarity index 100% rename from mocks/js-simulator/TDR/110.json rename to mocks/device-cgi-simulator/TDR/110.json diff --git a/mocks/js-simulator/TDR/111.json b/mocks/device-cgi-simulator/TDR/111.json similarity index 100% rename from mocks/js-simulator/TDR/111.json rename to mocks/device-cgi-simulator/TDR/111.json diff --git a/mocks/js-simulator/TDR/112.json b/mocks/device-cgi-simulator/TDR/112.json similarity index 100% rename from mocks/js-simulator/TDR/112.json rename to mocks/device-cgi-simulator/TDR/112.json diff --git a/mocks/js-simulator/TDR/113.json b/mocks/device-cgi-simulator/TDR/113.json similarity index 100% rename from mocks/js-simulator/TDR/113.json rename to mocks/device-cgi-simulator/TDR/113.json diff --git a/mocks/js-simulator/TDR/114.json b/mocks/device-cgi-simulator/TDR/114.json similarity index 100% rename from mocks/js-simulator/TDR/114.json rename to mocks/device-cgi-simulator/TDR/114.json diff --git a/mocks/js-simulator/TDR/115.json b/mocks/device-cgi-simulator/TDR/115.json similarity index 100% rename from mocks/js-simulator/TDR/115.json rename to mocks/device-cgi-simulator/TDR/115.json diff --git a/mocks/js-simulator/TDR/116.json b/mocks/device-cgi-simulator/TDR/116.json similarity index 100% rename from mocks/js-simulator/TDR/116.json rename to mocks/device-cgi-simulator/TDR/116.json diff --git a/mocks/js-simulator/TDR/117.json b/mocks/device-cgi-simulator/TDR/117.json similarity index 100% rename from mocks/js-simulator/TDR/117.json rename to mocks/device-cgi-simulator/TDR/117.json diff --git a/mocks/js-simulator/TDR/118.json b/mocks/device-cgi-simulator/TDR/118.json similarity index 100% rename from mocks/js-simulator/TDR/118.json rename to mocks/device-cgi-simulator/TDR/118.json diff --git a/mocks/js-simulator/TDR/119.json b/mocks/device-cgi-simulator/TDR/119.json similarity index 100% rename from mocks/js-simulator/TDR/119.json rename to mocks/device-cgi-simulator/TDR/119.json diff --git a/mocks/js-simulator/TDR/12.json b/mocks/device-cgi-simulator/TDR/12.json similarity index 100% rename from mocks/js-simulator/TDR/12.json rename to mocks/device-cgi-simulator/TDR/12.json diff --git a/mocks/js-simulator/TDR/120.json b/mocks/device-cgi-simulator/TDR/120.json similarity index 100% rename from mocks/js-simulator/TDR/120.json rename to mocks/device-cgi-simulator/TDR/120.json diff --git a/mocks/js-simulator/TDR/121.json b/mocks/device-cgi-simulator/TDR/121.json similarity index 100% rename from mocks/js-simulator/TDR/121.json rename to mocks/device-cgi-simulator/TDR/121.json diff --git a/mocks/js-simulator/TDR/122.json b/mocks/device-cgi-simulator/TDR/122.json similarity index 100% rename from mocks/js-simulator/TDR/122.json rename to mocks/device-cgi-simulator/TDR/122.json diff --git a/mocks/js-simulator/TDR/123.json b/mocks/device-cgi-simulator/TDR/123.json similarity index 100% rename from mocks/js-simulator/TDR/123.json rename to mocks/device-cgi-simulator/TDR/123.json diff --git a/mocks/js-simulator/TDR/124.json b/mocks/device-cgi-simulator/TDR/124.json similarity index 100% rename from mocks/js-simulator/TDR/124.json rename to mocks/device-cgi-simulator/TDR/124.json diff --git a/mocks/js-simulator/TDR/125.json b/mocks/device-cgi-simulator/TDR/125.json similarity index 100% rename from mocks/js-simulator/TDR/125.json rename to mocks/device-cgi-simulator/TDR/125.json diff --git a/mocks/js-simulator/TDR/126.json b/mocks/device-cgi-simulator/TDR/126.json similarity index 100% rename from mocks/js-simulator/TDR/126.json rename to mocks/device-cgi-simulator/TDR/126.json diff --git a/mocks/js-simulator/TDR/127.json b/mocks/device-cgi-simulator/TDR/127.json similarity index 100% rename from mocks/js-simulator/TDR/127.json rename to mocks/device-cgi-simulator/TDR/127.json diff --git a/mocks/js-simulator/TDR/128.json b/mocks/device-cgi-simulator/TDR/128.json similarity index 100% rename from mocks/js-simulator/TDR/128.json rename to mocks/device-cgi-simulator/TDR/128.json diff --git a/mocks/js-simulator/TDR/129.json b/mocks/device-cgi-simulator/TDR/129.json similarity index 100% rename from mocks/js-simulator/TDR/129.json rename to mocks/device-cgi-simulator/TDR/129.json diff --git a/mocks/js-simulator/TDR/13.json b/mocks/device-cgi-simulator/TDR/13.json similarity index 100% rename from mocks/js-simulator/TDR/13.json rename to mocks/device-cgi-simulator/TDR/13.json diff --git a/mocks/js-simulator/TDR/130.json b/mocks/device-cgi-simulator/TDR/130.json similarity index 100% rename from mocks/js-simulator/TDR/130.json rename to mocks/device-cgi-simulator/TDR/130.json diff --git a/mocks/js-simulator/TDR/131.json b/mocks/device-cgi-simulator/TDR/131.json similarity index 100% rename from mocks/js-simulator/TDR/131.json rename to mocks/device-cgi-simulator/TDR/131.json diff --git a/mocks/js-simulator/TDR/132.json b/mocks/device-cgi-simulator/TDR/132.json similarity index 100% rename from mocks/js-simulator/TDR/132.json rename to mocks/device-cgi-simulator/TDR/132.json diff --git a/mocks/js-simulator/TDR/133.json b/mocks/device-cgi-simulator/TDR/133.json similarity index 100% rename from mocks/js-simulator/TDR/133.json rename to mocks/device-cgi-simulator/TDR/133.json diff --git a/mocks/js-simulator/TDR/134.json b/mocks/device-cgi-simulator/TDR/134.json similarity index 100% rename from mocks/js-simulator/TDR/134.json rename to mocks/device-cgi-simulator/TDR/134.json diff --git a/mocks/js-simulator/TDR/135.json b/mocks/device-cgi-simulator/TDR/135.json similarity index 100% rename from mocks/js-simulator/TDR/135.json rename to mocks/device-cgi-simulator/TDR/135.json diff --git a/mocks/js-simulator/TDR/136.json b/mocks/device-cgi-simulator/TDR/136.json similarity index 100% rename from mocks/js-simulator/TDR/136.json rename to mocks/device-cgi-simulator/TDR/136.json diff --git a/mocks/js-simulator/TDR/137.json b/mocks/device-cgi-simulator/TDR/137.json similarity index 100% rename from mocks/js-simulator/TDR/137.json rename to mocks/device-cgi-simulator/TDR/137.json diff --git a/mocks/js-simulator/TDR/138.json b/mocks/device-cgi-simulator/TDR/138.json similarity index 100% rename from mocks/js-simulator/TDR/138.json rename to mocks/device-cgi-simulator/TDR/138.json diff --git a/mocks/js-simulator/TDR/139.json b/mocks/device-cgi-simulator/TDR/139.json similarity index 100% rename from mocks/js-simulator/TDR/139.json rename to mocks/device-cgi-simulator/TDR/139.json diff --git a/mocks/js-simulator/TDR/14.json b/mocks/device-cgi-simulator/TDR/14.json similarity index 100% rename from mocks/js-simulator/TDR/14.json rename to mocks/device-cgi-simulator/TDR/14.json diff --git a/mocks/js-simulator/TDR/140.json b/mocks/device-cgi-simulator/TDR/140.json similarity index 100% rename from mocks/js-simulator/TDR/140.json rename to mocks/device-cgi-simulator/TDR/140.json diff --git a/mocks/js-simulator/TDR/141.json b/mocks/device-cgi-simulator/TDR/141.json similarity index 100% rename from mocks/js-simulator/TDR/141.json rename to mocks/device-cgi-simulator/TDR/141.json diff --git a/mocks/js-simulator/TDR/142.json b/mocks/device-cgi-simulator/TDR/142.json similarity index 100% rename from mocks/js-simulator/TDR/142.json rename to mocks/device-cgi-simulator/TDR/142.json diff --git a/mocks/js-simulator/TDR/143.json b/mocks/device-cgi-simulator/TDR/143.json similarity index 100% rename from mocks/js-simulator/TDR/143.json rename to mocks/device-cgi-simulator/TDR/143.json diff --git a/mocks/js-simulator/TDR/144.json b/mocks/device-cgi-simulator/TDR/144.json similarity index 100% rename from mocks/js-simulator/TDR/144.json rename to mocks/device-cgi-simulator/TDR/144.json diff --git a/mocks/js-simulator/TDR/145.json b/mocks/device-cgi-simulator/TDR/145.json similarity index 100% rename from mocks/js-simulator/TDR/145.json rename to mocks/device-cgi-simulator/TDR/145.json diff --git a/mocks/js-simulator/TDR/146.json b/mocks/device-cgi-simulator/TDR/146.json similarity index 100% rename from mocks/js-simulator/TDR/146.json rename to mocks/device-cgi-simulator/TDR/146.json diff --git a/mocks/js-simulator/TDR/147.json b/mocks/device-cgi-simulator/TDR/147.json similarity index 100% rename from mocks/js-simulator/TDR/147.json rename to mocks/device-cgi-simulator/TDR/147.json diff --git a/mocks/js-simulator/TDR/148.json b/mocks/device-cgi-simulator/TDR/148.json similarity index 100% rename from mocks/js-simulator/TDR/148.json rename to mocks/device-cgi-simulator/TDR/148.json diff --git a/mocks/js-simulator/TDR/149.json b/mocks/device-cgi-simulator/TDR/149.json similarity index 100% rename from mocks/js-simulator/TDR/149.json rename to mocks/device-cgi-simulator/TDR/149.json diff --git a/mocks/js-simulator/TDR/15.json b/mocks/device-cgi-simulator/TDR/15.json similarity index 100% rename from mocks/js-simulator/TDR/15.json rename to mocks/device-cgi-simulator/TDR/15.json diff --git a/mocks/js-simulator/TDR/150.json b/mocks/device-cgi-simulator/TDR/150.json similarity index 100% rename from mocks/js-simulator/TDR/150.json rename to mocks/device-cgi-simulator/TDR/150.json diff --git a/mocks/js-simulator/TDR/151.json b/mocks/device-cgi-simulator/TDR/151.json similarity index 100% rename from mocks/js-simulator/TDR/151.json rename to mocks/device-cgi-simulator/TDR/151.json diff --git a/mocks/js-simulator/TDR/152.json b/mocks/device-cgi-simulator/TDR/152.json similarity index 100% rename from mocks/js-simulator/TDR/152.json rename to mocks/device-cgi-simulator/TDR/152.json diff --git a/mocks/js-simulator/TDR/153.json b/mocks/device-cgi-simulator/TDR/153.json similarity index 100% rename from mocks/js-simulator/TDR/153.json rename to mocks/device-cgi-simulator/TDR/153.json diff --git a/mocks/js-simulator/TDR/154.json b/mocks/device-cgi-simulator/TDR/154.json similarity index 100% rename from mocks/js-simulator/TDR/154.json rename to mocks/device-cgi-simulator/TDR/154.json diff --git a/mocks/js-simulator/TDR/155.json b/mocks/device-cgi-simulator/TDR/155.json similarity index 100% rename from mocks/js-simulator/TDR/155.json rename to mocks/device-cgi-simulator/TDR/155.json diff --git a/mocks/js-simulator/TDR/156.json b/mocks/device-cgi-simulator/TDR/156.json similarity index 100% rename from mocks/js-simulator/TDR/156.json rename to mocks/device-cgi-simulator/TDR/156.json diff --git a/mocks/js-simulator/TDR/157.json b/mocks/device-cgi-simulator/TDR/157.json similarity index 100% rename from mocks/js-simulator/TDR/157.json rename to mocks/device-cgi-simulator/TDR/157.json diff --git a/mocks/js-simulator/TDR/158.json b/mocks/device-cgi-simulator/TDR/158.json similarity index 100% rename from mocks/js-simulator/TDR/158.json rename to mocks/device-cgi-simulator/TDR/158.json diff --git a/mocks/js-simulator/TDR/159.json b/mocks/device-cgi-simulator/TDR/159.json similarity index 100% rename from mocks/js-simulator/TDR/159.json rename to mocks/device-cgi-simulator/TDR/159.json diff --git a/mocks/js-simulator/TDR/16.json b/mocks/device-cgi-simulator/TDR/16.json similarity index 100% rename from mocks/js-simulator/TDR/16.json rename to mocks/device-cgi-simulator/TDR/16.json diff --git a/mocks/js-simulator/TDR/160.json b/mocks/device-cgi-simulator/TDR/160.json similarity index 100% rename from mocks/js-simulator/TDR/160.json rename to mocks/device-cgi-simulator/TDR/160.json diff --git a/mocks/js-simulator/TDR/161.json b/mocks/device-cgi-simulator/TDR/161.json similarity index 100% rename from mocks/js-simulator/TDR/161.json rename to mocks/device-cgi-simulator/TDR/161.json diff --git a/mocks/js-simulator/TDR/162.json b/mocks/device-cgi-simulator/TDR/162.json similarity index 100% rename from mocks/js-simulator/TDR/162.json rename to mocks/device-cgi-simulator/TDR/162.json diff --git a/mocks/js-simulator/TDR/163.json b/mocks/device-cgi-simulator/TDR/163.json similarity index 100% rename from mocks/js-simulator/TDR/163.json rename to mocks/device-cgi-simulator/TDR/163.json diff --git a/mocks/js-simulator/TDR/164.json b/mocks/device-cgi-simulator/TDR/164.json similarity index 100% rename from mocks/js-simulator/TDR/164.json rename to mocks/device-cgi-simulator/TDR/164.json diff --git a/mocks/js-simulator/TDR/165.json b/mocks/device-cgi-simulator/TDR/165.json similarity index 100% rename from mocks/js-simulator/TDR/165.json rename to mocks/device-cgi-simulator/TDR/165.json diff --git a/mocks/js-simulator/TDR/166.json b/mocks/device-cgi-simulator/TDR/166.json similarity index 100% rename from mocks/js-simulator/TDR/166.json rename to mocks/device-cgi-simulator/TDR/166.json diff --git a/mocks/js-simulator/TDR/167.json b/mocks/device-cgi-simulator/TDR/167.json similarity index 100% rename from mocks/js-simulator/TDR/167.json rename to mocks/device-cgi-simulator/TDR/167.json diff --git a/mocks/js-simulator/TDR/168.json b/mocks/device-cgi-simulator/TDR/168.json similarity index 100% rename from mocks/js-simulator/TDR/168.json rename to mocks/device-cgi-simulator/TDR/168.json diff --git a/mocks/js-simulator/TDR/169.json b/mocks/device-cgi-simulator/TDR/169.json similarity index 100% rename from mocks/js-simulator/TDR/169.json rename to mocks/device-cgi-simulator/TDR/169.json diff --git a/mocks/js-simulator/TDR/17.json b/mocks/device-cgi-simulator/TDR/17.json similarity index 100% rename from mocks/js-simulator/TDR/17.json rename to mocks/device-cgi-simulator/TDR/17.json diff --git a/mocks/js-simulator/TDR/170.json b/mocks/device-cgi-simulator/TDR/170.json similarity index 100% rename from mocks/js-simulator/TDR/170.json rename to mocks/device-cgi-simulator/TDR/170.json diff --git a/mocks/js-simulator/TDR/171.json b/mocks/device-cgi-simulator/TDR/171.json similarity index 100% rename from mocks/js-simulator/TDR/171.json rename to mocks/device-cgi-simulator/TDR/171.json diff --git a/mocks/js-simulator/TDR/172.json b/mocks/device-cgi-simulator/TDR/172.json similarity index 100% rename from mocks/js-simulator/TDR/172.json rename to mocks/device-cgi-simulator/TDR/172.json diff --git a/mocks/js-simulator/TDR/173.json b/mocks/device-cgi-simulator/TDR/173.json similarity index 100% rename from mocks/js-simulator/TDR/173.json rename to mocks/device-cgi-simulator/TDR/173.json diff --git a/mocks/js-simulator/TDR/174.json b/mocks/device-cgi-simulator/TDR/174.json similarity index 100% rename from mocks/js-simulator/TDR/174.json rename to mocks/device-cgi-simulator/TDR/174.json diff --git a/mocks/js-simulator/TDR/175.json b/mocks/device-cgi-simulator/TDR/175.json similarity index 100% rename from mocks/js-simulator/TDR/175.json rename to mocks/device-cgi-simulator/TDR/175.json diff --git a/mocks/js-simulator/TDR/176.json b/mocks/device-cgi-simulator/TDR/176.json similarity index 100% rename from mocks/js-simulator/TDR/176.json rename to mocks/device-cgi-simulator/TDR/176.json diff --git a/mocks/js-simulator/TDR/177.json b/mocks/device-cgi-simulator/TDR/177.json similarity index 100% rename from mocks/js-simulator/TDR/177.json rename to mocks/device-cgi-simulator/TDR/177.json diff --git a/mocks/js-simulator/TDR/178.json b/mocks/device-cgi-simulator/TDR/178.json similarity index 100% rename from mocks/js-simulator/TDR/178.json rename to mocks/device-cgi-simulator/TDR/178.json diff --git a/mocks/js-simulator/TDR/179.json b/mocks/device-cgi-simulator/TDR/179.json similarity index 100% rename from mocks/js-simulator/TDR/179.json rename to mocks/device-cgi-simulator/TDR/179.json diff --git a/mocks/js-simulator/TDR/18.json b/mocks/device-cgi-simulator/TDR/18.json similarity index 100% rename from mocks/js-simulator/TDR/18.json rename to mocks/device-cgi-simulator/TDR/18.json diff --git a/mocks/js-simulator/TDR/180.json b/mocks/device-cgi-simulator/TDR/180.json similarity index 100% rename from mocks/js-simulator/TDR/180.json rename to mocks/device-cgi-simulator/TDR/180.json diff --git a/mocks/js-simulator/TDR/181.json b/mocks/device-cgi-simulator/TDR/181.json similarity index 100% rename from mocks/js-simulator/TDR/181.json rename to mocks/device-cgi-simulator/TDR/181.json diff --git a/mocks/js-simulator/TDR/182.json b/mocks/device-cgi-simulator/TDR/182.json similarity index 100% rename from mocks/js-simulator/TDR/182.json rename to mocks/device-cgi-simulator/TDR/182.json diff --git a/mocks/js-simulator/TDR/183.json b/mocks/device-cgi-simulator/TDR/183.json similarity index 100% rename from mocks/js-simulator/TDR/183.json rename to mocks/device-cgi-simulator/TDR/183.json diff --git a/mocks/js-simulator/TDR/184.json b/mocks/device-cgi-simulator/TDR/184.json similarity index 100% rename from mocks/js-simulator/TDR/184.json rename to mocks/device-cgi-simulator/TDR/184.json diff --git a/mocks/js-simulator/TDR/185.json b/mocks/device-cgi-simulator/TDR/185.json similarity index 100% rename from mocks/js-simulator/TDR/185.json rename to mocks/device-cgi-simulator/TDR/185.json diff --git a/mocks/js-simulator/TDR/186.json b/mocks/device-cgi-simulator/TDR/186.json similarity index 100% rename from mocks/js-simulator/TDR/186.json rename to mocks/device-cgi-simulator/TDR/186.json diff --git a/mocks/js-simulator/TDR/187.json b/mocks/device-cgi-simulator/TDR/187.json similarity index 100% rename from mocks/js-simulator/TDR/187.json rename to mocks/device-cgi-simulator/TDR/187.json diff --git a/mocks/js-simulator/TDR/188.json b/mocks/device-cgi-simulator/TDR/188.json similarity index 100% rename from mocks/js-simulator/TDR/188.json rename to mocks/device-cgi-simulator/TDR/188.json diff --git a/mocks/js-simulator/TDR/189.json b/mocks/device-cgi-simulator/TDR/189.json similarity index 100% rename from mocks/js-simulator/TDR/189.json rename to mocks/device-cgi-simulator/TDR/189.json diff --git a/mocks/js-simulator/TDR/19.json b/mocks/device-cgi-simulator/TDR/19.json similarity index 100% rename from mocks/js-simulator/TDR/19.json rename to mocks/device-cgi-simulator/TDR/19.json diff --git a/mocks/js-simulator/TDR/190.json b/mocks/device-cgi-simulator/TDR/190.json similarity index 100% rename from mocks/js-simulator/TDR/190.json rename to mocks/device-cgi-simulator/TDR/190.json diff --git a/mocks/js-simulator/TDR/191.json b/mocks/device-cgi-simulator/TDR/191.json similarity index 100% rename from mocks/js-simulator/TDR/191.json rename to mocks/device-cgi-simulator/TDR/191.json diff --git a/mocks/js-simulator/TDR/192.json b/mocks/device-cgi-simulator/TDR/192.json similarity index 100% rename from mocks/js-simulator/TDR/192.json rename to mocks/device-cgi-simulator/TDR/192.json diff --git a/mocks/js-simulator/TDR/193.json b/mocks/device-cgi-simulator/TDR/193.json similarity index 100% rename from mocks/js-simulator/TDR/193.json rename to mocks/device-cgi-simulator/TDR/193.json diff --git a/mocks/js-simulator/TDR/194.json b/mocks/device-cgi-simulator/TDR/194.json similarity index 100% rename from mocks/js-simulator/TDR/194.json rename to mocks/device-cgi-simulator/TDR/194.json diff --git a/mocks/js-simulator/TDR/195.json b/mocks/device-cgi-simulator/TDR/195.json similarity index 100% rename from mocks/js-simulator/TDR/195.json rename to mocks/device-cgi-simulator/TDR/195.json diff --git a/mocks/js-simulator/TDR/196.json b/mocks/device-cgi-simulator/TDR/196.json similarity index 100% rename from mocks/js-simulator/TDR/196.json rename to mocks/device-cgi-simulator/TDR/196.json diff --git a/mocks/js-simulator/TDR/197.json b/mocks/device-cgi-simulator/TDR/197.json similarity index 100% rename from mocks/js-simulator/TDR/197.json rename to mocks/device-cgi-simulator/TDR/197.json diff --git a/mocks/js-simulator/TDR/198.json b/mocks/device-cgi-simulator/TDR/198.json similarity index 100% rename from mocks/js-simulator/TDR/198.json rename to mocks/device-cgi-simulator/TDR/198.json diff --git a/mocks/js-simulator/TDR/199.json b/mocks/device-cgi-simulator/TDR/199.json similarity index 100% rename from mocks/js-simulator/TDR/199.json rename to mocks/device-cgi-simulator/TDR/199.json diff --git a/mocks/js-simulator/TDR/2.json b/mocks/device-cgi-simulator/TDR/2.json similarity index 100% rename from mocks/js-simulator/TDR/2.json rename to mocks/device-cgi-simulator/TDR/2.json diff --git a/mocks/js-simulator/TDR/20.json b/mocks/device-cgi-simulator/TDR/20.json similarity index 100% rename from mocks/js-simulator/TDR/20.json rename to mocks/device-cgi-simulator/TDR/20.json diff --git a/mocks/js-simulator/TDR/200.json b/mocks/device-cgi-simulator/TDR/200.json similarity index 100% rename from mocks/js-simulator/TDR/200.json rename to mocks/device-cgi-simulator/TDR/200.json diff --git a/mocks/js-simulator/TDR/201.json b/mocks/device-cgi-simulator/TDR/201.json similarity index 100% rename from mocks/js-simulator/TDR/201.json rename to mocks/device-cgi-simulator/TDR/201.json diff --git a/mocks/js-simulator/TDR/202.json b/mocks/device-cgi-simulator/TDR/202.json similarity index 100% rename from mocks/js-simulator/TDR/202.json rename to mocks/device-cgi-simulator/TDR/202.json diff --git a/mocks/js-simulator/TDR/203.json b/mocks/device-cgi-simulator/TDR/203.json similarity index 100% rename from mocks/js-simulator/TDR/203.json rename to mocks/device-cgi-simulator/TDR/203.json diff --git a/mocks/js-simulator/TDR/204.json b/mocks/device-cgi-simulator/TDR/204.json similarity index 100% rename from mocks/js-simulator/TDR/204.json rename to mocks/device-cgi-simulator/TDR/204.json diff --git a/mocks/js-simulator/TDR/205.json b/mocks/device-cgi-simulator/TDR/205.json similarity index 100% rename from mocks/js-simulator/TDR/205.json rename to mocks/device-cgi-simulator/TDR/205.json diff --git a/mocks/js-simulator/TDR/206.json b/mocks/device-cgi-simulator/TDR/206.json similarity index 100% rename from mocks/js-simulator/TDR/206.json rename to mocks/device-cgi-simulator/TDR/206.json diff --git a/mocks/js-simulator/TDR/207.json b/mocks/device-cgi-simulator/TDR/207.json similarity index 100% rename from mocks/js-simulator/TDR/207.json rename to mocks/device-cgi-simulator/TDR/207.json diff --git a/mocks/js-simulator/TDR/208.json b/mocks/device-cgi-simulator/TDR/208.json similarity index 100% rename from mocks/js-simulator/TDR/208.json rename to mocks/device-cgi-simulator/TDR/208.json diff --git a/mocks/js-simulator/TDR/209.json b/mocks/device-cgi-simulator/TDR/209.json similarity index 100% rename from mocks/js-simulator/TDR/209.json rename to mocks/device-cgi-simulator/TDR/209.json diff --git a/mocks/js-simulator/TDR/21.json b/mocks/device-cgi-simulator/TDR/21.json similarity index 100% rename from mocks/js-simulator/TDR/21.json rename to mocks/device-cgi-simulator/TDR/21.json diff --git a/mocks/js-simulator/TDR/210.json b/mocks/device-cgi-simulator/TDR/210.json similarity index 100% rename from mocks/js-simulator/TDR/210.json rename to mocks/device-cgi-simulator/TDR/210.json diff --git a/mocks/js-simulator/TDR/211.json b/mocks/device-cgi-simulator/TDR/211.json similarity index 100% rename from mocks/js-simulator/TDR/211.json rename to mocks/device-cgi-simulator/TDR/211.json diff --git a/mocks/js-simulator/TDR/212.json b/mocks/device-cgi-simulator/TDR/212.json similarity index 100% rename from mocks/js-simulator/TDR/212.json rename to mocks/device-cgi-simulator/TDR/212.json diff --git a/mocks/js-simulator/TDR/213.json b/mocks/device-cgi-simulator/TDR/213.json similarity index 100% rename from mocks/js-simulator/TDR/213.json rename to mocks/device-cgi-simulator/TDR/213.json diff --git a/mocks/js-simulator/TDR/214.json b/mocks/device-cgi-simulator/TDR/214.json similarity index 100% rename from mocks/js-simulator/TDR/214.json rename to mocks/device-cgi-simulator/TDR/214.json diff --git a/mocks/js-simulator/TDR/215.json b/mocks/device-cgi-simulator/TDR/215.json similarity index 100% rename from mocks/js-simulator/TDR/215.json rename to mocks/device-cgi-simulator/TDR/215.json diff --git a/mocks/js-simulator/TDR/216.json b/mocks/device-cgi-simulator/TDR/216.json similarity index 100% rename from mocks/js-simulator/TDR/216.json rename to mocks/device-cgi-simulator/TDR/216.json diff --git a/mocks/js-simulator/TDR/217.json b/mocks/device-cgi-simulator/TDR/217.json similarity index 100% rename from mocks/js-simulator/TDR/217.json rename to mocks/device-cgi-simulator/TDR/217.json diff --git a/mocks/js-simulator/TDR/218.json b/mocks/device-cgi-simulator/TDR/218.json similarity index 100% rename from mocks/js-simulator/TDR/218.json rename to mocks/device-cgi-simulator/TDR/218.json diff --git a/mocks/js-simulator/TDR/219.json b/mocks/device-cgi-simulator/TDR/219.json similarity index 100% rename from mocks/js-simulator/TDR/219.json rename to mocks/device-cgi-simulator/TDR/219.json diff --git a/mocks/js-simulator/TDR/22.json b/mocks/device-cgi-simulator/TDR/22.json similarity index 100% rename from mocks/js-simulator/TDR/22.json rename to mocks/device-cgi-simulator/TDR/22.json diff --git a/mocks/js-simulator/TDR/220.json b/mocks/device-cgi-simulator/TDR/220.json similarity index 100% rename from mocks/js-simulator/TDR/220.json rename to mocks/device-cgi-simulator/TDR/220.json diff --git a/mocks/js-simulator/TDR/221.json b/mocks/device-cgi-simulator/TDR/221.json similarity index 100% rename from mocks/js-simulator/TDR/221.json rename to mocks/device-cgi-simulator/TDR/221.json diff --git a/mocks/js-simulator/TDR/222.json b/mocks/device-cgi-simulator/TDR/222.json similarity index 100% rename from mocks/js-simulator/TDR/222.json rename to mocks/device-cgi-simulator/TDR/222.json diff --git a/mocks/js-simulator/TDR/223.json b/mocks/device-cgi-simulator/TDR/223.json similarity index 100% rename from mocks/js-simulator/TDR/223.json rename to mocks/device-cgi-simulator/TDR/223.json diff --git a/mocks/js-simulator/TDR/224.json b/mocks/device-cgi-simulator/TDR/224.json similarity index 100% rename from mocks/js-simulator/TDR/224.json rename to mocks/device-cgi-simulator/TDR/224.json diff --git a/mocks/js-simulator/TDR/225.json b/mocks/device-cgi-simulator/TDR/225.json similarity index 100% rename from mocks/js-simulator/TDR/225.json rename to mocks/device-cgi-simulator/TDR/225.json diff --git a/mocks/js-simulator/TDR/226.json b/mocks/device-cgi-simulator/TDR/226.json similarity index 100% rename from mocks/js-simulator/TDR/226.json rename to mocks/device-cgi-simulator/TDR/226.json diff --git a/mocks/js-simulator/TDR/227.json b/mocks/device-cgi-simulator/TDR/227.json similarity index 100% rename from mocks/js-simulator/TDR/227.json rename to mocks/device-cgi-simulator/TDR/227.json diff --git a/mocks/js-simulator/TDR/228.json b/mocks/device-cgi-simulator/TDR/228.json similarity index 100% rename from mocks/js-simulator/TDR/228.json rename to mocks/device-cgi-simulator/TDR/228.json diff --git a/mocks/js-simulator/TDR/229.json b/mocks/device-cgi-simulator/TDR/229.json similarity index 100% rename from mocks/js-simulator/TDR/229.json rename to mocks/device-cgi-simulator/TDR/229.json diff --git a/mocks/js-simulator/TDR/23.json b/mocks/device-cgi-simulator/TDR/23.json similarity index 100% rename from mocks/js-simulator/TDR/23.json rename to mocks/device-cgi-simulator/TDR/23.json diff --git a/mocks/js-simulator/TDR/230.json b/mocks/device-cgi-simulator/TDR/230.json similarity index 100% rename from mocks/js-simulator/TDR/230.json rename to mocks/device-cgi-simulator/TDR/230.json diff --git a/mocks/js-simulator/TDR/231.json b/mocks/device-cgi-simulator/TDR/231.json similarity index 100% rename from mocks/js-simulator/TDR/231.json rename to mocks/device-cgi-simulator/TDR/231.json diff --git a/mocks/js-simulator/TDR/232.json b/mocks/device-cgi-simulator/TDR/232.json similarity index 100% rename from mocks/js-simulator/TDR/232.json rename to mocks/device-cgi-simulator/TDR/232.json diff --git a/mocks/js-simulator/TDR/233.json b/mocks/device-cgi-simulator/TDR/233.json similarity index 100% rename from mocks/js-simulator/TDR/233.json rename to mocks/device-cgi-simulator/TDR/233.json diff --git a/mocks/js-simulator/TDR/234.json b/mocks/device-cgi-simulator/TDR/234.json similarity index 100% rename from mocks/js-simulator/TDR/234.json rename to mocks/device-cgi-simulator/TDR/234.json diff --git a/mocks/js-simulator/TDR/235.json b/mocks/device-cgi-simulator/TDR/235.json similarity index 100% rename from mocks/js-simulator/TDR/235.json rename to mocks/device-cgi-simulator/TDR/235.json diff --git a/mocks/js-simulator/TDR/236.json b/mocks/device-cgi-simulator/TDR/236.json similarity index 100% rename from mocks/js-simulator/TDR/236.json rename to mocks/device-cgi-simulator/TDR/236.json diff --git a/mocks/js-simulator/TDR/237.json b/mocks/device-cgi-simulator/TDR/237.json similarity index 100% rename from mocks/js-simulator/TDR/237.json rename to mocks/device-cgi-simulator/TDR/237.json diff --git a/mocks/js-simulator/TDR/238.json b/mocks/device-cgi-simulator/TDR/238.json similarity index 100% rename from mocks/js-simulator/TDR/238.json rename to mocks/device-cgi-simulator/TDR/238.json diff --git a/mocks/js-simulator/TDR/239.json b/mocks/device-cgi-simulator/TDR/239.json similarity index 100% rename from mocks/js-simulator/TDR/239.json rename to mocks/device-cgi-simulator/TDR/239.json diff --git a/mocks/js-simulator/TDR/24.json b/mocks/device-cgi-simulator/TDR/24.json similarity index 100% rename from mocks/js-simulator/TDR/24.json rename to mocks/device-cgi-simulator/TDR/24.json diff --git a/mocks/js-simulator/TDR/240.json b/mocks/device-cgi-simulator/TDR/240.json similarity index 100% rename from mocks/js-simulator/TDR/240.json rename to mocks/device-cgi-simulator/TDR/240.json diff --git a/mocks/js-simulator/TDR/241.json b/mocks/device-cgi-simulator/TDR/241.json similarity index 100% rename from mocks/js-simulator/TDR/241.json rename to mocks/device-cgi-simulator/TDR/241.json diff --git a/mocks/js-simulator/TDR/242.json b/mocks/device-cgi-simulator/TDR/242.json similarity index 100% rename from mocks/js-simulator/TDR/242.json rename to mocks/device-cgi-simulator/TDR/242.json diff --git a/mocks/js-simulator/TDR/243.json b/mocks/device-cgi-simulator/TDR/243.json similarity index 100% rename from mocks/js-simulator/TDR/243.json rename to mocks/device-cgi-simulator/TDR/243.json diff --git a/mocks/js-simulator/TDR/244.json b/mocks/device-cgi-simulator/TDR/244.json similarity index 100% rename from mocks/js-simulator/TDR/244.json rename to mocks/device-cgi-simulator/TDR/244.json diff --git a/mocks/js-simulator/TDR/245.json b/mocks/device-cgi-simulator/TDR/245.json similarity index 100% rename from mocks/js-simulator/TDR/245.json rename to mocks/device-cgi-simulator/TDR/245.json diff --git a/mocks/js-simulator/TDR/246.json b/mocks/device-cgi-simulator/TDR/246.json similarity index 100% rename from mocks/js-simulator/TDR/246.json rename to mocks/device-cgi-simulator/TDR/246.json diff --git a/mocks/js-simulator/TDR/247.json b/mocks/device-cgi-simulator/TDR/247.json similarity index 100% rename from mocks/js-simulator/TDR/247.json rename to mocks/device-cgi-simulator/TDR/247.json diff --git a/mocks/js-simulator/TDR/248.json b/mocks/device-cgi-simulator/TDR/248.json similarity index 100% rename from mocks/js-simulator/TDR/248.json rename to mocks/device-cgi-simulator/TDR/248.json diff --git a/mocks/js-simulator/TDR/249.json b/mocks/device-cgi-simulator/TDR/249.json similarity index 100% rename from mocks/js-simulator/TDR/249.json rename to mocks/device-cgi-simulator/TDR/249.json diff --git a/mocks/js-simulator/TDR/25.json b/mocks/device-cgi-simulator/TDR/25.json similarity index 100% rename from mocks/js-simulator/TDR/25.json rename to mocks/device-cgi-simulator/TDR/25.json diff --git a/mocks/js-simulator/TDR/250.json b/mocks/device-cgi-simulator/TDR/250.json similarity index 100% rename from mocks/js-simulator/TDR/250.json rename to mocks/device-cgi-simulator/TDR/250.json diff --git a/mocks/js-simulator/TDR/251.json b/mocks/device-cgi-simulator/TDR/251.json similarity index 100% rename from mocks/js-simulator/TDR/251.json rename to mocks/device-cgi-simulator/TDR/251.json diff --git a/mocks/js-simulator/TDR/252.json b/mocks/device-cgi-simulator/TDR/252.json similarity index 100% rename from mocks/js-simulator/TDR/252.json rename to mocks/device-cgi-simulator/TDR/252.json diff --git a/mocks/js-simulator/TDR/253.json b/mocks/device-cgi-simulator/TDR/253.json similarity index 100% rename from mocks/js-simulator/TDR/253.json rename to mocks/device-cgi-simulator/TDR/253.json diff --git a/mocks/js-simulator/TDR/254.json b/mocks/device-cgi-simulator/TDR/254.json similarity index 100% rename from mocks/js-simulator/TDR/254.json rename to mocks/device-cgi-simulator/TDR/254.json diff --git a/mocks/js-simulator/TDR/255.json b/mocks/device-cgi-simulator/TDR/255.json similarity index 100% rename from mocks/js-simulator/TDR/255.json rename to mocks/device-cgi-simulator/TDR/255.json diff --git a/mocks/js-simulator/TDR/256.json b/mocks/device-cgi-simulator/TDR/256.json similarity index 100% rename from mocks/js-simulator/TDR/256.json rename to mocks/device-cgi-simulator/TDR/256.json diff --git a/mocks/js-simulator/TDR/257.json b/mocks/device-cgi-simulator/TDR/257.json similarity index 100% rename from mocks/js-simulator/TDR/257.json rename to mocks/device-cgi-simulator/TDR/257.json diff --git a/mocks/js-simulator/TDR/258.json b/mocks/device-cgi-simulator/TDR/258.json similarity index 100% rename from mocks/js-simulator/TDR/258.json rename to mocks/device-cgi-simulator/TDR/258.json diff --git a/mocks/js-simulator/TDR/259.json b/mocks/device-cgi-simulator/TDR/259.json similarity index 100% rename from mocks/js-simulator/TDR/259.json rename to mocks/device-cgi-simulator/TDR/259.json diff --git a/mocks/js-simulator/TDR/26.json b/mocks/device-cgi-simulator/TDR/26.json similarity index 100% rename from mocks/js-simulator/TDR/26.json rename to mocks/device-cgi-simulator/TDR/26.json diff --git a/mocks/js-simulator/TDR/260.json b/mocks/device-cgi-simulator/TDR/260.json similarity index 100% rename from mocks/js-simulator/TDR/260.json rename to mocks/device-cgi-simulator/TDR/260.json diff --git a/mocks/js-simulator/TDR/261.json b/mocks/device-cgi-simulator/TDR/261.json similarity index 100% rename from mocks/js-simulator/TDR/261.json rename to mocks/device-cgi-simulator/TDR/261.json diff --git a/mocks/js-simulator/TDR/262.json b/mocks/device-cgi-simulator/TDR/262.json similarity index 100% rename from mocks/js-simulator/TDR/262.json rename to mocks/device-cgi-simulator/TDR/262.json diff --git a/mocks/js-simulator/TDR/263.json b/mocks/device-cgi-simulator/TDR/263.json similarity index 100% rename from mocks/js-simulator/TDR/263.json rename to mocks/device-cgi-simulator/TDR/263.json diff --git a/mocks/js-simulator/TDR/264.json b/mocks/device-cgi-simulator/TDR/264.json similarity index 100% rename from mocks/js-simulator/TDR/264.json rename to mocks/device-cgi-simulator/TDR/264.json diff --git a/mocks/js-simulator/TDR/265.json b/mocks/device-cgi-simulator/TDR/265.json similarity index 100% rename from mocks/js-simulator/TDR/265.json rename to mocks/device-cgi-simulator/TDR/265.json diff --git a/mocks/js-simulator/TDR/266.json b/mocks/device-cgi-simulator/TDR/266.json similarity index 100% rename from mocks/js-simulator/TDR/266.json rename to mocks/device-cgi-simulator/TDR/266.json diff --git a/mocks/js-simulator/TDR/267.json b/mocks/device-cgi-simulator/TDR/267.json similarity index 100% rename from mocks/js-simulator/TDR/267.json rename to mocks/device-cgi-simulator/TDR/267.json diff --git a/mocks/js-simulator/TDR/268.json b/mocks/device-cgi-simulator/TDR/268.json similarity index 100% rename from mocks/js-simulator/TDR/268.json rename to mocks/device-cgi-simulator/TDR/268.json diff --git a/mocks/js-simulator/TDR/269.json b/mocks/device-cgi-simulator/TDR/269.json similarity index 100% rename from mocks/js-simulator/TDR/269.json rename to mocks/device-cgi-simulator/TDR/269.json diff --git a/mocks/js-simulator/TDR/27.json b/mocks/device-cgi-simulator/TDR/27.json similarity index 100% rename from mocks/js-simulator/TDR/27.json rename to mocks/device-cgi-simulator/TDR/27.json diff --git a/mocks/js-simulator/TDR/270.json b/mocks/device-cgi-simulator/TDR/270.json similarity index 100% rename from mocks/js-simulator/TDR/270.json rename to mocks/device-cgi-simulator/TDR/270.json diff --git a/mocks/js-simulator/TDR/271.json b/mocks/device-cgi-simulator/TDR/271.json similarity index 100% rename from mocks/js-simulator/TDR/271.json rename to mocks/device-cgi-simulator/TDR/271.json diff --git a/mocks/js-simulator/TDR/272.json b/mocks/device-cgi-simulator/TDR/272.json similarity index 100% rename from mocks/js-simulator/TDR/272.json rename to mocks/device-cgi-simulator/TDR/272.json diff --git a/mocks/js-simulator/TDR/273.json b/mocks/device-cgi-simulator/TDR/273.json similarity index 100% rename from mocks/js-simulator/TDR/273.json rename to mocks/device-cgi-simulator/TDR/273.json diff --git a/mocks/js-simulator/TDR/274.json b/mocks/device-cgi-simulator/TDR/274.json similarity index 100% rename from mocks/js-simulator/TDR/274.json rename to mocks/device-cgi-simulator/TDR/274.json diff --git a/mocks/js-simulator/TDR/275.json b/mocks/device-cgi-simulator/TDR/275.json similarity index 100% rename from mocks/js-simulator/TDR/275.json rename to mocks/device-cgi-simulator/TDR/275.json diff --git a/mocks/js-simulator/TDR/276.json b/mocks/device-cgi-simulator/TDR/276.json similarity index 100% rename from mocks/js-simulator/TDR/276.json rename to mocks/device-cgi-simulator/TDR/276.json diff --git a/mocks/js-simulator/TDR/277.json b/mocks/device-cgi-simulator/TDR/277.json similarity index 100% rename from mocks/js-simulator/TDR/277.json rename to mocks/device-cgi-simulator/TDR/277.json diff --git a/mocks/js-simulator/TDR/278.json b/mocks/device-cgi-simulator/TDR/278.json similarity index 100% rename from mocks/js-simulator/TDR/278.json rename to mocks/device-cgi-simulator/TDR/278.json diff --git a/mocks/js-simulator/TDR/279.json b/mocks/device-cgi-simulator/TDR/279.json similarity index 100% rename from mocks/js-simulator/TDR/279.json rename to mocks/device-cgi-simulator/TDR/279.json diff --git a/mocks/js-simulator/TDR/28.json b/mocks/device-cgi-simulator/TDR/28.json similarity index 100% rename from mocks/js-simulator/TDR/28.json rename to mocks/device-cgi-simulator/TDR/28.json diff --git a/mocks/js-simulator/TDR/280.json b/mocks/device-cgi-simulator/TDR/280.json similarity index 100% rename from mocks/js-simulator/TDR/280.json rename to mocks/device-cgi-simulator/TDR/280.json diff --git a/mocks/js-simulator/TDR/281.json b/mocks/device-cgi-simulator/TDR/281.json similarity index 100% rename from mocks/js-simulator/TDR/281.json rename to mocks/device-cgi-simulator/TDR/281.json diff --git a/mocks/js-simulator/TDR/282.json b/mocks/device-cgi-simulator/TDR/282.json similarity index 100% rename from mocks/js-simulator/TDR/282.json rename to mocks/device-cgi-simulator/TDR/282.json diff --git a/mocks/js-simulator/TDR/283.json b/mocks/device-cgi-simulator/TDR/283.json similarity index 100% rename from mocks/js-simulator/TDR/283.json rename to mocks/device-cgi-simulator/TDR/283.json diff --git a/mocks/js-simulator/TDR/284.json b/mocks/device-cgi-simulator/TDR/284.json similarity index 100% rename from mocks/js-simulator/TDR/284.json rename to mocks/device-cgi-simulator/TDR/284.json diff --git a/mocks/js-simulator/TDR/285.json b/mocks/device-cgi-simulator/TDR/285.json similarity index 100% rename from mocks/js-simulator/TDR/285.json rename to mocks/device-cgi-simulator/TDR/285.json diff --git a/mocks/js-simulator/TDR/286.json b/mocks/device-cgi-simulator/TDR/286.json similarity index 100% rename from mocks/js-simulator/TDR/286.json rename to mocks/device-cgi-simulator/TDR/286.json diff --git a/mocks/js-simulator/TDR/287.json b/mocks/device-cgi-simulator/TDR/287.json similarity index 100% rename from mocks/js-simulator/TDR/287.json rename to mocks/device-cgi-simulator/TDR/287.json diff --git a/mocks/js-simulator/TDR/288.json b/mocks/device-cgi-simulator/TDR/288.json similarity index 100% rename from mocks/js-simulator/TDR/288.json rename to mocks/device-cgi-simulator/TDR/288.json diff --git a/mocks/js-simulator/TDR/289.json b/mocks/device-cgi-simulator/TDR/289.json similarity index 100% rename from mocks/js-simulator/TDR/289.json rename to mocks/device-cgi-simulator/TDR/289.json diff --git a/mocks/js-simulator/TDR/29.json b/mocks/device-cgi-simulator/TDR/29.json similarity index 100% rename from mocks/js-simulator/TDR/29.json rename to mocks/device-cgi-simulator/TDR/29.json diff --git a/mocks/js-simulator/TDR/290.json b/mocks/device-cgi-simulator/TDR/290.json similarity index 100% rename from mocks/js-simulator/TDR/290.json rename to mocks/device-cgi-simulator/TDR/290.json diff --git a/mocks/js-simulator/TDR/291.json b/mocks/device-cgi-simulator/TDR/291.json similarity index 100% rename from mocks/js-simulator/TDR/291.json rename to mocks/device-cgi-simulator/TDR/291.json diff --git a/mocks/js-simulator/TDR/292.json b/mocks/device-cgi-simulator/TDR/292.json similarity index 100% rename from mocks/js-simulator/TDR/292.json rename to mocks/device-cgi-simulator/TDR/292.json diff --git a/mocks/js-simulator/TDR/293.json b/mocks/device-cgi-simulator/TDR/293.json similarity index 100% rename from mocks/js-simulator/TDR/293.json rename to mocks/device-cgi-simulator/TDR/293.json diff --git a/mocks/js-simulator/TDR/294.json b/mocks/device-cgi-simulator/TDR/294.json similarity index 100% rename from mocks/js-simulator/TDR/294.json rename to mocks/device-cgi-simulator/TDR/294.json diff --git a/mocks/js-simulator/TDR/295.json b/mocks/device-cgi-simulator/TDR/295.json similarity index 100% rename from mocks/js-simulator/TDR/295.json rename to mocks/device-cgi-simulator/TDR/295.json diff --git a/mocks/js-simulator/TDR/296.json b/mocks/device-cgi-simulator/TDR/296.json similarity index 100% rename from mocks/js-simulator/TDR/296.json rename to mocks/device-cgi-simulator/TDR/296.json diff --git a/mocks/js-simulator/TDR/297.json b/mocks/device-cgi-simulator/TDR/297.json similarity index 100% rename from mocks/js-simulator/TDR/297.json rename to mocks/device-cgi-simulator/TDR/297.json diff --git a/mocks/js-simulator/TDR/298.json b/mocks/device-cgi-simulator/TDR/298.json similarity index 100% rename from mocks/js-simulator/TDR/298.json rename to mocks/device-cgi-simulator/TDR/298.json diff --git a/mocks/js-simulator/TDR/299.json b/mocks/device-cgi-simulator/TDR/299.json similarity index 100% rename from mocks/js-simulator/TDR/299.json rename to mocks/device-cgi-simulator/TDR/299.json diff --git a/mocks/js-simulator/TDR/3.json b/mocks/device-cgi-simulator/TDR/3.json similarity index 100% rename from mocks/js-simulator/TDR/3.json rename to mocks/device-cgi-simulator/TDR/3.json diff --git a/mocks/js-simulator/TDR/30.json b/mocks/device-cgi-simulator/TDR/30.json similarity index 100% rename from mocks/js-simulator/TDR/30.json rename to mocks/device-cgi-simulator/TDR/30.json diff --git a/mocks/js-simulator/TDR/300.json b/mocks/device-cgi-simulator/TDR/300.json similarity index 100% rename from mocks/js-simulator/TDR/300.json rename to mocks/device-cgi-simulator/TDR/300.json diff --git a/mocks/js-simulator/TDR/301.json b/mocks/device-cgi-simulator/TDR/301.json similarity index 100% rename from mocks/js-simulator/TDR/301.json rename to mocks/device-cgi-simulator/TDR/301.json diff --git a/mocks/js-simulator/TDR/302.json b/mocks/device-cgi-simulator/TDR/302.json similarity index 100% rename from mocks/js-simulator/TDR/302.json rename to mocks/device-cgi-simulator/TDR/302.json diff --git a/mocks/js-simulator/TDR/303.json b/mocks/device-cgi-simulator/TDR/303.json similarity index 100% rename from mocks/js-simulator/TDR/303.json rename to mocks/device-cgi-simulator/TDR/303.json diff --git a/mocks/js-simulator/TDR/304.json b/mocks/device-cgi-simulator/TDR/304.json similarity index 100% rename from mocks/js-simulator/TDR/304.json rename to mocks/device-cgi-simulator/TDR/304.json diff --git a/mocks/js-simulator/TDR/305.json b/mocks/device-cgi-simulator/TDR/305.json similarity index 100% rename from mocks/js-simulator/TDR/305.json rename to mocks/device-cgi-simulator/TDR/305.json diff --git a/mocks/js-simulator/TDR/306.json b/mocks/device-cgi-simulator/TDR/306.json similarity index 100% rename from mocks/js-simulator/TDR/306.json rename to mocks/device-cgi-simulator/TDR/306.json diff --git a/mocks/js-simulator/TDR/307.json b/mocks/device-cgi-simulator/TDR/307.json similarity index 100% rename from mocks/js-simulator/TDR/307.json rename to mocks/device-cgi-simulator/TDR/307.json diff --git a/mocks/js-simulator/TDR/308.json b/mocks/device-cgi-simulator/TDR/308.json similarity index 100% rename from mocks/js-simulator/TDR/308.json rename to mocks/device-cgi-simulator/TDR/308.json diff --git a/mocks/js-simulator/TDR/309.json b/mocks/device-cgi-simulator/TDR/309.json similarity index 100% rename from mocks/js-simulator/TDR/309.json rename to mocks/device-cgi-simulator/TDR/309.json diff --git a/mocks/js-simulator/TDR/31.json b/mocks/device-cgi-simulator/TDR/31.json similarity index 100% rename from mocks/js-simulator/TDR/31.json rename to mocks/device-cgi-simulator/TDR/31.json diff --git a/mocks/js-simulator/TDR/310.json b/mocks/device-cgi-simulator/TDR/310.json similarity index 100% rename from mocks/js-simulator/TDR/310.json rename to mocks/device-cgi-simulator/TDR/310.json diff --git a/mocks/js-simulator/TDR/311.json b/mocks/device-cgi-simulator/TDR/311.json similarity index 100% rename from mocks/js-simulator/TDR/311.json rename to mocks/device-cgi-simulator/TDR/311.json diff --git a/mocks/js-simulator/TDR/312.json b/mocks/device-cgi-simulator/TDR/312.json similarity index 100% rename from mocks/js-simulator/TDR/312.json rename to mocks/device-cgi-simulator/TDR/312.json diff --git a/mocks/js-simulator/TDR/313.json b/mocks/device-cgi-simulator/TDR/313.json similarity index 100% rename from mocks/js-simulator/TDR/313.json rename to mocks/device-cgi-simulator/TDR/313.json diff --git a/mocks/js-simulator/TDR/314.json b/mocks/device-cgi-simulator/TDR/314.json similarity index 100% rename from mocks/js-simulator/TDR/314.json rename to mocks/device-cgi-simulator/TDR/314.json diff --git a/mocks/js-simulator/TDR/315.json b/mocks/device-cgi-simulator/TDR/315.json similarity index 100% rename from mocks/js-simulator/TDR/315.json rename to mocks/device-cgi-simulator/TDR/315.json diff --git a/mocks/js-simulator/TDR/316.json b/mocks/device-cgi-simulator/TDR/316.json similarity index 100% rename from mocks/js-simulator/TDR/316.json rename to mocks/device-cgi-simulator/TDR/316.json diff --git a/mocks/js-simulator/TDR/317.json b/mocks/device-cgi-simulator/TDR/317.json similarity index 100% rename from mocks/js-simulator/TDR/317.json rename to mocks/device-cgi-simulator/TDR/317.json diff --git a/mocks/js-simulator/TDR/318.json b/mocks/device-cgi-simulator/TDR/318.json similarity index 100% rename from mocks/js-simulator/TDR/318.json rename to mocks/device-cgi-simulator/TDR/318.json diff --git a/mocks/js-simulator/TDR/319.json b/mocks/device-cgi-simulator/TDR/319.json similarity index 100% rename from mocks/js-simulator/TDR/319.json rename to mocks/device-cgi-simulator/TDR/319.json diff --git a/mocks/js-simulator/TDR/32.json b/mocks/device-cgi-simulator/TDR/32.json similarity index 100% rename from mocks/js-simulator/TDR/32.json rename to mocks/device-cgi-simulator/TDR/32.json diff --git a/mocks/js-simulator/TDR/320.json b/mocks/device-cgi-simulator/TDR/320.json similarity index 100% rename from mocks/js-simulator/TDR/320.json rename to mocks/device-cgi-simulator/TDR/320.json diff --git a/mocks/js-simulator/TDR/321.json b/mocks/device-cgi-simulator/TDR/321.json similarity index 100% rename from mocks/js-simulator/TDR/321.json rename to mocks/device-cgi-simulator/TDR/321.json diff --git a/mocks/js-simulator/TDR/322.json b/mocks/device-cgi-simulator/TDR/322.json similarity index 100% rename from mocks/js-simulator/TDR/322.json rename to mocks/device-cgi-simulator/TDR/322.json diff --git a/mocks/js-simulator/TDR/323.json b/mocks/device-cgi-simulator/TDR/323.json similarity index 100% rename from mocks/js-simulator/TDR/323.json rename to mocks/device-cgi-simulator/TDR/323.json diff --git a/mocks/js-simulator/TDR/324.json b/mocks/device-cgi-simulator/TDR/324.json similarity index 100% rename from mocks/js-simulator/TDR/324.json rename to mocks/device-cgi-simulator/TDR/324.json diff --git a/mocks/js-simulator/TDR/325.json b/mocks/device-cgi-simulator/TDR/325.json similarity index 100% rename from mocks/js-simulator/TDR/325.json rename to mocks/device-cgi-simulator/TDR/325.json diff --git a/mocks/js-simulator/TDR/326.json b/mocks/device-cgi-simulator/TDR/326.json similarity index 100% rename from mocks/js-simulator/TDR/326.json rename to mocks/device-cgi-simulator/TDR/326.json diff --git a/mocks/js-simulator/TDR/327.json b/mocks/device-cgi-simulator/TDR/327.json similarity index 100% rename from mocks/js-simulator/TDR/327.json rename to mocks/device-cgi-simulator/TDR/327.json diff --git a/mocks/js-simulator/TDR/328.json b/mocks/device-cgi-simulator/TDR/328.json similarity index 100% rename from mocks/js-simulator/TDR/328.json rename to mocks/device-cgi-simulator/TDR/328.json diff --git a/mocks/js-simulator/TDR/329.json b/mocks/device-cgi-simulator/TDR/329.json similarity index 100% rename from mocks/js-simulator/TDR/329.json rename to mocks/device-cgi-simulator/TDR/329.json diff --git a/mocks/js-simulator/TDR/33.json b/mocks/device-cgi-simulator/TDR/33.json similarity index 100% rename from mocks/js-simulator/TDR/33.json rename to mocks/device-cgi-simulator/TDR/33.json diff --git a/mocks/js-simulator/TDR/330.json b/mocks/device-cgi-simulator/TDR/330.json similarity index 100% rename from mocks/js-simulator/TDR/330.json rename to mocks/device-cgi-simulator/TDR/330.json diff --git a/mocks/js-simulator/TDR/331.json b/mocks/device-cgi-simulator/TDR/331.json similarity index 100% rename from mocks/js-simulator/TDR/331.json rename to mocks/device-cgi-simulator/TDR/331.json diff --git a/mocks/js-simulator/TDR/332.json b/mocks/device-cgi-simulator/TDR/332.json similarity index 100% rename from mocks/js-simulator/TDR/332.json rename to mocks/device-cgi-simulator/TDR/332.json diff --git a/mocks/js-simulator/TDR/333.json b/mocks/device-cgi-simulator/TDR/333.json similarity index 100% rename from mocks/js-simulator/TDR/333.json rename to mocks/device-cgi-simulator/TDR/333.json diff --git a/mocks/js-simulator/TDR/334.json b/mocks/device-cgi-simulator/TDR/334.json similarity index 100% rename from mocks/js-simulator/TDR/334.json rename to mocks/device-cgi-simulator/TDR/334.json diff --git a/mocks/js-simulator/TDR/335.json b/mocks/device-cgi-simulator/TDR/335.json similarity index 100% rename from mocks/js-simulator/TDR/335.json rename to mocks/device-cgi-simulator/TDR/335.json diff --git a/mocks/js-simulator/TDR/336.json b/mocks/device-cgi-simulator/TDR/336.json similarity index 100% rename from mocks/js-simulator/TDR/336.json rename to mocks/device-cgi-simulator/TDR/336.json diff --git a/mocks/js-simulator/TDR/337.json b/mocks/device-cgi-simulator/TDR/337.json similarity index 100% rename from mocks/js-simulator/TDR/337.json rename to mocks/device-cgi-simulator/TDR/337.json diff --git a/mocks/js-simulator/TDR/338.json b/mocks/device-cgi-simulator/TDR/338.json similarity index 100% rename from mocks/js-simulator/TDR/338.json rename to mocks/device-cgi-simulator/TDR/338.json diff --git a/mocks/js-simulator/TDR/339.json b/mocks/device-cgi-simulator/TDR/339.json similarity index 100% rename from mocks/js-simulator/TDR/339.json rename to mocks/device-cgi-simulator/TDR/339.json diff --git a/mocks/js-simulator/TDR/34.json b/mocks/device-cgi-simulator/TDR/34.json similarity index 100% rename from mocks/js-simulator/TDR/34.json rename to mocks/device-cgi-simulator/TDR/34.json diff --git a/mocks/js-simulator/TDR/340.json b/mocks/device-cgi-simulator/TDR/340.json similarity index 100% rename from mocks/js-simulator/TDR/340.json rename to mocks/device-cgi-simulator/TDR/340.json diff --git a/mocks/js-simulator/TDR/341.json b/mocks/device-cgi-simulator/TDR/341.json similarity index 100% rename from mocks/js-simulator/TDR/341.json rename to mocks/device-cgi-simulator/TDR/341.json diff --git a/mocks/js-simulator/TDR/342.json b/mocks/device-cgi-simulator/TDR/342.json similarity index 100% rename from mocks/js-simulator/TDR/342.json rename to mocks/device-cgi-simulator/TDR/342.json diff --git a/mocks/js-simulator/TDR/343.json b/mocks/device-cgi-simulator/TDR/343.json similarity index 100% rename from mocks/js-simulator/TDR/343.json rename to mocks/device-cgi-simulator/TDR/343.json diff --git a/mocks/js-simulator/TDR/344.json b/mocks/device-cgi-simulator/TDR/344.json similarity index 100% rename from mocks/js-simulator/TDR/344.json rename to mocks/device-cgi-simulator/TDR/344.json diff --git a/mocks/js-simulator/TDR/345.json b/mocks/device-cgi-simulator/TDR/345.json similarity index 100% rename from mocks/js-simulator/TDR/345.json rename to mocks/device-cgi-simulator/TDR/345.json diff --git a/mocks/js-simulator/TDR/346.json b/mocks/device-cgi-simulator/TDR/346.json similarity index 100% rename from mocks/js-simulator/TDR/346.json rename to mocks/device-cgi-simulator/TDR/346.json diff --git a/mocks/js-simulator/TDR/347.json b/mocks/device-cgi-simulator/TDR/347.json similarity index 100% rename from mocks/js-simulator/TDR/347.json rename to mocks/device-cgi-simulator/TDR/347.json diff --git a/mocks/js-simulator/TDR/348.json b/mocks/device-cgi-simulator/TDR/348.json similarity index 100% rename from mocks/js-simulator/TDR/348.json rename to mocks/device-cgi-simulator/TDR/348.json diff --git a/mocks/js-simulator/TDR/349.json b/mocks/device-cgi-simulator/TDR/349.json similarity index 100% rename from mocks/js-simulator/TDR/349.json rename to mocks/device-cgi-simulator/TDR/349.json diff --git a/mocks/js-simulator/TDR/35.json b/mocks/device-cgi-simulator/TDR/35.json similarity index 100% rename from mocks/js-simulator/TDR/35.json rename to mocks/device-cgi-simulator/TDR/35.json diff --git a/mocks/js-simulator/TDR/350.json b/mocks/device-cgi-simulator/TDR/350.json similarity index 100% rename from mocks/js-simulator/TDR/350.json rename to mocks/device-cgi-simulator/TDR/350.json diff --git a/mocks/js-simulator/TDR/351.json b/mocks/device-cgi-simulator/TDR/351.json similarity index 100% rename from mocks/js-simulator/TDR/351.json rename to mocks/device-cgi-simulator/TDR/351.json diff --git a/mocks/js-simulator/TDR/352.json b/mocks/device-cgi-simulator/TDR/352.json similarity index 100% rename from mocks/js-simulator/TDR/352.json rename to mocks/device-cgi-simulator/TDR/352.json diff --git a/mocks/js-simulator/TDR/353.json b/mocks/device-cgi-simulator/TDR/353.json similarity index 100% rename from mocks/js-simulator/TDR/353.json rename to mocks/device-cgi-simulator/TDR/353.json diff --git a/mocks/js-simulator/TDR/354.json b/mocks/device-cgi-simulator/TDR/354.json similarity index 100% rename from mocks/js-simulator/TDR/354.json rename to mocks/device-cgi-simulator/TDR/354.json diff --git a/mocks/js-simulator/TDR/355.json b/mocks/device-cgi-simulator/TDR/355.json similarity index 100% rename from mocks/js-simulator/TDR/355.json rename to mocks/device-cgi-simulator/TDR/355.json diff --git a/mocks/js-simulator/TDR/356.json b/mocks/device-cgi-simulator/TDR/356.json similarity index 100% rename from mocks/js-simulator/TDR/356.json rename to mocks/device-cgi-simulator/TDR/356.json diff --git a/mocks/js-simulator/TDR/357.json b/mocks/device-cgi-simulator/TDR/357.json similarity index 100% rename from mocks/js-simulator/TDR/357.json rename to mocks/device-cgi-simulator/TDR/357.json diff --git a/mocks/js-simulator/TDR/358.json b/mocks/device-cgi-simulator/TDR/358.json similarity index 100% rename from mocks/js-simulator/TDR/358.json rename to mocks/device-cgi-simulator/TDR/358.json diff --git a/mocks/js-simulator/TDR/359.json b/mocks/device-cgi-simulator/TDR/359.json similarity index 100% rename from mocks/js-simulator/TDR/359.json rename to mocks/device-cgi-simulator/TDR/359.json diff --git a/mocks/js-simulator/TDR/36.json b/mocks/device-cgi-simulator/TDR/36.json similarity index 100% rename from mocks/js-simulator/TDR/36.json rename to mocks/device-cgi-simulator/TDR/36.json diff --git a/mocks/js-simulator/TDR/360.json b/mocks/device-cgi-simulator/TDR/360.json similarity index 100% rename from mocks/js-simulator/TDR/360.json rename to mocks/device-cgi-simulator/TDR/360.json diff --git a/mocks/js-simulator/TDR/361.json b/mocks/device-cgi-simulator/TDR/361.json similarity index 100% rename from mocks/js-simulator/TDR/361.json rename to mocks/device-cgi-simulator/TDR/361.json diff --git a/mocks/js-simulator/TDR/362.json b/mocks/device-cgi-simulator/TDR/362.json similarity index 100% rename from mocks/js-simulator/TDR/362.json rename to mocks/device-cgi-simulator/TDR/362.json diff --git a/mocks/js-simulator/TDR/363.json b/mocks/device-cgi-simulator/TDR/363.json similarity index 100% rename from mocks/js-simulator/TDR/363.json rename to mocks/device-cgi-simulator/TDR/363.json diff --git a/mocks/js-simulator/TDR/364.json b/mocks/device-cgi-simulator/TDR/364.json similarity index 100% rename from mocks/js-simulator/TDR/364.json rename to mocks/device-cgi-simulator/TDR/364.json diff --git a/mocks/js-simulator/TDR/365.json b/mocks/device-cgi-simulator/TDR/365.json similarity index 100% rename from mocks/js-simulator/TDR/365.json rename to mocks/device-cgi-simulator/TDR/365.json diff --git a/mocks/js-simulator/TDR/366.json b/mocks/device-cgi-simulator/TDR/366.json similarity index 100% rename from mocks/js-simulator/TDR/366.json rename to mocks/device-cgi-simulator/TDR/366.json diff --git a/mocks/js-simulator/TDR/367.json b/mocks/device-cgi-simulator/TDR/367.json similarity index 100% rename from mocks/js-simulator/TDR/367.json rename to mocks/device-cgi-simulator/TDR/367.json diff --git a/mocks/js-simulator/TDR/368.json b/mocks/device-cgi-simulator/TDR/368.json similarity index 100% rename from mocks/js-simulator/TDR/368.json rename to mocks/device-cgi-simulator/TDR/368.json diff --git a/mocks/js-simulator/TDR/369.json b/mocks/device-cgi-simulator/TDR/369.json similarity index 100% rename from mocks/js-simulator/TDR/369.json rename to mocks/device-cgi-simulator/TDR/369.json diff --git a/mocks/js-simulator/TDR/37.json b/mocks/device-cgi-simulator/TDR/37.json similarity index 100% rename from mocks/js-simulator/TDR/37.json rename to mocks/device-cgi-simulator/TDR/37.json diff --git a/mocks/js-simulator/TDR/370.json b/mocks/device-cgi-simulator/TDR/370.json similarity index 100% rename from mocks/js-simulator/TDR/370.json rename to mocks/device-cgi-simulator/TDR/370.json diff --git a/mocks/js-simulator/TDR/371.json b/mocks/device-cgi-simulator/TDR/371.json similarity index 100% rename from mocks/js-simulator/TDR/371.json rename to mocks/device-cgi-simulator/TDR/371.json diff --git a/mocks/js-simulator/TDR/372.json b/mocks/device-cgi-simulator/TDR/372.json similarity index 100% rename from mocks/js-simulator/TDR/372.json rename to mocks/device-cgi-simulator/TDR/372.json diff --git a/mocks/js-simulator/TDR/373.json b/mocks/device-cgi-simulator/TDR/373.json similarity index 100% rename from mocks/js-simulator/TDR/373.json rename to mocks/device-cgi-simulator/TDR/373.json diff --git a/mocks/js-simulator/TDR/374.json b/mocks/device-cgi-simulator/TDR/374.json similarity index 100% rename from mocks/js-simulator/TDR/374.json rename to mocks/device-cgi-simulator/TDR/374.json diff --git a/mocks/js-simulator/TDR/375.json b/mocks/device-cgi-simulator/TDR/375.json similarity index 100% rename from mocks/js-simulator/TDR/375.json rename to mocks/device-cgi-simulator/TDR/375.json diff --git a/mocks/js-simulator/TDR/376.json b/mocks/device-cgi-simulator/TDR/376.json similarity index 100% rename from mocks/js-simulator/TDR/376.json rename to mocks/device-cgi-simulator/TDR/376.json diff --git a/mocks/js-simulator/TDR/377.json b/mocks/device-cgi-simulator/TDR/377.json similarity index 100% rename from mocks/js-simulator/TDR/377.json rename to mocks/device-cgi-simulator/TDR/377.json diff --git a/mocks/js-simulator/TDR/378.json b/mocks/device-cgi-simulator/TDR/378.json similarity index 100% rename from mocks/js-simulator/TDR/378.json rename to mocks/device-cgi-simulator/TDR/378.json diff --git a/mocks/js-simulator/TDR/379.json b/mocks/device-cgi-simulator/TDR/379.json similarity index 100% rename from mocks/js-simulator/TDR/379.json rename to mocks/device-cgi-simulator/TDR/379.json diff --git a/mocks/js-simulator/TDR/38.json b/mocks/device-cgi-simulator/TDR/38.json similarity index 100% rename from mocks/js-simulator/TDR/38.json rename to mocks/device-cgi-simulator/TDR/38.json diff --git a/mocks/js-simulator/TDR/380.json b/mocks/device-cgi-simulator/TDR/380.json similarity index 100% rename from mocks/js-simulator/TDR/380.json rename to mocks/device-cgi-simulator/TDR/380.json diff --git a/mocks/js-simulator/TDR/381.json b/mocks/device-cgi-simulator/TDR/381.json similarity index 100% rename from mocks/js-simulator/TDR/381.json rename to mocks/device-cgi-simulator/TDR/381.json diff --git a/mocks/js-simulator/TDR/382.json b/mocks/device-cgi-simulator/TDR/382.json similarity index 100% rename from mocks/js-simulator/TDR/382.json rename to mocks/device-cgi-simulator/TDR/382.json diff --git a/mocks/js-simulator/TDR/383.json b/mocks/device-cgi-simulator/TDR/383.json similarity index 100% rename from mocks/js-simulator/TDR/383.json rename to mocks/device-cgi-simulator/TDR/383.json diff --git a/mocks/js-simulator/TDR/384.json b/mocks/device-cgi-simulator/TDR/384.json similarity index 100% rename from mocks/js-simulator/TDR/384.json rename to mocks/device-cgi-simulator/TDR/384.json diff --git a/mocks/js-simulator/TDR/385.json b/mocks/device-cgi-simulator/TDR/385.json similarity index 100% rename from mocks/js-simulator/TDR/385.json rename to mocks/device-cgi-simulator/TDR/385.json diff --git a/mocks/js-simulator/TDR/386.json b/mocks/device-cgi-simulator/TDR/386.json similarity index 100% rename from mocks/js-simulator/TDR/386.json rename to mocks/device-cgi-simulator/TDR/386.json diff --git a/mocks/js-simulator/TDR/387.json b/mocks/device-cgi-simulator/TDR/387.json similarity index 100% rename from mocks/js-simulator/TDR/387.json rename to mocks/device-cgi-simulator/TDR/387.json diff --git a/mocks/js-simulator/TDR/388.json b/mocks/device-cgi-simulator/TDR/388.json similarity index 100% rename from mocks/js-simulator/TDR/388.json rename to mocks/device-cgi-simulator/TDR/388.json diff --git a/mocks/js-simulator/TDR/389.json b/mocks/device-cgi-simulator/TDR/389.json similarity index 100% rename from mocks/js-simulator/TDR/389.json rename to mocks/device-cgi-simulator/TDR/389.json diff --git a/mocks/js-simulator/TDR/39.json b/mocks/device-cgi-simulator/TDR/39.json similarity index 100% rename from mocks/js-simulator/TDR/39.json rename to mocks/device-cgi-simulator/TDR/39.json diff --git a/mocks/js-simulator/TDR/390.json b/mocks/device-cgi-simulator/TDR/390.json similarity index 100% rename from mocks/js-simulator/TDR/390.json rename to mocks/device-cgi-simulator/TDR/390.json diff --git a/mocks/js-simulator/TDR/391.json b/mocks/device-cgi-simulator/TDR/391.json similarity index 100% rename from mocks/js-simulator/TDR/391.json rename to mocks/device-cgi-simulator/TDR/391.json diff --git a/mocks/js-simulator/TDR/392.json b/mocks/device-cgi-simulator/TDR/392.json similarity index 100% rename from mocks/js-simulator/TDR/392.json rename to mocks/device-cgi-simulator/TDR/392.json diff --git a/mocks/js-simulator/TDR/393.json b/mocks/device-cgi-simulator/TDR/393.json similarity index 100% rename from mocks/js-simulator/TDR/393.json rename to mocks/device-cgi-simulator/TDR/393.json diff --git a/mocks/js-simulator/TDR/394.json b/mocks/device-cgi-simulator/TDR/394.json similarity index 100% rename from mocks/js-simulator/TDR/394.json rename to mocks/device-cgi-simulator/TDR/394.json diff --git a/mocks/js-simulator/TDR/395.json b/mocks/device-cgi-simulator/TDR/395.json similarity index 100% rename from mocks/js-simulator/TDR/395.json rename to mocks/device-cgi-simulator/TDR/395.json diff --git a/mocks/js-simulator/TDR/396.json b/mocks/device-cgi-simulator/TDR/396.json similarity index 100% rename from mocks/js-simulator/TDR/396.json rename to mocks/device-cgi-simulator/TDR/396.json diff --git a/mocks/js-simulator/TDR/397.json b/mocks/device-cgi-simulator/TDR/397.json similarity index 100% rename from mocks/js-simulator/TDR/397.json rename to mocks/device-cgi-simulator/TDR/397.json diff --git a/mocks/js-simulator/TDR/398.json b/mocks/device-cgi-simulator/TDR/398.json similarity index 100% rename from mocks/js-simulator/TDR/398.json rename to mocks/device-cgi-simulator/TDR/398.json diff --git a/mocks/js-simulator/TDR/399.json b/mocks/device-cgi-simulator/TDR/399.json similarity index 100% rename from mocks/js-simulator/TDR/399.json rename to mocks/device-cgi-simulator/TDR/399.json diff --git a/mocks/js-simulator/TDR/4.json b/mocks/device-cgi-simulator/TDR/4.json similarity index 100% rename from mocks/js-simulator/TDR/4.json rename to mocks/device-cgi-simulator/TDR/4.json diff --git a/mocks/js-simulator/TDR/40.json b/mocks/device-cgi-simulator/TDR/40.json similarity index 100% rename from mocks/js-simulator/TDR/40.json rename to mocks/device-cgi-simulator/TDR/40.json diff --git a/mocks/js-simulator/TDR/400.json b/mocks/device-cgi-simulator/TDR/400.json similarity index 100% rename from mocks/js-simulator/TDR/400.json rename to mocks/device-cgi-simulator/TDR/400.json diff --git a/mocks/js-simulator/TDR/401.json b/mocks/device-cgi-simulator/TDR/401.json similarity index 100% rename from mocks/js-simulator/TDR/401.json rename to mocks/device-cgi-simulator/TDR/401.json diff --git a/mocks/js-simulator/TDR/402.json b/mocks/device-cgi-simulator/TDR/402.json similarity index 100% rename from mocks/js-simulator/TDR/402.json rename to mocks/device-cgi-simulator/TDR/402.json diff --git a/mocks/js-simulator/TDR/403.json b/mocks/device-cgi-simulator/TDR/403.json similarity index 100% rename from mocks/js-simulator/TDR/403.json rename to mocks/device-cgi-simulator/TDR/403.json diff --git a/mocks/js-simulator/TDR/404.json b/mocks/device-cgi-simulator/TDR/404.json similarity index 100% rename from mocks/js-simulator/TDR/404.json rename to mocks/device-cgi-simulator/TDR/404.json diff --git a/mocks/js-simulator/TDR/405.json b/mocks/device-cgi-simulator/TDR/405.json similarity index 100% rename from mocks/js-simulator/TDR/405.json rename to mocks/device-cgi-simulator/TDR/405.json diff --git a/mocks/js-simulator/TDR/406.json b/mocks/device-cgi-simulator/TDR/406.json similarity index 100% rename from mocks/js-simulator/TDR/406.json rename to mocks/device-cgi-simulator/TDR/406.json diff --git a/mocks/js-simulator/TDR/407.json b/mocks/device-cgi-simulator/TDR/407.json similarity index 100% rename from mocks/js-simulator/TDR/407.json rename to mocks/device-cgi-simulator/TDR/407.json diff --git a/mocks/js-simulator/TDR/408.json b/mocks/device-cgi-simulator/TDR/408.json similarity index 100% rename from mocks/js-simulator/TDR/408.json rename to mocks/device-cgi-simulator/TDR/408.json diff --git a/mocks/js-simulator/TDR/409.json b/mocks/device-cgi-simulator/TDR/409.json similarity index 100% rename from mocks/js-simulator/TDR/409.json rename to mocks/device-cgi-simulator/TDR/409.json diff --git a/mocks/js-simulator/TDR/41.json b/mocks/device-cgi-simulator/TDR/41.json similarity index 100% rename from mocks/js-simulator/TDR/41.json rename to mocks/device-cgi-simulator/TDR/41.json diff --git a/mocks/js-simulator/TDR/410.json b/mocks/device-cgi-simulator/TDR/410.json similarity index 100% rename from mocks/js-simulator/TDR/410.json rename to mocks/device-cgi-simulator/TDR/410.json diff --git a/mocks/js-simulator/TDR/411.json b/mocks/device-cgi-simulator/TDR/411.json similarity index 100% rename from mocks/js-simulator/TDR/411.json rename to mocks/device-cgi-simulator/TDR/411.json diff --git a/mocks/js-simulator/TDR/412.json b/mocks/device-cgi-simulator/TDR/412.json similarity index 100% rename from mocks/js-simulator/TDR/412.json rename to mocks/device-cgi-simulator/TDR/412.json diff --git a/mocks/js-simulator/TDR/413.json b/mocks/device-cgi-simulator/TDR/413.json similarity index 100% rename from mocks/js-simulator/TDR/413.json rename to mocks/device-cgi-simulator/TDR/413.json diff --git a/mocks/js-simulator/TDR/414.json b/mocks/device-cgi-simulator/TDR/414.json similarity index 100% rename from mocks/js-simulator/TDR/414.json rename to mocks/device-cgi-simulator/TDR/414.json diff --git a/mocks/js-simulator/TDR/415.json b/mocks/device-cgi-simulator/TDR/415.json similarity index 100% rename from mocks/js-simulator/TDR/415.json rename to mocks/device-cgi-simulator/TDR/415.json diff --git a/mocks/js-simulator/TDR/416.json b/mocks/device-cgi-simulator/TDR/416.json similarity index 100% rename from mocks/js-simulator/TDR/416.json rename to mocks/device-cgi-simulator/TDR/416.json diff --git a/mocks/js-simulator/TDR/417.json b/mocks/device-cgi-simulator/TDR/417.json similarity index 100% rename from mocks/js-simulator/TDR/417.json rename to mocks/device-cgi-simulator/TDR/417.json diff --git a/mocks/js-simulator/TDR/418.json b/mocks/device-cgi-simulator/TDR/418.json similarity index 100% rename from mocks/js-simulator/TDR/418.json rename to mocks/device-cgi-simulator/TDR/418.json diff --git a/mocks/js-simulator/TDR/419.json b/mocks/device-cgi-simulator/TDR/419.json similarity index 100% rename from mocks/js-simulator/TDR/419.json rename to mocks/device-cgi-simulator/TDR/419.json diff --git a/mocks/js-simulator/TDR/42.json b/mocks/device-cgi-simulator/TDR/42.json similarity index 100% rename from mocks/js-simulator/TDR/42.json rename to mocks/device-cgi-simulator/TDR/42.json diff --git a/mocks/js-simulator/TDR/420.json b/mocks/device-cgi-simulator/TDR/420.json similarity index 100% rename from mocks/js-simulator/TDR/420.json rename to mocks/device-cgi-simulator/TDR/420.json diff --git a/mocks/js-simulator/TDR/421.json b/mocks/device-cgi-simulator/TDR/421.json similarity index 100% rename from mocks/js-simulator/TDR/421.json rename to mocks/device-cgi-simulator/TDR/421.json diff --git a/mocks/js-simulator/TDR/422.json b/mocks/device-cgi-simulator/TDR/422.json similarity index 100% rename from mocks/js-simulator/TDR/422.json rename to mocks/device-cgi-simulator/TDR/422.json diff --git a/mocks/js-simulator/TDR/423.json b/mocks/device-cgi-simulator/TDR/423.json similarity index 100% rename from mocks/js-simulator/TDR/423.json rename to mocks/device-cgi-simulator/TDR/423.json diff --git a/mocks/js-simulator/TDR/424.json b/mocks/device-cgi-simulator/TDR/424.json similarity index 100% rename from mocks/js-simulator/TDR/424.json rename to mocks/device-cgi-simulator/TDR/424.json diff --git a/mocks/js-simulator/TDR/425.json b/mocks/device-cgi-simulator/TDR/425.json similarity index 100% rename from mocks/js-simulator/TDR/425.json rename to mocks/device-cgi-simulator/TDR/425.json diff --git a/mocks/js-simulator/TDR/426.json b/mocks/device-cgi-simulator/TDR/426.json similarity index 100% rename from mocks/js-simulator/TDR/426.json rename to mocks/device-cgi-simulator/TDR/426.json diff --git a/mocks/js-simulator/TDR/427.json b/mocks/device-cgi-simulator/TDR/427.json similarity index 100% rename from mocks/js-simulator/TDR/427.json rename to mocks/device-cgi-simulator/TDR/427.json diff --git a/mocks/js-simulator/TDR/428.json b/mocks/device-cgi-simulator/TDR/428.json similarity index 100% rename from mocks/js-simulator/TDR/428.json rename to mocks/device-cgi-simulator/TDR/428.json diff --git a/mocks/js-simulator/TDR/429.json b/mocks/device-cgi-simulator/TDR/429.json similarity index 100% rename from mocks/js-simulator/TDR/429.json rename to mocks/device-cgi-simulator/TDR/429.json diff --git a/mocks/js-simulator/TDR/43.json b/mocks/device-cgi-simulator/TDR/43.json similarity index 100% rename from mocks/js-simulator/TDR/43.json rename to mocks/device-cgi-simulator/TDR/43.json diff --git a/mocks/js-simulator/TDR/430.json b/mocks/device-cgi-simulator/TDR/430.json similarity index 100% rename from mocks/js-simulator/TDR/430.json rename to mocks/device-cgi-simulator/TDR/430.json diff --git a/mocks/js-simulator/TDR/431.json b/mocks/device-cgi-simulator/TDR/431.json similarity index 100% rename from mocks/js-simulator/TDR/431.json rename to mocks/device-cgi-simulator/TDR/431.json diff --git a/mocks/js-simulator/TDR/432.json b/mocks/device-cgi-simulator/TDR/432.json similarity index 100% rename from mocks/js-simulator/TDR/432.json rename to mocks/device-cgi-simulator/TDR/432.json diff --git a/mocks/js-simulator/TDR/433.json b/mocks/device-cgi-simulator/TDR/433.json similarity index 100% rename from mocks/js-simulator/TDR/433.json rename to mocks/device-cgi-simulator/TDR/433.json diff --git a/mocks/js-simulator/TDR/434.json b/mocks/device-cgi-simulator/TDR/434.json similarity index 100% rename from mocks/js-simulator/TDR/434.json rename to mocks/device-cgi-simulator/TDR/434.json diff --git a/mocks/js-simulator/TDR/435.json b/mocks/device-cgi-simulator/TDR/435.json similarity index 100% rename from mocks/js-simulator/TDR/435.json rename to mocks/device-cgi-simulator/TDR/435.json diff --git a/mocks/js-simulator/TDR/436.json b/mocks/device-cgi-simulator/TDR/436.json similarity index 100% rename from mocks/js-simulator/TDR/436.json rename to mocks/device-cgi-simulator/TDR/436.json diff --git a/mocks/js-simulator/TDR/437.json b/mocks/device-cgi-simulator/TDR/437.json similarity index 100% rename from mocks/js-simulator/TDR/437.json rename to mocks/device-cgi-simulator/TDR/437.json diff --git a/mocks/js-simulator/TDR/438.json b/mocks/device-cgi-simulator/TDR/438.json similarity index 100% rename from mocks/js-simulator/TDR/438.json rename to mocks/device-cgi-simulator/TDR/438.json diff --git a/mocks/js-simulator/TDR/439.json b/mocks/device-cgi-simulator/TDR/439.json similarity index 100% rename from mocks/js-simulator/TDR/439.json rename to mocks/device-cgi-simulator/TDR/439.json diff --git a/mocks/js-simulator/TDR/44.json b/mocks/device-cgi-simulator/TDR/44.json similarity index 100% rename from mocks/js-simulator/TDR/44.json rename to mocks/device-cgi-simulator/TDR/44.json diff --git a/mocks/js-simulator/TDR/440.json b/mocks/device-cgi-simulator/TDR/440.json similarity index 100% rename from mocks/js-simulator/TDR/440.json rename to mocks/device-cgi-simulator/TDR/440.json diff --git a/mocks/js-simulator/TDR/441.json b/mocks/device-cgi-simulator/TDR/441.json similarity index 100% rename from mocks/js-simulator/TDR/441.json rename to mocks/device-cgi-simulator/TDR/441.json diff --git a/mocks/js-simulator/TDR/442.json b/mocks/device-cgi-simulator/TDR/442.json similarity index 100% rename from mocks/js-simulator/TDR/442.json rename to mocks/device-cgi-simulator/TDR/442.json diff --git a/mocks/js-simulator/TDR/443.json b/mocks/device-cgi-simulator/TDR/443.json similarity index 100% rename from mocks/js-simulator/TDR/443.json rename to mocks/device-cgi-simulator/TDR/443.json diff --git a/mocks/js-simulator/TDR/444.json b/mocks/device-cgi-simulator/TDR/444.json similarity index 100% rename from mocks/js-simulator/TDR/444.json rename to mocks/device-cgi-simulator/TDR/444.json diff --git a/mocks/js-simulator/TDR/445.json b/mocks/device-cgi-simulator/TDR/445.json similarity index 100% rename from mocks/js-simulator/TDR/445.json rename to mocks/device-cgi-simulator/TDR/445.json diff --git a/mocks/js-simulator/TDR/446.json b/mocks/device-cgi-simulator/TDR/446.json similarity index 100% rename from mocks/js-simulator/TDR/446.json rename to mocks/device-cgi-simulator/TDR/446.json diff --git a/mocks/js-simulator/TDR/447.json b/mocks/device-cgi-simulator/TDR/447.json similarity index 100% rename from mocks/js-simulator/TDR/447.json rename to mocks/device-cgi-simulator/TDR/447.json diff --git a/mocks/js-simulator/TDR/448.json b/mocks/device-cgi-simulator/TDR/448.json similarity index 100% rename from mocks/js-simulator/TDR/448.json rename to mocks/device-cgi-simulator/TDR/448.json diff --git a/mocks/js-simulator/TDR/449.json b/mocks/device-cgi-simulator/TDR/449.json similarity index 100% rename from mocks/js-simulator/TDR/449.json rename to mocks/device-cgi-simulator/TDR/449.json diff --git a/mocks/js-simulator/TDR/45.json b/mocks/device-cgi-simulator/TDR/45.json similarity index 100% rename from mocks/js-simulator/TDR/45.json rename to mocks/device-cgi-simulator/TDR/45.json diff --git a/mocks/js-simulator/TDR/450.json b/mocks/device-cgi-simulator/TDR/450.json similarity index 100% rename from mocks/js-simulator/TDR/450.json rename to mocks/device-cgi-simulator/TDR/450.json diff --git a/mocks/js-simulator/TDR/451.json b/mocks/device-cgi-simulator/TDR/451.json similarity index 100% rename from mocks/js-simulator/TDR/451.json rename to mocks/device-cgi-simulator/TDR/451.json diff --git a/mocks/js-simulator/TDR/452.json b/mocks/device-cgi-simulator/TDR/452.json similarity index 100% rename from mocks/js-simulator/TDR/452.json rename to mocks/device-cgi-simulator/TDR/452.json diff --git a/mocks/js-simulator/TDR/453.json b/mocks/device-cgi-simulator/TDR/453.json similarity index 100% rename from mocks/js-simulator/TDR/453.json rename to mocks/device-cgi-simulator/TDR/453.json diff --git a/mocks/js-simulator/TDR/454.json b/mocks/device-cgi-simulator/TDR/454.json similarity index 100% rename from mocks/js-simulator/TDR/454.json rename to mocks/device-cgi-simulator/TDR/454.json diff --git a/mocks/js-simulator/TDR/455.json b/mocks/device-cgi-simulator/TDR/455.json similarity index 100% rename from mocks/js-simulator/TDR/455.json rename to mocks/device-cgi-simulator/TDR/455.json diff --git a/mocks/js-simulator/TDR/456.json b/mocks/device-cgi-simulator/TDR/456.json similarity index 100% rename from mocks/js-simulator/TDR/456.json rename to mocks/device-cgi-simulator/TDR/456.json diff --git a/mocks/js-simulator/TDR/457.json b/mocks/device-cgi-simulator/TDR/457.json similarity index 100% rename from mocks/js-simulator/TDR/457.json rename to mocks/device-cgi-simulator/TDR/457.json diff --git a/mocks/js-simulator/TDR/458.json b/mocks/device-cgi-simulator/TDR/458.json similarity index 100% rename from mocks/js-simulator/TDR/458.json rename to mocks/device-cgi-simulator/TDR/458.json diff --git a/mocks/js-simulator/TDR/459.json b/mocks/device-cgi-simulator/TDR/459.json similarity index 100% rename from mocks/js-simulator/TDR/459.json rename to mocks/device-cgi-simulator/TDR/459.json diff --git a/mocks/js-simulator/TDR/46.json b/mocks/device-cgi-simulator/TDR/46.json similarity index 100% rename from mocks/js-simulator/TDR/46.json rename to mocks/device-cgi-simulator/TDR/46.json diff --git a/mocks/js-simulator/TDR/460.json b/mocks/device-cgi-simulator/TDR/460.json similarity index 100% rename from mocks/js-simulator/TDR/460.json rename to mocks/device-cgi-simulator/TDR/460.json diff --git a/mocks/js-simulator/TDR/461.json b/mocks/device-cgi-simulator/TDR/461.json similarity index 100% rename from mocks/js-simulator/TDR/461.json rename to mocks/device-cgi-simulator/TDR/461.json diff --git a/mocks/js-simulator/TDR/462.json b/mocks/device-cgi-simulator/TDR/462.json similarity index 100% rename from mocks/js-simulator/TDR/462.json rename to mocks/device-cgi-simulator/TDR/462.json diff --git a/mocks/js-simulator/TDR/463.json b/mocks/device-cgi-simulator/TDR/463.json similarity index 100% rename from mocks/js-simulator/TDR/463.json rename to mocks/device-cgi-simulator/TDR/463.json diff --git a/mocks/js-simulator/TDR/464.json b/mocks/device-cgi-simulator/TDR/464.json similarity index 100% rename from mocks/js-simulator/TDR/464.json rename to mocks/device-cgi-simulator/TDR/464.json diff --git a/mocks/js-simulator/TDR/465.json b/mocks/device-cgi-simulator/TDR/465.json similarity index 100% rename from mocks/js-simulator/TDR/465.json rename to mocks/device-cgi-simulator/TDR/465.json diff --git a/mocks/js-simulator/TDR/466.json b/mocks/device-cgi-simulator/TDR/466.json similarity index 100% rename from mocks/js-simulator/TDR/466.json rename to mocks/device-cgi-simulator/TDR/466.json diff --git a/mocks/js-simulator/TDR/467.json b/mocks/device-cgi-simulator/TDR/467.json similarity index 100% rename from mocks/js-simulator/TDR/467.json rename to mocks/device-cgi-simulator/TDR/467.json diff --git a/mocks/js-simulator/TDR/468.json b/mocks/device-cgi-simulator/TDR/468.json similarity index 100% rename from mocks/js-simulator/TDR/468.json rename to mocks/device-cgi-simulator/TDR/468.json diff --git a/mocks/js-simulator/TDR/469.json b/mocks/device-cgi-simulator/TDR/469.json similarity index 100% rename from mocks/js-simulator/TDR/469.json rename to mocks/device-cgi-simulator/TDR/469.json diff --git a/mocks/js-simulator/TDR/47.json b/mocks/device-cgi-simulator/TDR/47.json similarity index 100% rename from mocks/js-simulator/TDR/47.json rename to mocks/device-cgi-simulator/TDR/47.json diff --git a/mocks/js-simulator/TDR/470.json b/mocks/device-cgi-simulator/TDR/470.json similarity index 100% rename from mocks/js-simulator/TDR/470.json rename to mocks/device-cgi-simulator/TDR/470.json diff --git a/mocks/js-simulator/TDR/471.json b/mocks/device-cgi-simulator/TDR/471.json similarity index 100% rename from mocks/js-simulator/TDR/471.json rename to mocks/device-cgi-simulator/TDR/471.json diff --git a/mocks/js-simulator/TDR/472.json b/mocks/device-cgi-simulator/TDR/472.json similarity index 100% rename from mocks/js-simulator/TDR/472.json rename to mocks/device-cgi-simulator/TDR/472.json diff --git a/mocks/js-simulator/TDR/473.json b/mocks/device-cgi-simulator/TDR/473.json similarity index 100% rename from mocks/js-simulator/TDR/473.json rename to mocks/device-cgi-simulator/TDR/473.json diff --git a/mocks/js-simulator/TDR/474.json b/mocks/device-cgi-simulator/TDR/474.json similarity index 100% rename from mocks/js-simulator/TDR/474.json rename to mocks/device-cgi-simulator/TDR/474.json diff --git a/mocks/js-simulator/TDR/475.json b/mocks/device-cgi-simulator/TDR/475.json similarity index 100% rename from mocks/js-simulator/TDR/475.json rename to mocks/device-cgi-simulator/TDR/475.json diff --git a/mocks/js-simulator/TDR/476.json b/mocks/device-cgi-simulator/TDR/476.json similarity index 100% rename from mocks/js-simulator/TDR/476.json rename to mocks/device-cgi-simulator/TDR/476.json diff --git a/mocks/js-simulator/TDR/477.json b/mocks/device-cgi-simulator/TDR/477.json similarity index 100% rename from mocks/js-simulator/TDR/477.json rename to mocks/device-cgi-simulator/TDR/477.json diff --git a/mocks/js-simulator/TDR/478.json b/mocks/device-cgi-simulator/TDR/478.json similarity index 100% rename from mocks/js-simulator/TDR/478.json rename to mocks/device-cgi-simulator/TDR/478.json diff --git a/mocks/js-simulator/TDR/479.json b/mocks/device-cgi-simulator/TDR/479.json similarity index 100% rename from mocks/js-simulator/TDR/479.json rename to mocks/device-cgi-simulator/TDR/479.json diff --git a/mocks/js-simulator/TDR/48.json b/mocks/device-cgi-simulator/TDR/48.json similarity index 100% rename from mocks/js-simulator/TDR/48.json rename to mocks/device-cgi-simulator/TDR/48.json diff --git a/mocks/js-simulator/TDR/480.json b/mocks/device-cgi-simulator/TDR/480.json similarity index 100% rename from mocks/js-simulator/TDR/480.json rename to mocks/device-cgi-simulator/TDR/480.json diff --git a/mocks/js-simulator/TDR/481.json b/mocks/device-cgi-simulator/TDR/481.json similarity index 100% rename from mocks/js-simulator/TDR/481.json rename to mocks/device-cgi-simulator/TDR/481.json diff --git a/mocks/js-simulator/TDR/482.json b/mocks/device-cgi-simulator/TDR/482.json similarity index 100% rename from mocks/js-simulator/TDR/482.json rename to mocks/device-cgi-simulator/TDR/482.json diff --git a/mocks/js-simulator/TDR/483.json b/mocks/device-cgi-simulator/TDR/483.json similarity index 100% rename from mocks/js-simulator/TDR/483.json rename to mocks/device-cgi-simulator/TDR/483.json diff --git a/mocks/js-simulator/TDR/484.json b/mocks/device-cgi-simulator/TDR/484.json similarity index 100% rename from mocks/js-simulator/TDR/484.json rename to mocks/device-cgi-simulator/TDR/484.json diff --git a/mocks/js-simulator/TDR/485.json b/mocks/device-cgi-simulator/TDR/485.json similarity index 100% rename from mocks/js-simulator/TDR/485.json rename to mocks/device-cgi-simulator/TDR/485.json diff --git a/mocks/js-simulator/TDR/486.json b/mocks/device-cgi-simulator/TDR/486.json similarity index 100% rename from mocks/js-simulator/TDR/486.json rename to mocks/device-cgi-simulator/TDR/486.json diff --git a/mocks/js-simulator/TDR/487.json b/mocks/device-cgi-simulator/TDR/487.json similarity index 100% rename from mocks/js-simulator/TDR/487.json rename to mocks/device-cgi-simulator/TDR/487.json diff --git a/mocks/js-simulator/TDR/488.json b/mocks/device-cgi-simulator/TDR/488.json similarity index 100% rename from mocks/js-simulator/TDR/488.json rename to mocks/device-cgi-simulator/TDR/488.json diff --git a/mocks/js-simulator/TDR/489.json b/mocks/device-cgi-simulator/TDR/489.json similarity index 100% rename from mocks/js-simulator/TDR/489.json rename to mocks/device-cgi-simulator/TDR/489.json diff --git a/mocks/js-simulator/TDR/49.json b/mocks/device-cgi-simulator/TDR/49.json similarity index 100% rename from mocks/js-simulator/TDR/49.json rename to mocks/device-cgi-simulator/TDR/49.json diff --git a/mocks/js-simulator/TDR/490.json b/mocks/device-cgi-simulator/TDR/490.json similarity index 100% rename from mocks/js-simulator/TDR/490.json rename to mocks/device-cgi-simulator/TDR/490.json diff --git a/mocks/js-simulator/TDR/491.json b/mocks/device-cgi-simulator/TDR/491.json similarity index 100% rename from mocks/js-simulator/TDR/491.json rename to mocks/device-cgi-simulator/TDR/491.json diff --git a/mocks/js-simulator/TDR/5.json b/mocks/device-cgi-simulator/TDR/5.json similarity index 100% rename from mocks/js-simulator/TDR/5.json rename to mocks/device-cgi-simulator/TDR/5.json diff --git a/mocks/js-simulator/TDR/50.json b/mocks/device-cgi-simulator/TDR/50.json similarity index 100% rename from mocks/js-simulator/TDR/50.json rename to mocks/device-cgi-simulator/TDR/50.json diff --git a/mocks/js-simulator/TDR/51.json b/mocks/device-cgi-simulator/TDR/51.json similarity index 100% rename from mocks/js-simulator/TDR/51.json rename to mocks/device-cgi-simulator/TDR/51.json diff --git a/mocks/js-simulator/TDR/52.json b/mocks/device-cgi-simulator/TDR/52.json similarity index 100% rename from mocks/js-simulator/TDR/52.json rename to mocks/device-cgi-simulator/TDR/52.json diff --git a/mocks/js-simulator/TDR/53.json b/mocks/device-cgi-simulator/TDR/53.json similarity index 100% rename from mocks/js-simulator/TDR/53.json rename to mocks/device-cgi-simulator/TDR/53.json diff --git a/mocks/js-simulator/TDR/54.json b/mocks/device-cgi-simulator/TDR/54.json similarity index 100% rename from mocks/js-simulator/TDR/54.json rename to mocks/device-cgi-simulator/TDR/54.json diff --git a/mocks/js-simulator/TDR/55.json b/mocks/device-cgi-simulator/TDR/55.json similarity index 100% rename from mocks/js-simulator/TDR/55.json rename to mocks/device-cgi-simulator/TDR/55.json diff --git a/mocks/js-simulator/TDR/56.json b/mocks/device-cgi-simulator/TDR/56.json similarity index 100% rename from mocks/js-simulator/TDR/56.json rename to mocks/device-cgi-simulator/TDR/56.json diff --git a/mocks/js-simulator/TDR/57.json b/mocks/device-cgi-simulator/TDR/57.json similarity index 100% rename from mocks/js-simulator/TDR/57.json rename to mocks/device-cgi-simulator/TDR/57.json diff --git a/mocks/js-simulator/TDR/58.json b/mocks/device-cgi-simulator/TDR/58.json similarity index 100% rename from mocks/js-simulator/TDR/58.json rename to mocks/device-cgi-simulator/TDR/58.json diff --git a/mocks/js-simulator/TDR/59.json b/mocks/device-cgi-simulator/TDR/59.json similarity index 100% rename from mocks/js-simulator/TDR/59.json rename to mocks/device-cgi-simulator/TDR/59.json diff --git a/mocks/js-simulator/TDR/6.json b/mocks/device-cgi-simulator/TDR/6.json similarity index 100% rename from mocks/js-simulator/TDR/6.json rename to mocks/device-cgi-simulator/TDR/6.json diff --git a/mocks/js-simulator/TDR/60.json b/mocks/device-cgi-simulator/TDR/60.json similarity index 100% rename from mocks/js-simulator/TDR/60.json rename to mocks/device-cgi-simulator/TDR/60.json diff --git a/mocks/js-simulator/TDR/61.json b/mocks/device-cgi-simulator/TDR/61.json similarity index 100% rename from mocks/js-simulator/TDR/61.json rename to mocks/device-cgi-simulator/TDR/61.json diff --git a/mocks/js-simulator/TDR/62.json b/mocks/device-cgi-simulator/TDR/62.json similarity index 100% rename from mocks/js-simulator/TDR/62.json rename to mocks/device-cgi-simulator/TDR/62.json diff --git a/mocks/js-simulator/TDR/63.json b/mocks/device-cgi-simulator/TDR/63.json similarity index 100% rename from mocks/js-simulator/TDR/63.json rename to mocks/device-cgi-simulator/TDR/63.json diff --git a/mocks/js-simulator/TDR/64.json b/mocks/device-cgi-simulator/TDR/64.json similarity index 100% rename from mocks/js-simulator/TDR/64.json rename to mocks/device-cgi-simulator/TDR/64.json diff --git a/mocks/js-simulator/TDR/65.json b/mocks/device-cgi-simulator/TDR/65.json similarity index 100% rename from mocks/js-simulator/TDR/65.json rename to mocks/device-cgi-simulator/TDR/65.json diff --git a/mocks/js-simulator/TDR/66.json b/mocks/device-cgi-simulator/TDR/66.json similarity index 100% rename from mocks/js-simulator/TDR/66.json rename to mocks/device-cgi-simulator/TDR/66.json diff --git a/mocks/js-simulator/TDR/67.json b/mocks/device-cgi-simulator/TDR/67.json similarity index 100% rename from mocks/js-simulator/TDR/67.json rename to mocks/device-cgi-simulator/TDR/67.json diff --git a/mocks/js-simulator/TDR/68.json b/mocks/device-cgi-simulator/TDR/68.json similarity index 100% rename from mocks/js-simulator/TDR/68.json rename to mocks/device-cgi-simulator/TDR/68.json diff --git a/mocks/js-simulator/TDR/69.json b/mocks/device-cgi-simulator/TDR/69.json similarity index 100% rename from mocks/js-simulator/TDR/69.json rename to mocks/device-cgi-simulator/TDR/69.json diff --git a/mocks/js-simulator/TDR/7.json b/mocks/device-cgi-simulator/TDR/7.json similarity index 100% rename from mocks/js-simulator/TDR/7.json rename to mocks/device-cgi-simulator/TDR/7.json diff --git a/mocks/js-simulator/TDR/70.json b/mocks/device-cgi-simulator/TDR/70.json similarity index 100% rename from mocks/js-simulator/TDR/70.json rename to mocks/device-cgi-simulator/TDR/70.json diff --git a/mocks/js-simulator/TDR/71.json b/mocks/device-cgi-simulator/TDR/71.json similarity index 100% rename from mocks/js-simulator/TDR/71.json rename to mocks/device-cgi-simulator/TDR/71.json diff --git a/mocks/js-simulator/TDR/72.json b/mocks/device-cgi-simulator/TDR/72.json similarity index 100% rename from mocks/js-simulator/TDR/72.json rename to mocks/device-cgi-simulator/TDR/72.json diff --git a/mocks/js-simulator/TDR/73.json b/mocks/device-cgi-simulator/TDR/73.json similarity index 100% rename from mocks/js-simulator/TDR/73.json rename to mocks/device-cgi-simulator/TDR/73.json diff --git a/mocks/js-simulator/TDR/74.json b/mocks/device-cgi-simulator/TDR/74.json similarity index 100% rename from mocks/js-simulator/TDR/74.json rename to mocks/device-cgi-simulator/TDR/74.json diff --git a/mocks/js-simulator/TDR/75.json b/mocks/device-cgi-simulator/TDR/75.json similarity index 100% rename from mocks/js-simulator/TDR/75.json rename to mocks/device-cgi-simulator/TDR/75.json diff --git a/mocks/js-simulator/TDR/76.json b/mocks/device-cgi-simulator/TDR/76.json similarity index 100% rename from mocks/js-simulator/TDR/76.json rename to mocks/device-cgi-simulator/TDR/76.json diff --git a/mocks/js-simulator/TDR/77.json b/mocks/device-cgi-simulator/TDR/77.json similarity index 100% rename from mocks/js-simulator/TDR/77.json rename to mocks/device-cgi-simulator/TDR/77.json diff --git a/mocks/js-simulator/TDR/78.json b/mocks/device-cgi-simulator/TDR/78.json similarity index 100% rename from mocks/js-simulator/TDR/78.json rename to mocks/device-cgi-simulator/TDR/78.json diff --git a/mocks/js-simulator/TDR/79.json b/mocks/device-cgi-simulator/TDR/79.json similarity index 100% rename from mocks/js-simulator/TDR/79.json rename to mocks/device-cgi-simulator/TDR/79.json diff --git a/mocks/js-simulator/TDR/8.json b/mocks/device-cgi-simulator/TDR/8.json similarity index 100% rename from mocks/js-simulator/TDR/8.json rename to mocks/device-cgi-simulator/TDR/8.json diff --git a/mocks/js-simulator/TDR/80.json b/mocks/device-cgi-simulator/TDR/80.json similarity index 100% rename from mocks/js-simulator/TDR/80.json rename to mocks/device-cgi-simulator/TDR/80.json diff --git a/mocks/js-simulator/TDR/81.json b/mocks/device-cgi-simulator/TDR/81.json similarity index 100% rename from mocks/js-simulator/TDR/81.json rename to mocks/device-cgi-simulator/TDR/81.json diff --git a/mocks/js-simulator/TDR/82.json b/mocks/device-cgi-simulator/TDR/82.json similarity index 100% rename from mocks/js-simulator/TDR/82.json rename to mocks/device-cgi-simulator/TDR/82.json diff --git a/mocks/js-simulator/TDR/83.json b/mocks/device-cgi-simulator/TDR/83.json similarity index 100% rename from mocks/js-simulator/TDR/83.json rename to mocks/device-cgi-simulator/TDR/83.json diff --git a/mocks/js-simulator/TDR/84.json b/mocks/device-cgi-simulator/TDR/84.json similarity index 100% rename from mocks/js-simulator/TDR/84.json rename to mocks/device-cgi-simulator/TDR/84.json diff --git a/mocks/js-simulator/TDR/85.json b/mocks/device-cgi-simulator/TDR/85.json similarity index 100% rename from mocks/js-simulator/TDR/85.json rename to mocks/device-cgi-simulator/TDR/85.json diff --git a/mocks/js-simulator/TDR/86.json b/mocks/device-cgi-simulator/TDR/86.json similarity index 100% rename from mocks/js-simulator/TDR/86.json rename to mocks/device-cgi-simulator/TDR/86.json diff --git a/mocks/js-simulator/TDR/87.json b/mocks/device-cgi-simulator/TDR/87.json similarity index 100% rename from mocks/js-simulator/TDR/87.json rename to mocks/device-cgi-simulator/TDR/87.json diff --git a/mocks/js-simulator/TDR/88.json b/mocks/device-cgi-simulator/TDR/88.json similarity index 100% rename from mocks/js-simulator/TDR/88.json rename to mocks/device-cgi-simulator/TDR/88.json diff --git a/mocks/js-simulator/TDR/89.json b/mocks/device-cgi-simulator/TDR/89.json similarity index 100% rename from mocks/js-simulator/TDR/89.json rename to mocks/device-cgi-simulator/TDR/89.json diff --git a/mocks/js-simulator/TDR/9.json b/mocks/device-cgi-simulator/TDR/9.json similarity index 100% rename from mocks/js-simulator/TDR/9.json rename to mocks/device-cgi-simulator/TDR/9.json diff --git a/mocks/js-simulator/TDR/90.json b/mocks/device-cgi-simulator/TDR/90.json similarity index 100% rename from mocks/js-simulator/TDR/90.json rename to mocks/device-cgi-simulator/TDR/90.json diff --git a/mocks/js-simulator/TDR/91.json b/mocks/device-cgi-simulator/TDR/91.json similarity index 100% rename from mocks/js-simulator/TDR/91.json rename to mocks/device-cgi-simulator/TDR/91.json diff --git a/mocks/js-simulator/TDR/92.json b/mocks/device-cgi-simulator/TDR/92.json similarity index 100% rename from mocks/js-simulator/TDR/92.json rename to mocks/device-cgi-simulator/TDR/92.json diff --git a/mocks/js-simulator/TDR/93.json b/mocks/device-cgi-simulator/TDR/93.json similarity index 100% rename from mocks/js-simulator/TDR/93.json rename to mocks/device-cgi-simulator/TDR/93.json diff --git a/mocks/js-simulator/TDR/94.json b/mocks/device-cgi-simulator/TDR/94.json similarity index 100% rename from mocks/js-simulator/TDR/94.json rename to mocks/device-cgi-simulator/TDR/94.json diff --git a/mocks/js-simulator/TDR/95.json b/mocks/device-cgi-simulator/TDR/95.json similarity index 100% rename from mocks/js-simulator/TDR/95.json rename to mocks/device-cgi-simulator/TDR/95.json diff --git a/mocks/js-simulator/TDR/96.json b/mocks/device-cgi-simulator/TDR/96.json similarity index 100% rename from mocks/js-simulator/TDR/96.json rename to mocks/device-cgi-simulator/TDR/96.json diff --git a/mocks/js-simulator/TDR/97.json b/mocks/device-cgi-simulator/TDR/97.json similarity index 100% rename from mocks/js-simulator/TDR/97.json rename to mocks/device-cgi-simulator/TDR/97.json diff --git a/mocks/js-simulator/TDR/98.json b/mocks/device-cgi-simulator/TDR/98.json similarity index 100% rename from mocks/js-simulator/TDR/98.json rename to mocks/device-cgi-simulator/TDR/98.json diff --git a/mocks/js-simulator/TDR/99.json b/mocks/device-cgi-simulator/TDR/99.json similarity index 100% rename from mocks/js-simulator/TDR/99.json rename to mocks/device-cgi-simulator/TDR/99.json diff --git a/mocks/js-simulator/analogInputsHistoryData/analogInput1.json b/mocks/device-cgi-simulator/analogInputsHistoryData/analogInput1.json similarity index 100% rename from mocks/js-simulator/analogInputsHistoryData/analogInput1.json rename to mocks/device-cgi-simulator/analogInputsHistoryData/analogInput1.json diff --git a/mocks/js-simulator/analogInputsHistoryData/analogInput2.json b/mocks/device-cgi-simulator/analogInputsHistoryData/analogInput2.json similarity index 100% rename from mocks/js-simulator/analogInputsHistoryData/analogInput2.json rename to mocks/device-cgi-simulator/analogInputsHistoryData/analogInput2.json diff --git a/mocks/js-simulator/analogInputsHistoryData/analogInput3.json b/mocks/device-cgi-simulator/analogInputsHistoryData/analogInput3.json similarity index 100% rename from mocks/js-simulator/analogInputsHistoryData/analogInput3.json rename to mocks/device-cgi-simulator/analogInputsHistoryData/analogInput3.json diff --git a/mocks/js-simulator/analogInputsHistoryData/analogInput4.json b/mocks/device-cgi-simulator/analogInputsHistoryData/analogInput4.json similarity index 100% rename from mocks/js-simulator/analogInputsHistoryData/analogInput4.json rename to mocks/device-cgi-simulator/analogInputsHistoryData/analogInput4.json diff --git a/mocks/js-simulator/analogInputsHistoryData/analogInput5.json b/mocks/device-cgi-simulator/analogInputsHistoryData/analogInput5.json similarity index 100% rename from mocks/js-simulator/analogInputsHistoryData/analogInput5.json rename to mocks/device-cgi-simulator/analogInputsHistoryData/analogInput5.json diff --git a/mocks/js-simulator/analogInputsHistoryData/analogInput6.json b/mocks/device-cgi-simulator/analogInputsHistoryData/analogInput6.json similarity index 100% rename from mocks/js-simulator/analogInputsHistoryData/analogInput6.json rename to mocks/device-cgi-simulator/analogInputsHistoryData/analogInput6.json diff --git a/mocks/js-simulator/analogInputsHistoryData/analogInput7.json b/mocks/device-cgi-simulator/analogInputsHistoryData/analogInput7.json similarity index 100% rename from mocks/js-simulator/analogInputsHistoryData/analogInput7.json rename to mocks/device-cgi-simulator/analogInputsHistoryData/analogInput7.json diff --git a/mocks/js-simulator/analogInputsHistoryData/analogInput8.json b/mocks/device-cgi-simulator/analogInputsHistoryData/analogInput8.json similarity index 100% rename from mocks/js-simulator/analogInputsHistoryData/analogInput8.json rename to mocks/device-cgi-simulator/analogInputsHistoryData/analogInput8.json diff --git a/mocks/js-simulator/digitaleausgaengeMockData.json b/mocks/device-cgi-simulator/digitaleausgaengeMockData.json similarity index 100% rename from mocks/js-simulator/digitaleausgaengeMockData.json rename to mocks/device-cgi-simulator/digitaleausgaengeMockData.json diff --git a/mocks/js-simulator/kuesChartData/DIA0_3.json b/mocks/device-cgi-simulator/kuesChartData/DIA0_3.json similarity index 100% rename from mocks/js-simulator/kuesChartData/DIA0_3.json rename to mocks/device-cgi-simulator/kuesChartData/DIA0_3.json diff --git a/mocks/js-simulator/kuesChartData/DIA0_4.json b/mocks/device-cgi-simulator/kuesChartData/DIA0_4.json similarity index 100% rename from mocks/js-simulator/kuesChartData/DIA0_4.json rename to mocks/device-cgi-simulator/kuesChartData/DIA0_4.json diff --git a/mocks/js-simulator/kuesChartData/DIA1_3.json b/mocks/device-cgi-simulator/kuesChartData/DIA1_3.json similarity index 100% rename from mocks/js-simulator/kuesChartData/DIA1_3.json rename to mocks/device-cgi-simulator/kuesChartData/DIA1_3.json diff --git a/mocks/js-simulator/kuesChartData/DIA1_4.json b/mocks/device-cgi-simulator/kuesChartData/DIA1_4.json similarity index 100% rename from mocks/js-simulator/kuesChartData/DIA1_4.json rename to mocks/device-cgi-simulator/kuesChartData/DIA1_4.json diff --git a/mocks/js-simulator/kuesChartData/DIA2_3.json b/mocks/device-cgi-simulator/kuesChartData/DIA2_3.json similarity index 100% rename from mocks/js-simulator/kuesChartData/DIA2_3.json rename to mocks/device-cgi-simulator/kuesChartData/DIA2_3.json diff --git a/mocks/js-simulator/kuesChartData/DIA2_4.json b/mocks/device-cgi-simulator/kuesChartData/DIA2_4.json similarity index 100% rename from mocks/js-simulator/kuesChartData/DIA2_4.json rename to mocks/device-cgi-simulator/kuesChartData/DIA2_4.json diff --git a/mocks/js-simulator/kuesChartData/Isolationswiderstand.json b/mocks/device-cgi-simulator/kuesChartData/Isolationswiderstand.json similarity index 100% rename from mocks/js-simulator/kuesChartData/Isolationswiderstand.json rename to mocks/device-cgi-simulator/kuesChartData/Isolationswiderstand.json diff --git a/mocks/js-simulator/kuesChartData/Schleifenwiderstand.json b/mocks/device-cgi-simulator/kuesChartData/Schleifenwiderstand.json similarity index 100% rename from mocks/js-simulator/kuesChartData/Schleifenwiderstand.json rename to mocks/device-cgi-simulator/kuesChartData/Schleifenwiderstand.json diff --git a/mocks/js-simulator/kuesChartData/_doc.js b/mocks/device-cgi-simulator/kuesChartData/_doc.js similarity index 100% rename from mocks/js-simulator/kuesChartData/_doc.js rename to mocks/device-cgi-simulator/kuesChartData/_doc.js diff --git a/mocks/js-simulator/kuesChartData/analogerMesswert.json b/mocks/device-cgi-simulator/kuesChartData/analogerMesswert.json similarity index 100% rename from mocks/js-simulator/kuesChartData/analogerMesswert.json rename to mocks/device-cgi-simulator/kuesChartData/analogerMesswert.json diff --git a/mocks/js-simulator/kuesChartData/digitalerZustand.json b/mocks/device-cgi-simulator/kuesChartData/digitalerZustand.json similarity index 100% rename from mocks/js-simulator/kuesChartData/digitalerZustand.json rename to mocks/device-cgi-simulator/kuesChartData/digitalerZustand.json diff --git a/mocks/js-simulator/kuesChartData/slot1/isolationswiderstand/DIA0.json b/mocks/device-cgi-simulator/kuesChartData/slot1/isolationswiderstand/DIA0.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot1/isolationswiderstand/DIA0.json rename to mocks/device-cgi-simulator/kuesChartData/slot1/isolationswiderstand/DIA0.json diff --git a/mocks/js-simulator/kuesChartData/slot1/isolationswiderstand/DIA1.json b/mocks/device-cgi-simulator/kuesChartData/slot1/isolationswiderstand/DIA1.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot1/isolationswiderstand/DIA1.json rename to mocks/device-cgi-simulator/kuesChartData/slot1/isolationswiderstand/DIA1.json diff --git a/mocks/js-simulator/kuesChartData/slot1/isolationswiderstand/DIA2.json b/mocks/device-cgi-simulator/kuesChartData/slot1/isolationswiderstand/DIA2.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot1/isolationswiderstand/DIA2.json rename to mocks/device-cgi-simulator/kuesChartData/slot1/isolationswiderstand/DIA2.json diff --git a/mocks/js-simulator/kuesChartData/slot1/schleifenwiderstand/DIA0.json b/mocks/device-cgi-simulator/kuesChartData/slot1/schleifenwiderstand/DIA0.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot1/schleifenwiderstand/DIA0.json rename to mocks/device-cgi-simulator/kuesChartData/slot1/schleifenwiderstand/DIA0.json diff --git a/mocks/js-simulator/kuesChartData/slot1/schleifenwiderstand/DIA1.json b/mocks/device-cgi-simulator/kuesChartData/slot1/schleifenwiderstand/DIA1.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot1/schleifenwiderstand/DIA1.json rename to mocks/device-cgi-simulator/kuesChartData/slot1/schleifenwiderstand/DIA1.json diff --git a/mocks/js-simulator/kuesChartData/slot1/schleifenwiderstand/DIA2.json b/mocks/device-cgi-simulator/kuesChartData/slot1/schleifenwiderstand/DIA2.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot1/schleifenwiderstand/DIA2.json rename to mocks/device-cgi-simulator/kuesChartData/slot1/schleifenwiderstand/DIA2.json diff --git a/mocks/js-simulator/kuesChartData/slot2/isolationswiderstand/DIA0.json b/mocks/device-cgi-simulator/kuesChartData/slot2/isolationswiderstand/DIA0.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot2/isolationswiderstand/DIA0.json rename to mocks/device-cgi-simulator/kuesChartData/slot2/isolationswiderstand/DIA0.json diff --git a/mocks/js-simulator/kuesChartData/slot2/isolationswiderstand/DIA1.json b/mocks/device-cgi-simulator/kuesChartData/slot2/isolationswiderstand/DIA1.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot2/isolationswiderstand/DIA1.json rename to mocks/device-cgi-simulator/kuesChartData/slot2/isolationswiderstand/DIA1.json diff --git a/mocks/js-simulator/kuesChartData/slot2/isolationswiderstand/DIA2.json b/mocks/device-cgi-simulator/kuesChartData/slot2/isolationswiderstand/DIA2.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot2/isolationswiderstand/DIA2.json rename to mocks/device-cgi-simulator/kuesChartData/slot2/isolationswiderstand/DIA2.json diff --git a/mocks/js-simulator/kuesChartData/slot2/schleifenwiderstand/DIA0.json b/mocks/device-cgi-simulator/kuesChartData/slot2/schleifenwiderstand/DIA0.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot2/schleifenwiderstand/DIA0.json rename to mocks/device-cgi-simulator/kuesChartData/slot2/schleifenwiderstand/DIA0.json diff --git a/mocks/js-simulator/kuesChartData/slot2/schleifenwiderstand/DIA1.json b/mocks/device-cgi-simulator/kuesChartData/slot2/schleifenwiderstand/DIA1.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot2/schleifenwiderstand/DIA1.json rename to mocks/device-cgi-simulator/kuesChartData/slot2/schleifenwiderstand/DIA1.json diff --git a/mocks/js-simulator/kuesChartData/slot2/schleifenwiderstand/DIA2.json b/mocks/device-cgi-simulator/kuesChartData/slot2/schleifenwiderstand/DIA2.json similarity index 100% rename from mocks/js-simulator/kuesChartData/slot2/schleifenwiderstand/DIA2.json rename to mocks/device-cgi-simulator/kuesChartData/slot2/schleifenwiderstand/DIA2.json diff --git a/mocks/js-simulator/meldungen/messages.json b/mocks/device-cgi-simulator/meldungen/messages.json similarity index 100% rename from mocks/js-simulator/meldungen/messages.json rename to mocks/device-cgi-simulator/meldungen/messages.json diff --git a/mocks/js-simulator/mockChartData.json b/mocks/device-cgi-simulator/mockChartData.json similarity index 100% rename from mocks/js-simulator/mockChartData.json rename to mocks/device-cgi-simulator/mockChartData.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot0.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot0.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot0.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot0.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot1.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot1.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot1.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot1.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot10.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot10.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot10.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot10.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot11.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot11.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot11.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot11.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot12.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot12.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot12.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot12.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot13.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot13.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot13.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot13.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot14.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot14.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot14.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot14.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot15.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot15.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot15.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot15.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot16.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot16.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot16.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot16.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot17.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot17.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot17.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot17.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot18.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot18.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot18.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot18.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot19.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot19.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot19.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot19.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot2.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot2.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot2.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot2.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot20.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot20.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot20.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot20.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot21.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot21.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot21.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot21.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot22.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot22.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot22.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot22.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot23.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot23.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot23.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot23.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot24.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot24.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot24.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot24.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot25.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot25.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot25.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot25.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot26.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot26.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot26.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot26.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot27.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot27.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot27.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot27.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot28.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot28.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot28.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot28.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot29.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot29.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot29.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot29.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot3.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot3.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot3.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot3.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot30.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot30.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot30.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot30.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot31.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot31.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot31.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot31.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot4.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot4.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot4.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot4.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot5.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot5.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot5.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot5.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot6.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot6.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot6.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot6.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot7.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot7.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot7.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot7.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot8.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot8.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot8.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot8.json diff --git a/mocks/js-simulator/tdr-reference-curves/slot9.json b/mocks/device-cgi-simulator/tdr-reference-curves/slot9.json similarity index 100% rename from mocks/js-simulator/tdr-reference-curves/slot9.json rename to mocks/device-cgi-simulator/tdr-reference-curves/slot9.json diff --git a/package-lock.json b/package-lock.json index 7332aa2..94d805f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.416", + "version": "1.6.417", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.416", + "version": "1.6.417", "dependencies": { "@fontsource/roboto": "^5.1.0", "@iconify-icons/ri": "^1.2.10", diff --git a/package.json b/package.json index 07b4478..d03dfa3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.416", + "version": "1.6.417", "private": true, "scripts": { "dev": "next dev", diff --git a/services/fetchDigitalOutputsService.ts b/services/fetchDigitalOutputsService.ts index ced780d..af24f68 100644 --- a/services/fetchDigitalOutputsService.ts +++ b/services/fetchDigitalOutputsService.ts @@ -28,10 +28,18 @@ export const fetchDigitalOutputsService = async () => { } // jsmock oder production - const scriptUrl = - mode === "production" - ? "/CPL?/CPL/SERVICE/digitalOutputs.js" - : "/CPLmockData/SERVICE/digitalOutputsMockData.js"; + let scriptUrl = ""; + + if (mode === "production") { + scriptUrl = "/CPL?/CPL/SERVICE/digitalOutputs.js"; + } else if (mode === "jsmock") { + scriptUrl = "/CPLmockData/SERVICE/digitalOutputsMockData.js"; + } else { + console.warn( + `⚠️ fetchDigitalOutputsFromScript wird nur in 'jsmock' oder 'production' verwendet (aktueller Modus: ${mode})` + ); + return []; + } await new Promise((resolve, reject) => { const script = document.createElement("script");