diff --git a/.gitignore b/.gitignore index 0dc85f03b..d08e4307a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,8 +12,8 @@ Results/bin/ Results/obj/ ResultsBrowser/bin/ ResultsBrowser/obj/ -TestBenchFramework/bin/ -TestBenchFramework/obj/ +TBF/bin/ +TBF/obj/ TBFSetup/Debug/ TBFSetup/Release/ Users/bin/ diff --git a/DeviceTest/DeviceTest.csproj b/DeviceTest/DeviceTest.csproj index 1460ce6f9..98047db26 100644 --- a/DeviceTest/DeviceTest.csproj +++ b/DeviceTest/DeviceTest.csproj @@ -92,7 +92,7 @@ {743DF7DB-C7B6-42EB-986D-0F485E5588E4} Config - + {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48} TBF diff --git a/TestBenchFramework.sln b/TBF.sln similarity index 98% rename from TestBenchFramework.sln rename to TBF.sln index cac863c7d..96de27ef3 100644 --- a/TestBenchFramework.sln +++ b/TBF.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TBF", "TestBenchFramework\TBF.csproj", "{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TBF", "TBF\TBF.csproj", "{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}" ProjectSection(ProjectDependencies) = postProject {EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF} = {EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF} {0C0A1F4D-1363-4544-A7C5-196C76D26CCA} = {0C0A1F4D-1363-4544-A7C5-196C76D26CCA} diff --git a/TestBenchFramework/AboutDlg.Designer.cs b/TBF/AboutDlg.Designer.cs similarity index 100% rename from TestBenchFramework/AboutDlg.Designer.cs rename to TBF/AboutDlg.Designer.cs diff --git a/TestBenchFramework/AboutDlg.cs b/TBF/AboutDlg.cs similarity index 100% rename from TestBenchFramework/AboutDlg.cs rename to TBF/AboutDlg.cs diff --git a/TestBenchFramework/AboutDlg.resx b/TBF/AboutDlg.resx similarity index 100% rename from TestBenchFramework/AboutDlg.resx rename to TBF/AboutDlg.resx diff --git a/TestBenchFramework/AttachedTextBoxes.cs b/TBF/AttachedTextBoxes.cs similarity index 100% rename from TestBenchFramework/AttachedTextBoxes.cs rename to TBF/AttachedTextBoxes.cs diff --git a/TestBenchFramework/BarGraph.cs b/TBF/BarGraph.cs similarity index 100% rename from TestBenchFramework/BarGraph.cs rename to TBF/BarGraph.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs b/TBF/BenchControl/Ambient/Comet/Ambient.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs rename to TBF/BenchControl/Ambient/Comet/Ambient.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/AmbientCfg.cs b/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Comet/AmbientCfg.cs rename to TBF/BenchControl/Ambient/Comet/AmbientCfg.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs rename to TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs rename to TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/AmbientCfgCtrl.resx b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Comet/AmbientCfgCtrl.resx rename to TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/Factory.cs b/TBF/BenchControl/Ambient/Comet/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Comet/Factory.cs rename to TBF/BenchControl/Ambient/Comet/Factory.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs b/TBF/BenchControl/Ambient/Greco/Ambient.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs rename to TBF/BenchControl/Ambient/Greco/Ambient.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/AmbientCfg.cs b/TBF/BenchControl/Ambient/Greco/AmbientCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Greco/AmbientCfg.cs rename to TBF/BenchControl/Ambient/Greco/AmbientCfg.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/AmbientCfgCtrl.Designer.cs b/TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Greco/AmbientCfgCtrl.Designer.cs rename to TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/AmbientCfgCtrl.cs b/TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Greco/AmbientCfgCtrl.cs rename to TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/AmbientCfgCtrl.resx b/TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Greco/AmbientCfgCtrl.resx rename to TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/Factory.cs b/TBF/BenchControl/Ambient/Greco/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Ambient/Greco/Factory.cs rename to TBF/BenchControl/Ambient/Greco/Factory.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Munich/Component.cs b/TBF/BenchControl/BenchInfo/Munich/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Munich/Component.cs rename to TBF/BenchControl/BenchInfo/Munich/Component.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentCfg.cs b/TBF/BenchControl/BenchInfo/Munich/ComponentCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentCfg.cs rename to TBF/BenchControl/BenchInfo/Munich/ComponentCfg.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.cs b/TBF/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.cs rename to TBF/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.designer.cs b/TBF/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.designer.cs rename to TBF/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.resx b/TBF/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.resx rename to TBF/BenchControl/BenchInfo/Munich/ComponentCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentFactory.cs b/TBF/BenchControl/BenchInfo/Munich/ComponentFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Munich/ComponentFactory.cs rename to TBF/BenchControl/BenchInfo/Munich/ComponentFactory.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Polska/Component.cs b/TBF/BenchControl/BenchInfo/Polska/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Polska/Component.cs rename to TBF/BenchControl/BenchInfo/Polska/Component.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentCfg.cs b/TBF/BenchControl/BenchInfo/Polska/ComponentCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentCfg.cs rename to TBF/BenchControl/BenchInfo/Polska/ComponentCfg.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.cs b/TBF/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.cs rename to TBF/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.designer.cs b/TBF/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.designer.cs rename to TBF/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.resx b/TBF/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.resx rename to TBF/BenchControl/BenchInfo/Polska/ComponentCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentFactory.cs b/TBF/BenchControl/BenchInfo/Polska/ComponentFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchInfo/Polska/ComponentFactory.cs rename to TBF/BenchControl/BenchInfo/Polska/ComponentFactory.cs diff --git a/TestBenchFramework/BenchControl/BenchPath.cs b/TBF/BenchControl/BenchPath.cs similarity index 100% rename from TestBenchFramework/BenchControl/BenchPath.cs rename to TBF/BenchControl/BenchPath.cs diff --git a/TestBenchFramework/BenchControl/CfgChangeArgs.cs b/TBF/BenchControl/CfgChangeArgs.cs similarity index 100% rename from TestBenchFramework/BenchControl/CfgChangeArgs.cs rename to TBF/BenchControl/CfgChangeArgs.cs diff --git a/TestBenchFramework/BenchControl/CmdResponseArgs.cs b/TBF/BenchControl/CmdResponseArgs.cs similarity index 100% rename from TestBenchFramework/BenchControl/CmdResponseArgs.cs rename to TBF/BenchControl/CmdResponseArgs.cs diff --git a/TestBenchFramework/BenchControl/ComponentBase.cs b/TBF/BenchControl/ComponentBase.cs similarity index 100% rename from TestBenchFramework/BenchControl/ComponentBase.cs rename to TBF/BenchControl/ComponentBase.cs diff --git a/TestBenchFramework/BenchControl/ComponentCfgBase.cs b/TBF/BenchControl/ComponentCfgBase.cs similarity index 100% rename from TestBenchFramework/BenchControl/ComponentCfgBase.cs rename to TBF/BenchControl/ComponentCfgBase.cs diff --git a/TestBenchFramework/BenchControl/Configs/ConfigCtrlUtils.cs b/TBF/BenchControl/Configs/ConfigCtrlUtils.cs similarity index 100% rename from TestBenchFramework/BenchControl/Configs/ConfigCtrlUtils.cs rename to TBF/BenchControl/Configs/ConfigCtrlUtils.cs diff --git a/TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfg.cs b/TBF/BenchControl/Configs/NameOnly/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfg.cs rename to TBF/BenchControl/Configs/NameOnly/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.cs b/TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.cs rename to TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.resx b/TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.resx rename to TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Constants.cs b/TBF/BenchControl/Constants.cs similarity index 100% rename from TestBenchFramework/BenchControl/Constants.cs rename to TBF/BenchControl/Constants.cs diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TBF/BenchControl/DB/SensusOracle/Database.cs similarity index 100% rename from TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs rename to TBF/BenchControl/DB/SensusOracle/Database.cs diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfg.cs b/TBF/BenchControl/DB/SensusOracle/DatabaseCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfg.cs rename to TBF/BenchControl/DB/SensusOracle/DatabaseCfg.cs diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.cs b/TBF/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.cs rename to TBF/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.designer.cs b/TBF/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.designer.cs rename to TBF/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.resx b/TBF/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.resx rename to TBF/BenchControl/DB/SensusOracle/DatabaseCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseFactory.cs b/TBF/BenchControl/DB/SensusOracle/DatabaseFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseFactory.cs rename to TBF/BenchControl/DB/SensusOracle/DatabaseFactory.cs diff --git a/TestBenchFramework/BenchControl/Danfoss/VLT2800/Pump.cs b/TBF/BenchControl/Danfoss/VLT2800/Pump.cs similarity index 100% rename from TestBenchFramework/BenchControl/Danfoss/VLT2800/Pump.cs rename to TBF/BenchControl/Danfoss/VLT2800/Pump.cs diff --git a/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpCfg.cs b/TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpCfg.cs rename to TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs diff --git a/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.cs b/TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.cs rename to TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.designer.cs b/TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.designer.cs rename to TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.resx b/TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.resx rename to TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpFactory.cs b/TBF/BenchControl/Danfoss/VLT2800/PumpFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpFactory.cs rename to TBF/BenchControl/Danfoss/VLT2800/PumpFactory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Combined/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/Combined/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Combined/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/Combined/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Combined/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/Combined/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs b/TBF/BenchControl/DataEntry/Combined/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs rename to TBF/BenchControl/DataEntry/Combined/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Combined/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/Combined/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormFactory.cs b/TBF/BenchControl/DataEntry/Combined/EntryFormFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormFactory.cs rename to TBF/BenchControl/DataEntry/Combined/EntryFormFactory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/Combined/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/Combined/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/Combined/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Combined/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/Combined/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.pl.resx rename to TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.ru.resx rename to TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/HeatMeters12/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleEndForm.cs b/TBF/BenchControl/DataEntry/HeatMeters12/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleEndForm.resx b/TBF/BenchControl/DataEntry/HeatMeters12/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/HeatMeters12/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryForm.cs b/TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryForm.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/Factory.cs b/TBF/BenchControl/DataEntry/HeatMeters12/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/Factory.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/Factory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.pl.resx rename to TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.ru.resx rename to TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/HeatMeters6/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleEndForm.cs b/TBF/BenchControl/DataEntry/HeatMeters6/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleEndForm.resx b/TBF/BenchControl/DataEntry/HeatMeters6/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/HeatMeters6/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryForm.cs b/TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryForm.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/Factory.cs b/TBF/BenchControl/DataEntry/HeatMeters6/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/Factory.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/Factory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/Munich/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/Munich/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Munich/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/Munich/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Munich/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/Munich/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs b/TBF/BenchControl/DataEntry/Munich/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs rename to TBF/BenchControl/DataEntry/Munich/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormFactory.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormFactory.cs rename to TBF/BenchControl/DataEntry/Munich/EntryFormFactory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.pl.resx rename to TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/CycleBeginningForm.ru.resx rename to TBF/BenchControl/DataEntry/Munich3/CycleBeginningForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/Munich3/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/Munich3/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Munich3/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/Munich3/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs b/TBF/BenchControl/DataEntry/Munich3/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs rename to TBF/BenchControl/DataEntry/Munich3/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs rename to TBF/BenchControl/DataEntry/Munich3/EntryFormFactory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Munich3/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.pl.resx rename to TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/CycleBeginningForm.ru.resx rename to TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard12/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/Standard12/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Standard12/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/Standard12/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Standard12/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/Standard12/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs b/TBF/BenchControl/DataEntry/Standard12/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs rename to TBF/BenchControl/DataEntry/Standard12/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs rename to TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/Factory.cs b/TBF/BenchControl/DataEntry/Standard12/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/Factory.cs rename to TBF/BenchControl/DataEntry/Standard12/Factory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/FactoryNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard12/FactoryNoStartEnd.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/FactoryNoStartEnd.cs rename to TBF/BenchControl/DataEntry/Standard12/FactoryNoStartEnd.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard12/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.cs b/TBF/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.cs rename to TBF/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.designer.cs b/TBF/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.designer.cs rename to TBF/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.resx b/TBF/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.resx rename to TBF/BenchControl/DataEntry/Standard24/AdvancedFixedStartTestForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.pl.resx rename to TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.ru.resx rename to TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard24/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/Standard24/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Standard24/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/Standard24/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Standard24/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/Standard24/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs b/TBF/BenchControl/DataEntry/Standard24/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs rename to TBF/BenchControl/DataEntry/Standard24/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard24/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/Standard24/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs rename to TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/Factory.cs b/TBF/BenchControl/DataEntry/Standard24/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/Factory.cs rename to TBF/BenchControl/DataEntry/Standard24/Factory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/FactoryNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard24/FactoryNoStartEnd.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/FactoryNoStartEnd.cs rename to TBF/BenchControl/DataEntry/Standard24/FactoryNoStartEnd.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.pl.resx rename to TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/CycleBeginningForm.ru.resx rename to TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard48/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/Standard48/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Standard48/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/Standard48/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Standard48/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/Standard48/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryForm.cs b/TBF/BenchControl/DataEntry/Standard48/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/EntryForm.cs rename to TBF/BenchControl/DataEntry/Standard48/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard48/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/Standard48/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs rename to TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/Factory.cs b/TBF/BenchControl/DataEntry/Standard48/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/Factory.cs rename to TBF/BenchControl/DataEntry/Standard48/Factory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/FactoryNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard48/FactoryNoStartEnd.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/FactoryNoStartEnd.cs rename to TBF/BenchControl/DataEntry/Standard48/FactoryNoStartEnd.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard48/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard48/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.pl.resx rename to TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.ru.resx rename to TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.resx b/TBF/BenchControl/DataEntry/Standard6/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/Standard6/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryForm.cs b/TBF/BenchControl/DataEntry/Standard6/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/EntryForm.cs rename to TBF/BenchControl/DataEntry/Standard6/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard6/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/Standard6/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs rename to TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/Factory.cs b/TBF/BenchControl/DataEntry/Standard6/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/Factory.cs rename to TBF/BenchControl/DataEntry/Standard6/Factory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/FactoryNoStartEnd.cs b/TBF/BenchControl/DataEntry/Standard6/FactoryNoStartEnd.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/FactoryNoStartEnd.cs rename to TBF/BenchControl/DataEntry/Standard6/FactoryNoStartEnd.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/StandardCamera/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/StandardCamera/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndForm.resx b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/StandardCamera/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.cs rename to TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs rename to TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.resx b/TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.resx rename to TBF/BenchControl/DataEntry/StandardCamera/CycleEndFormMunich.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryForm.cs rename to TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/Factory.cs b/TBF/BenchControl/DataEntry/StandardCamera/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/Factory.cs rename to TBF/BenchControl/DataEntry/StandardCamera/Factory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/StandardCamera/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryForm.cs b/TBF/BenchControl/DataEntry/WMStates/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/EntryForm.cs rename to TBF/BenchControl/DataEntry/WMStates/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/WMStates/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/WMStates/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormFactory.cs b/TBF/BenchControl/DataEntry/WMStates/EntryFormFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormFactory.cs rename to TBF/BenchControl/DataEntry/WMStates/EntryFormFactory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.cs b/TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.cs rename to TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs b/TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs rename to TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.pl.resx b/TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.pl.resx rename to TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx b/TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx rename to TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.ru.resx b/TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.ru.resx rename to TBF/BenchControl/DataEntry/WMStates/WMSNsAndStatesForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMStatesForm.cs b/TBF/BenchControl/DataEntry/WMStates/WMStatesForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/WMStatesForm.cs rename to TBF/BenchControl/DataEntry/WMStates/WMStatesForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMStatesForm.designer.cs b/TBF/BenchControl/DataEntry/WMStates/WMStatesForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/WMStatesForm.designer.cs rename to TBF/BenchControl/DataEntry/WMStates/WMStatesForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/WMStatesForm.resx b/TBF/BenchControl/DataEntry/WMStates/WMStatesForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/WMStates/WMStatesForm.resx rename to TBF/BenchControl/DataEntry/WMStates/WMStatesForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.Designer.cs b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.Designer.cs rename to TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs rename to TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.pl.resx b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.pl.resx rename to TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.pl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.resx b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.resx rename to TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.ru.resx b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.ru.resx rename to TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.ru.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleEndForm.Designer.cs b/TBF/BenchControl/DataEntry/iPerl/CycleEndForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/CycleEndForm.Designer.cs rename to TBF/BenchControl/DataEntry/iPerl/CycleEndForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleEndForm.cs b/TBF/BenchControl/DataEntry/iPerl/CycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/CycleEndForm.cs rename to TBF/BenchControl/DataEntry/iPerl/CycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleEndForm.resx b/TBF/BenchControl/DataEntry/iPerl/CycleEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/CycleEndForm.resx rename to TBF/BenchControl/DataEntry/iPerl/CycleEndForm.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs b/TBF/BenchControl/DataEntry/iPerl/EntryForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs rename to TBF/BenchControl/DataEntry/iPerl/EntryForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/iPerl/EntryFormCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfg.cs rename to TBF/BenchControl/DataEntry/iPerl/EntryFormCfg.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs rename to TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.designer.cs b/TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.designer.cs rename to TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.resx b/TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.resx rename to TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormFactory.cs b/TBF/BenchControl/DataEntry/iPerl/EntryFormFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormFactory.cs rename to TBF/BenchControl/DataEntry/iPerl/EntryFormFactory.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/TestStartEndForm.cs b/TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/TestStartEndForm.cs rename to TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/TestStartEndForm.designer.cs b/TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/TestStartEndForm.designer.cs rename to TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.designer.cs diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/TestStartEndForm.resx b/TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/DataEntry/iPerl/TestStartEndForm.resx rename to TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.resx diff --git a/TestBenchFramework/BenchControl/Dummy/Balance/Component.cs b/TBF/BenchControl/Dummy/Balance/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/Balance/Component.cs rename to TBF/BenchControl/Dummy/Balance/Component.cs diff --git a/TestBenchFramework/BenchControl/Dummy/Balance/Factory.cs b/TBF/BenchControl/Dummy/Balance/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/Balance/Factory.cs rename to TBF/BenchControl/Dummy/Balance/Factory.cs diff --git a/TestBenchFramework/BenchControl/Dummy/Diverter/Component.cs b/TBF/BenchControl/Dummy/Diverter/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/Diverter/Component.cs rename to TBF/BenchControl/Dummy/Diverter/Component.cs diff --git a/TestBenchFramework/BenchControl/Dummy/Diverter/Factory.cs b/TBF/BenchControl/Dummy/Diverter/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/Diverter/Factory.cs rename to TBF/BenchControl/Dummy/Diverter/Factory.cs diff --git a/TestBenchFramework/BenchControl/Dummy/FlowMeter/Factory.cs b/TBF/BenchControl/Dummy/FlowMeter/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/FlowMeter/Factory.cs rename to TBF/BenchControl/Dummy/FlowMeter/Factory.cs diff --git a/TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeter.cs b/TBF/BenchControl/Dummy/FlowMeter/FlowMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeter.cs rename to TBF/BenchControl/Dummy/FlowMeter/FlowMeter.cs diff --git a/TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs rename to TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs rename to TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.resx b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.resx rename to TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Dummy/FlowMeter/ReadFlowOp.cs b/TBF/BenchControl/Dummy/FlowMeter/ReadFlowOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/FlowMeter/ReadFlowOp.cs rename to TBF/BenchControl/Dummy/FlowMeter/ReadFlowOp.cs diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/ChangeValvePositionOp.cs b/TBF/BenchControl/Dummy/RegulValve/ChangeValvePositionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/ChangeValvePositionOp.cs rename to TBF/BenchControl/Dummy/RegulValve/ChangeValvePositionOp.cs diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/Factory.cs b/TBF/BenchControl/Dummy/RegulValve/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/Factory.cs rename to TBF/BenchControl/Dummy/RegulValve/Factory.cs diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValve.cs b/TBF/BenchControl/Dummy/RegulValve/RegulValve.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValve.cs rename to TBF/BenchControl/Dummy/RegulValve/RegulValve.cs diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValveCfg.cs b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValveCfg.cs rename to TBF/BenchControl/Dummy/RegulValve/RegulValveCfg.cs diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.Designer.cs b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.Designer.cs rename to TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs rename to TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.resx b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.resx rename to TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/SetFlowOp.cs b/TBF/BenchControl/Dummy/RegulValve/SetFlowOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/SetFlowOp.cs rename to TBF/BenchControl/Dummy/RegulValve/SetFlowOp.cs diff --git a/TestBenchFramework/BenchControl/Dummy/RegulValve/SetRegulValvePositionOp.cs b/TBF/BenchControl/Dummy/RegulValve/SetRegulValvePositionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/RegulValve/SetRegulValvePositionOp.cs rename to TBF/BenchControl/Dummy/RegulValve/SetRegulValvePositionOp.cs diff --git a/TestBenchFramework/BenchControl/Dummy/Valve/Component.cs b/TBF/BenchControl/Dummy/Valve/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/Valve/Component.cs rename to TBF/BenchControl/Dummy/Valve/Component.cs diff --git a/TestBenchFramework/BenchControl/Dummy/Valve/Factory.cs b/TBF/BenchControl/Dummy/Valve/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Dummy/Valve/Factory.cs rename to TBF/BenchControl/Dummy/Valve/Factory.cs diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TBF/BenchControl/Elde/Common.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Common.cs rename to TBF/BenchControl/Elde/Common.cs diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardCfg.cs b/TBF/BenchControl/Elde/ControlBoardCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ControlBoardCfg.cs rename to TBF/BenchControl/Elde/ControlBoardCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/ControlBoardCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ControlBoardCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/ControlBoardCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardCfgCtrl.cs b/TBF/BenchControl/Elde/ControlBoardCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ControlBoardCfgCtrl.cs rename to TBF/BenchControl/Elde/ControlBoardCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardCfgCtrl.resx b/TBF/BenchControl/Elde/ControlBoardCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ControlBoardCfgCtrl.resx rename to TBF/BenchControl/Elde/ControlBoardCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs rename to TBF/BenchControl/Elde/ControlBoardDev.cs diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardFactory.cs b/TBF/BenchControl/Elde/ControlBoardFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ControlBoardFactory.cs rename to TBF/BenchControl/Elde/ControlBoardFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/ControlComSim.cs b/TBF/BenchControl/Elde/ControlComSim.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ControlComSim.cs rename to TBF/BenchControl/Elde/ControlComSim.cs diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ControlComWrap.cs rename to TBF/BenchControl/Elde/ControlComWrap.cs diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/CoverTest.cs b/TBF/BenchControl/Elde/CoverTest/CoverTest.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/CoverTest.cs rename to TBF/BenchControl/Elde/CoverTest/CoverTest.cs diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestCfg.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestCfg.cs rename to TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs rename to TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.designer.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.designer.cs rename to TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.resx b/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.resx rename to TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestForm.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestForm.cs rename to TBF/BenchControl/Elde/CoverTest/CoverTestForm.cs diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestForm.designer.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestForm.designer.cs rename to TBF/BenchControl/Elde/CoverTest/CoverTestForm.designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestForm.resx b/TBF/BenchControl/Elde/CoverTest/CoverTestForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/CoverTestForm.resx rename to TBF/BenchControl/Elde/CoverTest/CoverTestForm.resx diff --git a/TestBenchFramework/BenchControl/Elde/CoverTest/Factory.cs b/TBF/BenchControl/Elde/CoverTest/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/CoverTest/Factory.cs rename to TBF/BenchControl/Elde/CoverTest/Factory.cs diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs rename to TBF/BenchControl/Elde/Diverter/Diverter.cs diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfg.cs b/TBF/BenchControl/Elde/Diverter/DiverterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfg.cs rename to TBF/BenchControl/Elde/Diverter/DiverterCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs b/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs rename to TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.resx b/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Diverter/DiverterCfgCtrl.resx rename to TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterFactory.cs b/TBF/BenchControl/Elde/Diverter/DiverterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Diverter/DiverterFactory.cs rename to TBF/BenchControl/Elde/Diverter/DiverterFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/Handlers.cs b/TBF/BenchControl/Elde/Diverter/Handlers.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Diverter/Handlers.cs rename to TBF/BenchControl/Elde/Diverter/Handlers.cs diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/SwitchDiverterOp.cs b/TBF/BenchControl/Elde/Diverter/SwitchDiverterOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Diverter/SwitchDiverterOp.cs rename to TBF/BenchControl/Elde/Diverter/SwitchDiverterOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/ExecuteCommandOp.cs b/TBF/BenchControl/Elde/ExecuteCommandOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ExecuteCommandOp.cs rename to TBF/BenchControl/Elde/ExecuteCommandOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RRProcedureParams.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RRProcedureParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RRProcedureParams.cs rename to TBF/BenchControl/Elde/FixedStartRegisterReader/RRProcedureParams.cs diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs rename to TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfg.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfg.cs rename to TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs rename to TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.resx b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.resx rename to TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderFactory.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderFactory.cs rename to TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs rename to TBF/BenchControl/Elde/FlowMeter/FlowMeter.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs rename to TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs rename to TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.resx b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.resx rename to TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs rename to TBF/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeter.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeter.cs rename to TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeter.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs rename to TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs rename to TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.resx b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.resx rename to TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterFactory.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTriplet/FlowMeterFactory.cs rename to TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs rename to TBF/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs rename to TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs rename to TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.resx b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.resx rename to TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs rename to TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/IControlCom.cs b/TBF/BenchControl/Elde/IControlCom.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/IControlCom.cs rename to TBF/BenchControl/Elde/IControlCom.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs rename to TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs rename to TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs rename to TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.resx b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.resx rename to TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs rename to TBF/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/ReadPressureOp.cs b/TBF/BenchControl/Elde/PressureMeter/ReadPressureOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeter/ReadPressureOp.cs rename to TBF/BenchControl/Elde/PressureMeter/ReadPressureOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs rename to TBF/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs rename to TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs rename to TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.resx b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.resx rename to TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs rename to TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/ReadPressureOp.cs b/TBF/BenchControl/Elde/PressureMeterInternal/ReadPressureOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PressureMeterInternal/ReadPressureOp.cs rename to TBF/BenchControl/Elde/PressureMeterInternal/ReadPressureOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs b/TBF/BenchControl/Elde/Pump/Pump.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Pump/Pump.cs rename to TBF/BenchControl/Elde/Pump/Pump.cs diff --git a/TestBenchFramework/BenchControl/Elde/Pump/PumpCfg.cs b/TBF/BenchControl/Elde/Pump/PumpCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Pump/PumpCfg.cs rename to TBF/BenchControl/Elde/Pump/PumpCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/Pump/PumpCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Pump/PumpCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/Pump/PumpCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/Pump/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Pump/PumpCfgCtrl.cs rename to TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/Pump/PumpCfgCtrl.resx b/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Pump/PumpCfgCtrl.resx rename to TBF/BenchControl/Elde/Pump/PumpCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/Pump/PumpFactory.cs b/TBF/BenchControl/Elde/Pump/PumpFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Pump/PumpFactory.cs rename to TBF/BenchControl/Elde/Pump/PumpFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpTandem/Pump.cs b/TBF/BenchControl/Elde/PumpTandem/Pump.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpTandem/Pump.cs rename to TBF/BenchControl/Elde/PumpTandem/Pump.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpCfg.cs b/TBF/BenchControl/Elde/PumpTandem/PumpCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpTandem/PumpCfg.cs rename to TBF/BenchControl/Elde/PumpTandem/PumpCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpTandem/PumpCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs rename to TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpCfgCtrl.resx b/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpTandem/PumpCfgCtrl.resx rename to TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpFactory.cs b/TBF/BenchControl/Elde/PumpTandem/PumpFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpTandem/PumpFactory.cs rename to TBF/BenchControl/Elde/PumpTandem/PumpFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs b/TBF/BenchControl/Elde/PumpWithFM/Pump.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs rename to TBF/BenchControl/Elde/PumpWithFM/Pump.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpCfg.cs b/TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpCfg.cs rename to TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs rename to TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.resx b/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.resx rename to TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpFactory.cs b/TBF/BenchControl/Elde/PumpWithFM/PumpFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpFactory.cs rename to TBF/BenchControl/Elde/PumpWithFM/PumpFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/QueryMeasurementEndOp.cs b/TBF/BenchControl/Elde/QueryMeasurementEndOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/QueryMeasurementEndOp.cs rename to TBF/BenchControl/Elde/QueryMeasurementEndOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/ReadDiverterTransitionOp.cs b/TBF/BenchControl/Elde/ReadDiverterTransitionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ReadDiverterTransitionOp.cs rename to TBF/BenchControl/Elde/ReadDiverterTransitionOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/ReadFlowOp.cs b/TBF/BenchControl/Elde/ReadFlowOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ReadFlowOp.cs rename to TBF/BenchControl/Elde/ReadFlowOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/Factory.cs b/TBF/BenchControl/Elde/RegisterReader/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegisterReader/Factory.cs rename to TBF/BenchControl/Elde/RegisterReader/Factory.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/RRProcedureParams.cs b/TBF/BenchControl/Elde/RegisterReader/RRProcedureParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegisterReader/RRProcedureParams.cs rename to TBF/BenchControl/Elde/RegisterReader/RRProcedureParams.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReader.cs b/TBF/BenchControl/Elde/RegisterReader/RegisterReader.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReader.cs rename to TBF/BenchControl/Elde/RegisterReader/RegisterReader.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderCfg.cs b/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderCfg.cs rename to TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.cs rename to TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.resx b/TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.resx rename to TBF/BenchControl/Elde/RegisterReader/RegisterReaderCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/ChangeValvePositionOp.cs b/TBF/BenchControl/Elde/RegulValve/ChangeValvePositionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/ChangeValvePositionOp.cs rename to TBF/BenchControl/Elde/RegulValve/ChangeValvePositionOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/Handlers.cs b/TBF/BenchControl/Elde/RegulValve/Handlers.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/Handlers.cs rename to TBF/BenchControl/Elde/RegulValve/Handlers.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs b/TBF/BenchControl/Elde/RegulValve/RegulValve.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs rename to TBF/BenchControl/Elde/RegulValve/RegulValve.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfg.cs b/TBF/BenchControl/Elde/RegulValve/RegulValveCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfg.cs rename to TBF/BenchControl/Elde/RegulValve/RegulValveCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgChangeArgs.cs b/TBF/BenchControl/Elde/RegulValve/RegulValveCfgChangeArgs.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgChangeArgs.cs rename to TBF/BenchControl/Elde/RegulValve/RegulValveCfgChangeArgs.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs rename to TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.resx b/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.resx rename to TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveFactory.cs b/TBF/BenchControl/Elde/RegulValve/RegulValveFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveFactory.cs rename to TBF/BenchControl/Elde/RegulValve/RegulValveFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs b/TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs rename to TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/SetRegulValvePositionOp.cs b/TBF/BenchControl/Elde/RegulValve/SetRegulValvePositionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValve/SetRegulValvePositionOp.cs rename to TBF/BenchControl/Elde/RegulValve/SetRegulValvePositionOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/ChangeValvePositionOp.cs b/TBF/BenchControl/Elde/RegulValveCoax/ChangeValvePositionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/ChangeValvePositionOp.cs rename to TBF/BenchControl/Elde/RegulValveCoax/ChangeValvePositionOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/Factory.cs b/TBF/BenchControl/Elde/RegulValveCoax/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/Factory.cs rename to TBF/BenchControl/Elde/RegulValveCoax/Factory.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValve.cs b/TBF/BenchControl/Elde/RegulValveCoax/RegulValve.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValve.cs rename to TBF/BenchControl/Elde/RegulValveCoax/RegulValve.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs rename to TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs rename to TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.resx b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.resx rename to TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs b/TBF/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs rename to TBF/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveCoax/SetRegulValvePositionOp.cs b/TBF/BenchControl/Elde/RegulValveCoax/SetRegulValvePositionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveCoax/SetRegulValvePositionOp.cs rename to TBF/BenchControl/Elde/RegulValveCoax/SetRegulValvePositionOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/ChangeValvePositionOp.cs b/TBF/BenchControl/Elde/RegulValveTandem/ChangeValvePositionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/ChangeValvePositionOp.cs rename to TBF/BenchControl/Elde/RegulValveTandem/ChangeValvePositionOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs rename to TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs rename to TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs rename to TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.designer.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.designer.cs rename to TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.resx b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.resx rename to TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs rename to TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs b/TBF/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs rename to TBF/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/SetRegulValvePositionOp.cs b/TBF/BenchControl/Elde/RegulValveTandem/SetRegulValvePositionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/RegulValveTandem/SetRegulValvePositionOp.cs rename to TBF/BenchControl/Elde/RegulValveTandem/SetRegulValvePositionOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/SetValvesOp.cs b/TBF/BenchControl/Elde/SetValvesOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/SetValvesOp.cs rename to TBF/BenchControl/Elde/SetValvesOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs b/TBF/BenchControl/Elde/StartMeasurementOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs rename to TBF/BenchControl/Elde/StartMeasurementOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/StopPreviousOp.cs b/TBF/BenchControl/Elde/StopPreviousOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/StopPreviousOp.cs rename to TBF/BenchControl/Elde/StopPreviousOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/ReadTempOp.cs b/TBF/BenchControl/Elde/TempMeter/ReadTempOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeter/ReadTempOp.cs rename to TBF/BenchControl/Elde/TempMeter/ReadTempOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeter.cs b/TBF/BenchControl/Elde/TempMeter/TempMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeter/TempMeter.cs rename to TBF/BenchControl/Elde/TempMeter/TempMeter.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterCfg.cs b/TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterCfg.cs rename to TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs b/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs rename to TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.resx b/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.resx rename to TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterFactory.cs b/TBF/BenchControl/Elde/TempMeter/TempMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterFactory.cs rename to TBF/BenchControl/Elde/TempMeter/TempMeterFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/ReadTempOp.cs b/TBF/BenchControl/Elde/TempMeterInternal/ReadTempOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeterInternal/ReadTempOp.cs rename to TBF/BenchControl/Elde/TempMeterInternal/ReadTempOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeter.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeter.cs rename to TBF/BenchControl/Elde/TempMeterInternal/TempMeter.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs rename to TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs rename to TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.resx b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.resx rename to TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs rename to TBF/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/UpdateTankWeightOp.cs b/TBF/BenchControl/Elde/UpdateTankWeightOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/UpdateTankWeightOp.cs rename to TBF/BenchControl/Elde/UpdateTankWeightOp.cs diff --git a/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs b/TBF/BenchControl/Elde/Valve/Valve.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Valve/Valve.cs rename to TBF/BenchControl/Elde/Valve/Valve.cs diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfg.cs b/TBF/BenchControl/Elde/Valve/ValveCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Valve/ValveCfg.cs rename to TBF/BenchControl/Elde/Valve/ValveCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/Valve/ValveCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.cs b/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.cs rename to TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.resx b/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Valve/ValveCfgCtrl.resx rename to TBF/BenchControl/Elde/Valve/ValveCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs b/TBF/BenchControl/Elde/Valve/ValveFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs rename to TBF/BenchControl/Elde/Valve/ValveFactory.cs diff --git a/TestBenchFramework/BenchControl/Elde/ValveEx/Valve.cs b/TBF/BenchControl/Elde/ValveEx/Valve.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ValveEx/Valve.cs rename to TBF/BenchControl/Elde/ValveEx/Valve.cs diff --git a/TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfg.cs b/TBF/BenchControl/Elde/ValveEx/ValveCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfg.cs rename to TBF/BenchControl/Elde/ValveEx/ValveCfg.cs diff --git a/TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.Designer.cs b/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.Designer.cs rename to TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs b/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs rename to TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.resx b/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.resx rename to TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Elde/ValveEx/ValveFactory.cs b/TBF/BenchControl/Elde/ValveEx/ValveFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Elde/ValveEx/ValveFactory.cs rename to TBF/BenchControl/Elde/ValveEx/ValveFactory.cs diff --git a/TestBenchFramework/BenchControl/Events.cs b/TBF/BenchControl/Events.cs similarity index 100% rename from TestBenchFramework/BenchControl/Events.cs rename to TBF/BenchControl/Events.cs diff --git a/TestBenchFramework/BenchControl/FeedingPath.cs b/TBF/BenchControl/FeedingPath.cs similarity index 100% rename from TestBenchFramework/BenchControl/FeedingPath.cs rename to TBF/BenchControl/FeedingPath.cs diff --git a/TestBenchFramework/BenchControl/Formulas.cs b/TBF/BenchControl/Formulas.cs similarity index 100% rename from TestBenchFramework/BenchControl/Formulas.cs rename to TBF/BenchControl/Formulas.cs diff --git a/TestBenchFramework/BenchControl/Generic/IChildComponentCfg.cs b/TBF/BenchControl/Generic/IChildComponentCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/IChildComponentCfg.cs rename to TBF/BenchControl/Generic/IChildComponentCfg.cs diff --git a/TestBenchFramework/BenchControl/Generic/IComponent.cs b/TBF/BenchControl/Generic/IComponent.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/IComponent.cs rename to TBF/BenchControl/Generic/IComponent.cs diff --git a/TestBenchFramework/BenchControl/Generic/IComponentCfg.cs b/TBF/BenchControl/Generic/IComponentCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/IComponentCfg.cs rename to TBF/BenchControl/Generic/IComponentCfg.cs diff --git a/TestBenchFramework/BenchControl/Generic/IComponentCfgCtrl.cs b/TBF/BenchControl/Generic/IComponentCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/IComponentCfgCtrl.cs rename to TBF/BenchControl/Generic/IComponentCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Generic/IComponentFactory.cs b/TBF/BenchControl/Generic/IComponentFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/IComponentFactory.cs rename to TBF/BenchControl/Generic/IComponentFactory.cs diff --git a/TestBenchFramework/BenchControl/Generic/IDevice.cs b/TBF/BenchControl/Generic/IDevice.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/IDevice.cs rename to TBF/BenchControl/Generic/IDevice.cs diff --git a/TestBenchFramework/BenchControl/Generic/IParamsProvider.cs b/TBF/BenchControl/Generic/IParamsProvider.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/IParamsProvider.cs rename to TBF/BenchControl/Generic/IParamsProvider.cs diff --git a/TestBenchFramework/BenchControl/Generic/IProcedureParams.cs b/TBF/BenchControl/Generic/IProcedureParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/IProcedureParams.cs rename to TBF/BenchControl/Generic/IProcedureParams.cs diff --git a/TestBenchFramework/BenchControl/Generic/ITestParams.cs b/TBF/BenchControl/Generic/ITestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/Generic/ITestParams.cs rename to TBF/BenchControl/Generic/ITestParams.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IAmbient.cs b/TBF/BenchControl/GenericDevices/IAmbient.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IAmbient.cs rename to TBF/BenchControl/GenericDevices/IAmbient.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IBenchInfo.cs b/TBF/BenchControl/GenericDevices/IBenchInfo.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IBenchInfo.cs rename to TBF/BenchControl/GenericDevices/IBenchInfo.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ICalibInfoCfg.cs b/TBF/BenchControl/GenericDevices/ICalibInfoCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ICalibInfoCfg.cs rename to TBF/BenchControl/GenericDevices/ICalibInfoCfg.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ICamera.cs b/TBF/BenchControl/GenericDevices/ICamera.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ICamera.cs rename to TBF/BenchControl/GenericDevices/ICamera.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ICameraDisplay.cs b/TBF/BenchControl/GenericDevices/ICameraDisplay.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ICameraDisplay.cs rename to TBF/BenchControl/GenericDevices/ICameraDisplay.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IDataEntry.cs b/TBF/BenchControl/GenericDevices/IDataEntry.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IDataEntry.cs rename to TBF/BenchControl/GenericDevices/IDataEntry.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IDataEntryForCamera.cs b/TBF/BenchControl/GenericDevices/IDataEntryForCamera.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IDataEntryForCamera.cs rename to TBF/BenchControl/GenericDevices/IDataEntryForCamera.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IDiverter.cs b/TBF/BenchControl/GenericDevices/IDiverter.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IDiverter.cs rename to TBF/BenchControl/GenericDevices/IDiverter.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IErrorFlags.cs b/TBF/BenchControl/GenericDevices/IErrorFlags.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IErrorFlags.cs rename to TBF/BenchControl/GenericDevices/IErrorFlags.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IFlowMeter.cs b/TBF/BenchControl/GenericDevices/IFlowMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IFlowMeter.cs rename to TBF/BenchControl/GenericDevices/IFlowMeter.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IHasCompleted.cs b/TBF/BenchControl/GenericDevices/IHasCompleted.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IHasCompleted.cs rename to TBF/BenchControl/GenericDevices/IHasCompleted.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IHasCycleBeginForm.cs b/TBF/BenchControl/GenericDevices/IHasCycleBeginForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IHasCycleBeginForm.cs rename to TBF/BenchControl/GenericDevices/IHasCycleBeginForm.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IHasCycleEndForm.cs b/TBF/BenchControl/GenericDevices/IHasCycleEndForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IHasCycleEndForm.cs rename to TBF/BenchControl/GenericDevices/IHasCycleEndForm.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs b/TBF/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs rename to TBF/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IHasWMStatesForm.cs b/TBF/BenchControl/GenericDevices/IHasWMStatesForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IHasWMStatesForm.cs rename to TBF/BenchControl/GenericDevices/IHasWMStatesForm.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IModbus.cs b/TBF/BenchControl/GenericDevices/IModbus.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IModbus.cs rename to TBF/BenchControl/GenericDevices/IModbus.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/INetworkAdapter.cs b/TBF/BenchControl/GenericDevices/INetworkAdapter.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/INetworkAdapter.cs rename to TBF/BenchControl/GenericDevices/INetworkAdapter.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IPressureMeter.cs b/TBF/BenchControl/GenericDevices/IPressureMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IPressureMeter.cs rename to TBF/BenchControl/GenericDevices/IPressureMeter.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IPump.cs b/TBF/BenchControl/GenericDevices/IPump.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IPump.cs rename to TBF/BenchControl/GenericDevices/IPump.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IPumpFM.cs b/TBF/BenchControl/GenericDevices/IPumpFM.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IPumpFM.cs rename to TBF/BenchControl/GenericDevices/IPumpFM.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IRegisterReader.cs b/TBF/BenchControl/GenericDevices/IRegisterReader.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IRegisterReader.cs rename to TBF/BenchControl/GenericDevices/IRegisterReader.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IRegulValve.cs b/TBF/BenchControl/GenericDevices/IRegulValve.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IRegulValve.cs rename to TBF/BenchControl/GenericDevices/IRegulValve.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IResultsPrinter.cs b/TBF/BenchControl/GenericDevices/IResultsPrinter.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IResultsPrinter.cs rename to TBF/BenchControl/GenericDevices/IResultsPrinter.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IResultsWriter.cs b/TBF/BenchControl/GenericDevices/IResultsWriter.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IResultsWriter.cs rename to TBF/BenchControl/GenericDevices/IResultsWriter.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IRoi.cs b/TBF/BenchControl/GenericDevices/IRoi.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IRoi.cs rename to TBF/BenchControl/GenericDevices/IRoi.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IRoiForFixedStart.cs b/TBF/BenchControl/GenericDevices/IRoiForFixedStart.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IRoiForFixedStart.cs rename to TBF/BenchControl/GenericDevices/IRoiForFixedStart.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IScale.cs b/TBF/BenchControl/GenericDevices/IScale.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IScale.cs rename to TBF/BenchControl/GenericDevices/IScale.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IScaleCfg.cs b/TBF/BenchControl/GenericDevices/IScaleCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IScaleCfg.cs rename to TBF/BenchControl/GenericDevices/IScaleCfg.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ISequenceCondition.cs b/TBF/BenchControl/GenericDevices/ISequenceCondition.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ISequenceCondition.cs rename to TBF/BenchControl/GenericDevices/ISequenceCondition.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ISimultTestMethod.cs b/TBF/BenchControl/GenericDevices/ISimultTestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ISimultTestMethod.cs rename to TBF/BenchControl/GenericDevices/ISimultTestMethod.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ITankDraining.cs b/TBF/BenchControl/GenericDevices/ITankDraining.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ITankDraining.cs rename to TBF/BenchControl/GenericDevices/ITankDraining.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ITankDrainingCfg.cs b/TBF/BenchControl/GenericDevices/ITankDrainingCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ITankDrainingCfg.cs rename to TBF/BenchControl/GenericDevices/ITankDrainingCfg.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ITempMeter.cs b/TBF/BenchControl/GenericDevices/ITempMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ITempMeter.cs rename to TBF/BenchControl/GenericDevices/ITempMeter.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ITestMethod.cs b/TBF/BenchControl/GenericDevices/ITestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ITestMethod.cs rename to TBF/BenchControl/GenericDevices/ITestMethod.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ITestMethodWith2ndPass.cs b/TBF/BenchControl/GenericDevices/ITestMethodWith2ndPass.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ITestMethodWith2ndPass.cs rename to TBF/BenchControl/GenericDevices/ITestMethodWith2ndPass.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IValve.cs b/TBF/BenchControl/GenericDevices/IValve.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IValve.cs rename to TBF/BenchControl/GenericDevices/IValve.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IValveControl.cs b/TBF/BenchControl/GenericDevices/IValveControl.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IValveControl.cs rename to TBF/BenchControl/GenericDevices/IValveControl.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/IWaterMeter.cs b/TBF/BenchControl/GenericDevices/IWaterMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/IWaterMeter.cs rename to TBF/BenchControl/GenericDevices/IWaterMeter.cs diff --git a/TestBenchFramework/BenchControl/GenericDevices/ValveBase.cs b/TBF/BenchControl/GenericDevices/ValveBase.cs similarity index 100% rename from TestBenchFramework/BenchControl/GenericDevices/ValveBase.cs rename to TBF/BenchControl/GenericDevices/ValveBase.cs diff --git a/TestBenchFramework/BenchControl/HeatMetersPath.cs b/TBF/BenchControl/HeatMetersPath.cs similarity index 100% rename from TestBenchFramework/BenchControl/HeatMetersPath.cs rename to TBF/BenchControl/HeatMetersPath.cs diff --git a/TestBenchFramework/BenchControl/IOperation.cs b/TBF/BenchControl/IOperation.cs similarity index 100% rename from TestBenchFramework/BenchControl/IOperation.cs rename to TBF/BenchControl/IOperation.cs diff --git a/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/Factory.cs b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/Factory.cs rename to TBF/BenchControl/Keithley/Multimeter_2010_RS232/Factory.cs diff --git a/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs rename to TBF/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs diff --git a/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs rename to TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs rename to TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.designer.cs b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.designer.cs rename to TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.resx b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.resx rename to TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Keithley/TempMeter/Factory.cs b/TBF/BenchControl/Keithley/TempMeter/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/TempMeter/Factory.cs rename to TBF/BenchControl/Keithley/TempMeter/Factory.cs diff --git a/TestBenchFramework/BenchControl/Keithley/TempMeter/ReadTempOp.cs b/TBF/BenchControl/Keithley/TempMeter/ReadTempOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/TempMeter/ReadTempOp.cs rename to TBF/BenchControl/Keithley/TempMeter/ReadTempOp.cs diff --git a/TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeter.cs b/TBF/BenchControl/Keithley/TempMeter/TempMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeter.cs rename to TBF/BenchControl/Keithley/TempMeter/TempMeter.cs diff --git a/TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeterCfg.cs b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeterCfg.cs rename to TBF/BenchControl/Keithley/TempMeter/TempMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.Designer.cs b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.Designer.cs rename to TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs rename to TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.resx b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.resx rename to TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/MetersPath.cs b/TBF/BenchControl/MetersPath.cs similarity index 100% rename from TestBenchFramework/BenchControl/MetersPath.cs rename to TBF/BenchControl/MetersPath.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/KeepReadingMassesOp.cs b/TBF/BenchControl/MettlerToledo/KeepReadingMassesOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/KeepReadingMassesOp.cs rename to TBF/BenchControl/MettlerToledo/KeepReadingMassesOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfg.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfg.cs rename to TBF/BenchControl/MettlerToledo/Multi/BalanceCfg.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.Designer.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.Designer.cs rename to TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs rename to TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.resx b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.resx rename to TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceDev.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs rename to TBF/BenchControl/MettlerToledo/Multi/BalanceDev.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceFactory.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceFactory.cs rename to TBF/BenchControl/MettlerToledo/Multi/BalanceFactory.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/ReadMassOp.cs b/TBF/BenchControl/MettlerToledo/Multi/ReadMassOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/ReadMassOp.cs rename to TBF/BenchControl/MettlerToledo/Multi/ReadMassOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs b/TBF/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs rename to TBF/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/TaringOp.cs b/TBF/BenchControl/MettlerToledo/Multi/TaringOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Multi/TaringOp.cs rename to TBF/BenchControl/MettlerToledo/Multi/TaringOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/ReadMassesOp.cs b/TBF/BenchControl/MettlerToledo/ReadMassesOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/ReadMassesOp.cs rename to TBF/BenchControl/MettlerToledo/ReadMassesOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfg.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfg.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceCfg.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.Designer.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.Designer.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.resx b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.resx rename to TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceFactory.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceOld.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceOld.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceOld.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceOld.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceOldFactory.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceOldFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceOldFactory.cs rename to TBF/BenchControl/MettlerToledo/Standard/BalanceOldFactory.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/GetSerNumOp.cs b/TBF/BenchControl/MettlerToledo/Standard/GetSerNumOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/GetSerNumOp.cs rename to TBF/BenchControl/MettlerToledo/Standard/GetSerNumOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassOp.cs b/TBF/BenchControl/MettlerToledo/Standard/ReadMassOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassOp.cs rename to TBF/BenchControl/MettlerToledo/Standard/ReadMassOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs b/TBF/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs rename to TBF/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/SetUnitsOp.cs b/TBF/BenchControl/MettlerToledo/Standard/SetUnitsOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/SetUnitsOp.cs rename to TBF/BenchControl/MettlerToledo/Standard/SetUnitsOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/TaringOp.cs b/TBF/BenchControl/MettlerToledo/Standard/TaringOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/Standard/TaringOp.cs rename to TBF/BenchControl/MettlerToledo/Standard/TaringOp.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/TankDraining.cs b/TBF/BenchControl/MettlerToledo/TankDraining.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/TankDraining.cs rename to TBF/BenchControl/MettlerToledo/TankDraining.cs diff --git a/TestBenchFramework/BenchControl/MettlerToledo/WaitTankEmptyOp.cs b/TBF/BenchControl/MettlerToledo/WaitTankEmptyOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/MettlerToledo/WaitTankEmptyOp.cs rename to TBF/BenchControl/MettlerToledo/WaitTankEmptyOp.cs diff --git a/TestBenchFramework/BenchControl/Modbus/CometAmbient/Ambient.cs b/TBF/BenchControl/Modbus/CometAmbient/Ambient.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/CometAmbient/Ambient.cs rename to TBF/BenchControl/Modbus/CometAmbient/Ambient.cs diff --git a/TestBenchFramework/BenchControl/Modbus/CometAmbient/AmbientCfg.cs b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/CometAmbient/AmbientCfg.cs rename to TBF/BenchControl/Modbus/CometAmbient/AmbientCfg.cs diff --git a/TestBenchFramework/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.Designer.cs b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.Designer.cs rename to TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs rename to TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.resx b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.resx rename to TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Modbus/CometAmbient/Factory.cs b/TBF/BenchControl/Modbus/CometAmbient/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/CometAmbient/Factory.cs rename to TBF/BenchControl/Modbus/CometAmbient/Factory.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Common/Factory.cs b/TBF/BenchControl/Modbus/Common/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Common/Factory.cs rename to TBF/BenchControl/Modbus/Common/Factory.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Common/Modbus.cs b/TBF/BenchControl/Modbus/Common/Modbus.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Common/Modbus.cs rename to TBF/BenchControl/Modbus/Common/Modbus.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Common/ModbusCfg.cs b/TBF/BenchControl/Modbus/Common/ModbusCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Common/ModbusCfg.cs rename to TBF/BenchControl/Modbus/Common/ModbusCfg.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Common/ModbusCfgCtrl.cs b/TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Common/ModbusCfgCtrl.cs rename to TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Common/ModbusCfgCtrl.designer.cs b/TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Common/ModbusCfgCtrl.designer.cs rename to TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Common/ModbusCfgCtrl.resx b/TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Common/ModbusCfgCtrl.resx rename to TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/Easytherm.cs b/TBF/BenchControl/Modbus/Easytherm/Easytherm.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/Easytherm.cs rename to TBF/BenchControl/Modbus/Easytherm/Easytherm.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/EasythermCfg.cs b/TBF/BenchControl/Modbus/Easytherm/EasythermCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/EasythermCfg.cs rename to TBF/BenchControl/Modbus/Easytherm/EasythermCfg.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs b/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs rename to TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.designer.cs b/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.designer.cs rename to TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.resx b/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.resx rename to TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/Factory.cs b/TBF/BenchControl/Modbus/Easytherm/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/Factory.cs rename to TBF/BenchControl/Modbus/Easytherm/Factory.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/ProcParams.cs b/TBF/BenchControl/Modbus/Easytherm/ProcParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/ProcParams.cs rename to TBF/BenchControl/Modbus/Easytherm/ProcParams.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/ReadTempOp.cs b/TBF/BenchControl/Modbus/Easytherm/ReadTempOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/ReadTempOp.cs rename to TBF/BenchControl/Modbus/Easytherm/ReadTempOp.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/SetRequiredTemperatureOp.cs b/TBF/BenchControl/Modbus/Easytherm/SetRequiredTemperatureOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/SetRequiredTemperatureOp.cs rename to TBF/BenchControl/Modbus/Easytherm/SetRequiredTemperatureOp.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Easytherm/SetTemperatureOp.cs b/TBF/BenchControl/Modbus/Easytherm/SetTemperatureOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Easytherm/SetTemperatureOp.cs rename to TBF/BenchControl/Modbus/Easytherm/SetTemperatureOp.cs diff --git a/TestBenchFramework/BenchControl/Modbus/Enums.cs b/TBF/BenchControl/Modbus/Enums.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/Enums.cs rename to TBF/BenchControl/Modbus/Enums.cs diff --git a/TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/Factory.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/Factory.cs rename to TBF/BenchControl/Modbus/PressureMeter/Meret/Factory.cs diff --git a/TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs rename to TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs diff --git a/TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs rename to TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs rename to TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.designer.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.designer.cs rename to TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.resx b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.resx rename to TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/ReadPressureOp.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/ReadPressureOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/PressureMeter/Meret/ReadPressureOp.cs rename to TBF/BenchControl/Modbus/PressureMeter/Meret/ReadPressureOp.cs diff --git a/TestBenchFramework/BenchControl/Modbus/QuidoRS/Factory.cs b/TBF/BenchControl/Modbus/QuidoRS/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/QuidoRS/Factory.cs rename to TBF/BenchControl/Modbus/QuidoRS/Factory.cs diff --git a/TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRS.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRS.cs rename to TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs diff --git a/TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs rename to TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs diff --git a/TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs rename to TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.designer.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.designer.cs rename to TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.resx b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.resx rename to TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Modbus/QuidoRS/SetOutputsOp.cs b/TBF/BenchControl/Modbus/QuidoRS/SetOutputsOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/QuidoRS/SetOutputsOp.cs rename to TBF/BenchControl/Modbus/QuidoRS/SetOutputsOp.cs diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/Factory.cs b/TBF/BenchControl/Modbus/TankSelector/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/Factory.cs rename to TBF/BenchControl/Modbus/TankSelector/Factory.cs diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/SelectTankOp.cs b/TBF/BenchControl/Modbus/TankSelector/SelectTankOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/SelectTankOp.cs rename to TBF/BenchControl/Modbus/TankSelector/SelectTankOp.cs diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/SetQuidoBitOp.cs b/TBF/BenchControl/Modbus/TankSelector/SetQuidoBitOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/SetQuidoBitOp.cs rename to TBF/BenchControl/Modbus/TankSelector/SetQuidoBitOp.cs diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelector.cs b/TBF/BenchControl/Modbus/TankSelector/TankSelector.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelector.cs rename to TBF/BenchControl/Modbus/TankSelector/TankSelector.cs diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs rename to TBF/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs rename to TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.designer.cs b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.designer.cs rename to TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.resx b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.resx rename to TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Modbus/TankSelector/UnselectTankOp.cs b/TBF/BenchControl/Modbus/TankSelector/UnselectTankOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Modbus/TankSelector/UnselectTankOp.cs rename to TBF/BenchControl/Modbus/TankSelector/UnselectTankOp.cs diff --git a/TestBenchFramework/BenchControl/Network/Adapter/AdapterInfo.cs b/TBF/BenchControl/Network/Adapter/AdapterInfo.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Adapter/AdapterInfo.cs rename to TBF/BenchControl/Network/Adapter/AdapterInfo.cs diff --git a/TestBenchFramework/BenchControl/Network/Adapter/Factory.cs b/TBF/BenchControl/Network/Adapter/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Adapter/Factory.cs rename to TBF/BenchControl/Network/Adapter/Factory.cs diff --git a/TestBenchFramework/BenchControl/Network/Adapter/Netadapter.cs b/TBF/BenchControl/Network/Adapter/Netadapter.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Adapter/Netadapter.cs rename to TBF/BenchControl/Network/Adapter/Netadapter.cs diff --git a/TestBenchFramework/BenchControl/Network/Adapter/NetadapterCfg.cs b/TBF/BenchControl/Network/Adapter/NetadapterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Adapter/NetadapterCfg.cs rename to TBF/BenchControl/Network/Adapter/NetadapterCfg.cs diff --git a/TestBenchFramework/BenchControl/Network/Adapter/NetadapterCfgCtrl.cs b/TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Adapter/NetadapterCfgCtrl.cs rename to TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Network/Adapter/NetadapterCfgCtrl.designer.cs b/TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Adapter/NetadapterCfgCtrl.designer.cs rename to TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Network/Adapter/NetadapterCfgCtrl.resx b/TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Network/Adapter/NetadapterCfgCtrl.resx rename to TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs b/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs rename to TBF/BenchControl/Network/Camera/CLP1611/Camera.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfg.cs b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfg.cs rename to TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs rename to TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.designer.cs b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.designer.cs rename to TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.resx b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.resx rename to TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Factory.cs b/TBF/BenchControl/Network/Camera/CLP1611/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/Factory.cs rename to TBF/BenchControl/Network/Camera/CLP1611/Factory.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs b/TBF/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs rename to TBF/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs b/TBF/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs rename to TBF/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs b/TBF/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs rename to TBF/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/RoisAndResults.cs b/TBF/BenchControl/Network/Camera/CLP1611/RoisAndResults.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/RoisAndResults.cs rename to TBF/BenchControl/Network/Camera/CLP1611/RoisAndResults.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/RtpFrame.cs b/TBF/BenchControl/Network/Camera/CLP1611/RtpFrame.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/RtpFrame.cs rename to TBF/BenchControl/Network/Camera/CLP1611/RtpFrame.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/RtpPacket.cs b/TBF/BenchControl/Network/Camera/CLP1611/RtpPacket.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/RtpPacket.cs rename to TBF/BenchControl/Network/Camera/CLP1611/RtpPacket.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.Designer.cs b/TBF/BenchControl/Network/Camera/CLP1611/TerminalDlg.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.Designer.cs rename to TBF/BenchControl/Network/Camera/CLP1611/TerminalDlg.Designer.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs b/TBF/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs rename to TBF/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.resx b/TBF/BenchControl/Network/Camera/CLP1611/TerminalDlg.resx similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.resx rename to TBF/BenchControl/Network/Camera/CLP1611/TerminalDlg.resx diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/Display.cs b/TBF/BenchControl/Network/Camera/Display/Display.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/Display.cs rename to TBF/BenchControl/Network/Camera/Display/Display.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayCfg.cs b/TBF/BenchControl/Network/Camera/Display/DisplayCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/DisplayCfg.cs rename to TBF/BenchControl/Network/Camera/Display/DisplayCfg.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs b/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs rename to TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayCfgCtrl.designer.cs b/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/DisplayCfgCtrl.designer.cs rename to TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayCfgCtrl.resx b/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/DisplayCfgCtrl.resx rename to TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs b/TBF/BenchControl/Network/Camera/Display/DisplayForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.cs rename to TBF/BenchControl/Network/Camera/Display/DisplayForm.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.designer.cs b/TBF/BenchControl/Network/Camera/Display/DisplayForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.designer.cs rename to TBF/BenchControl/Network/Camera/Display/DisplayForm.designer.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx b/TBF/BenchControl/Network/Camera/Display/DisplayForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/DisplayForm.resx rename to TBF/BenchControl/Network/Camera/Display/DisplayForm.resx diff --git a/TestBenchFramework/BenchControl/Network/Camera/Display/Factory.cs b/TBF/BenchControl/Network/Camera/Display/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Display/Factory.cs rename to TBF/BenchControl/Network/Camera/Display/Factory.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/Factory.cs b/TBF/BenchControl/Network/Camera/Roi/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Roi/Factory.cs rename to TBF/BenchControl/Network/Camera/Roi/Factory.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/ProcedureParams.cs b/TBF/BenchControl/Network/Camera/Roi/ProcedureParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Roi/ProcedureParams.cs rename to TBF/BenchControl/Network/Camera/Roi/ProcedureParams.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs b/TBF/BenchControl/Network/Camera/Roi/Roi.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs rename to TBF/BenchControl/Network/Camera/Roi/Roi.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs b/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfg.cs rename to TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs b/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs rename to TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs b/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs rename to TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.resx b/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Roi/RoiCfgCtrl.resx rename to TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs b/TBF/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs rename to TBF/BenchControl/Network/Camera/Roi/RoiDetectionOp.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/Factory.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/Factory.cs rename to TBF/BenchControl/Network/Camera/RoiForFixedStart/Factory.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/ProcedureParams.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/ProcedureParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/ProcedureParams.cs rename to TBF/BenchControl/Network/Camera/RoiForFixedStart/ProcedureParams.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs rename to TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs rename to TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs rename to TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.designer.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.designer.cs rename to TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.resx b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.resx rename to TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Network/Telnet/Command.cs b/TBF/BenchControl/Network/Telnet/Command.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Telnet/Command.cs rename to TBF/BenchControl/Network/Telnet/Command.cs diff --git a/TestBenchFramework/BenchControl/Network/Telnet/DummyVT.cs b/TBF/BenchControl/Network/Telnet/DummyVT.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Telnet/DummyVT.cs rename to TBF/BenchControl/Network/Telnet/DummyVT.cs diff --git a/TestBenchFramework/BenchControl/Network/Telnet/EventArgsClasses.cs b/TBF/BenchControl/Network/Telnet/EventArgsClasses.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Telnet/EventArgsClasses.cs rename to TBF/BenchControl/Network/Telnet/EventArgsClasses.cs diff --git a/TestBenchFramework/BenchControl/Network/Telnet/IVirtualTerminal.cs b/TBF/BenchControl/Network/Telnet/IVirtualTerminal.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Telnet/IVirtualTerminal.cs rename to TBF/BenchControl/Network/Telnet/IVirtualTerminal.cs diff --git a/TestBenchFramework/BenchControl/Network/Telnet/TelnetClient.cs b/TBF/BenchControl/Network/Telnet/TelnetClient.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Telnet/TelnetClient.cs rename to TBF/BenchControl/Network/Telnet/TelnetClient.cs diff --git a/TestBenchFramework/BenchControl/Network/Telnet/VirtualTerminal.cs b/TBF/BenchControl/Network/Telnet/VirtualTerminal.cs similarity index 100% rename from TestBenchFramework/BenchControl/Network/Telnet/VirtualTerminal.cs rename to TBF/BenchControl/Network/Telnet/VirtualTerminal.cs diff --git a/TestBenchFramework/BenchControl/Operations/AskYesNoForm.Designer.cs b/TBF/BenchControl/Operations/AskYesNoForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/AskYesNoForm.Designer.cs rename to TBF/BenchControl/Operations/AskYesNoForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/Operations/AskYesNoForm.cs b/TBF/BenchControl/Operations/AskYesNoForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/AskYesNoForm.cs rename to TBF/BenchControl/Operations/AskYesNoForm.cs diff --git a/TestBenchFramework/BenchControl/Operations/AskYesNoForm.resx b/TBF/BenchControl/Operations/AskYesNoForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/Operations/AskYesNoForm.resx rename to TBF/BenchControl/Operations/AskYesNoForm.resx diff --git a/TestBenchFramework/BenchControl/Operations/AskYesNoOp.cs b/TBF/BenchControl/Operations/AskYesNoOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/AskYesNoOp.cs rename to TBF/BenchControl/Operations/AskYesNoOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/CheckUIOp.cs b/TBF/BenchControl/Operations/CheckUIOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/CheckUIOp.cs rename to TBF/BenchControl/Operations/CheckUIOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/ClearResultsOp.cs b/TBF/BenchControl/Operations/ClearResultsOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/ClearResultsOp.cs rename to TBF/BenchControl/Operations/ClearResultsOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/EmptyBalanceTankOp.cs b/TBF/BenchControl/Operations/EmptyBalanceTankOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/EmptyBalanceTankOp.cs rename to TBF/BenchControl/Operations/EmptyBalanceTankOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/EnduranceDataLoggingOp.cs b/TBF/BenchControl/Operations/EnduranceDataLoggingOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/EnduranceDataLoggingOp.cs rename to TBF/BenchControl/Operations/EnduranceDataLoggingOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/EnthalpyCalculationOp.cs b/TBF/BenchControl/Operations/EnthalpyCalculationOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/EnthalpyCalculationOp.cs rename to TBF/BenchControl/Operations/EnthalpyCalculationOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/LoadProcedureOp.cs b/TBF/BenchControl/Operations/LoadProcedureOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/LoadProcedureOp.cs rename to TBF/BenchControl/Operations/LoadProcedureOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/MessageBoxForm.Designer.cs b/TBF/BenchControl/Operations/MessageBoxForm.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/MessageBoxForm.Designer.cs rename to TBF/BenchControl/Operations/MessageBoxForm.Designer.cs diff --git a/TestBenchFramework/BenchControl/Operations/MessageBoxForm.cs b/TBF/BenchControl/Operations/MessageBoxForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/MessageBoxForm.cs rename to TBF/BenchControl/Operations/MessageBoxForm.cs diff --git a/TestBenchFramework/BenchControl/Operations/MessageBoxForm.resx b/TBF/BenchControl/Operations/MessageBoxForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/Operations/MessageBoxForm.resx rename to TBF/BenchControl/Operations/MessageBoxForm.resx diff --git a/TestBenchFramework/BenchControl/Operations/MessageBoxOp.cs b/TBF/BenchControl/Operations/MessageBoxOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/MessageBoxOp.cs rename to TBF/BenchControl/Operations/MessageBoxOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/OpTemplate.cs b/TBF/BenchControl/Operations/OpTemplate.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/OpTemplate.cs rename to TBF/BenchControl/Operations/OpTemplate.cs diff --git a/TestBenchFramework/BenchControl/Operations/ProcessDataLoggingOp.cs b/TBF/BenchControl/Operations/ProcessDataLoggingOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/ProcessDataLoggingOp.cs rename to TBF/BenchControl/Operations/ProcessDataLoggingOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/ReadMoreRegistersOp.cs b/TBF/BenchControl/Operations/ReadMoreRegistersOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/ReadMoreRegistersOp.cs rename to TBF/BenchControl/Operations/ReadMoreRegistersOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/ReturnGivenEventOp.cs b/TBF/BenchControl/Operations/ReturnGivenEventOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/ReturnGivenEventOp.cs rename to TBF/BenchControl/Operations/ReturnGivenEventOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/SetAllRegulValvesOp.cs b/TBF/BenchControl/Operations/SetAllRegulValvesOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/SetAllRegulValvesOp.cs rename to TBF/BenchControl/Operations/SetAllRegulValvesOp.cs diff --git a/TestBenchFramework/BenchControl/Operations/TimerOp.cs b/TBF/BenchControl/Operations/TimerOp.cs similarity index 100% rename from TestBenchFramework/BenchControl/Operations/TimerOp.cs rename to TBF/BenchControl/Operations/TimerOp.cs diff --git a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/Enums.cs b/TBF/BenchControl/Output/DB/ProductionMonitoring/Enums.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/Enums.cs rename to TBF/BenchControl/Output/DB/ProductionMonitoring/Enums.cs diff --git a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/Factory.cs b/TBF/BenchControl/Output/DB/ProductionMonitoring/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/Factory.cs rename to TBF/BenchControl/Output/DB/ProductionMonitoring/Factory.cs diff --git a/TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs b/TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs new file mode 100644 index 000000000..b1d725297 --- /dev/null +++ b/TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs @@ -0,0 +1,433 @@ +/// +/// Copyright (c) 2018 Sensus Slovensko a.s. +/// +using System; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using log4net; +using MySql.Data.MySqlClient; +using Config; +using Config.Entities; +using TBF.BenchControl; +using TBF.BenchControl.Sequences; +using TBF.Resources; + +namespace TBF.BenchControl.Output.DB.ProductionMonitoring +{ + public enum Retv + { + OK, + Error, + } + + public class Monitoring : ComponentBase, IOperation, GenericDevices.IResultsWriter, Generic.IDevice + { + private static readonly ILog log = LogManager.GetLogger(typeof(Monitoring)); + public override string ToString() { return string.Format("Monitoring({0})", Cfg.ToString(1)); } + + + enum CurrentOp + { + None, + LoadProcesses, + SaveMonitoringRecords, + } + CurrentOp currentOp; + bool opCompleted; + bool anyError; + + + /// + /// Results to print + /// + Results.Entities.Batch batch; + + + MonitoringCfg monitoringCfg; + string workplace { get { return monitoringCfg.Workplace; } } + MySqlConnection connection; + + + public Monitoring() {} + + public Monitoring(Generic.IComponentCfg cfg) + : base(cfg) + { + monitoringCfg = cfg as MonitoringCfg; + currentOp = CurrentOp.None; + log.Debug(this.ToString()); + } + + public void Initialize() + { + if (monitoringCfg.DebugLevel == DebugMode.Simulate) return; + + /// + /// Do something with the database to see if the connection works well + /// + connection = new MySqlConnection(monitoringCfg.ConnStr); + if (connection != null) + { + connection.Open(); + connection.Close(); + } + } + + public void RunDeviceBefore() {} + public void RunDeviceAfter() {} + + public void StopDevice() + { + if (connection != null) connection.Dispose(); + } + + public void StopDevice2() { } + + + /// + /// Writes the test cycle results into a file, Events: Event.ResultsWritten + /// + /// Procedure to print the results of + /// Results to write into the file + /// Reference to the operation + public IOperation WriteResultsOp(Results.Entities.Batch batch) + { + if (currentOp != CurrentOp.None) + throw new Exception("Sequence error"); + else + currentOp = CurrentOp.SaveMonitoringRecords; + + this.batch = batch; + + /// TODO + + return this; + } + + /// Start this operation + public void Start() + { + opCompleted = false; + anyError = false; + } + + /// Run this operation + /// Event.ResultsWritten or Event.Error + public Event Run() + { + if (currentOp == CurrentOp.SaveMonitoringRecords) + { + if (!opCompleted) + { + if (batch.WaterMeters.Count == 0) return Event.ResultsWritten; + + if (monitoringCfg.DebugLevel != DebugMode.Simulate && connection != null) + { + if (WriteResultsToDatabase(connection, batch, false) == Retv.Error) anyError = true; + } + + WriteLogsToDisk(batch); + + opCompleted = true; + } + + if (anyError) + return Event.ResultsNotWritten; + else + return Event.ResultsWritten; + } + else + { + return Event.None; + } + } + + /// Stop this operation + public void Stop() + { + currentOp = CurrentOp.None; + } + + + public static Retv WriteLogsToDisk(Results.Entities.Batch batch) + { + return Retv.OK; /// OK + } + + + public static Retv WriteResultsToDatabase(MySqlConnection conn, Results.Entities.Batch batch, bool safeMode) + { + MySqlTransaction transaction = null; + + try + { + conn.Open(); /// Open the Oracle database + transaction = conn.BeginTransaction(); + + foreach (var wMtr in batch.WaterMeters) + { + SaveSingleWM2DB(conn, wMtr, safeMode); + } + + transaction.Commit(); + } + catch (Exception exc) + { + if (transaction != null) transaction.Rollback(); + + log.ErrorFormat("Results of batch {0} not written to ORACLE database: {1}", + batch.BatchNr, exc.Message); + + conn.Close(); + return Retv.Error; + } + + conn.Close(); + return Retv.OK; + } + + + /// + /// Write one meter results into the database + /// + /// 0-based water meter number + /// Sorted list of results to save + static void SaveSingleWM2DB(MySqlConnection conn, Results.Entities.WaterMeter wm, bool safeMode) + { + if (string.IsNullOrEmpty(wm.SerialNr)) return; /// No database activity possible w/o PCB number + + if (safeMode && !wm.Passed) return; + + /// + /// Read a list of all prufindexes for a given PCB Number + /// + IList pruefindexes = new List(); + { + MySqlParameter parm = new MySqlParameter(); + + MySqlCommand cmd1 = new MySqlCommand("SELECT Pruefindex FROM VT_ZAEHLER_PINDEX_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); + cmd1.Parameters.Add(parm); + + MySqlDataReader dr = cmd1.ExecuteReader(); + while (dr.Read()) { pruefindexes.Add(dr.GetInt32(0)); } + dr.Close(); + } + { + MySqlParameter parm = new MySqlParameter(); + + MySqlCommand cmd1 = new MySqlCommand("SELECT Max_Pruefindex FROM VT_ZAEHLER_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); + cmd1.Parameters.Add(parm); + + MySqlDataReader dr = cmd1.ExecuteReader(); + while (dr.Read()) { pruefindexes.Add(dr.GetInt32(0)); } + dr.Close(); + } + + /// + /// Determine MAX_Pruefindex + /// + int maxpruefindexLowPart = 0; + foreach (var v in pruefindexes) + { + if ((v % 100) > maxpruefindexLowPart) maxpruefindexLowPart = (v % 100); + } + //int MAX_Pruefindex = 100 * DBCfg.TestBenchId + maxpruefindexLowPart + 1; + + + int Hydr_Pruefung; + if (wm.Passed) + { + /// Passed + if (maxpruefindexLowPart == 0) + Hydr_Pruefung = 96; + else + Hydr_Pruefung = 224; + } + else + { + /// Failed + Hydr_Pruefung = 97; /// Hydr. test failed, Pressure test passed + } + + //SaveOrUpdateWM(conn, wm, MAX_Pruefindex, Hydr_Pruefung); + } + + + /// + /// Save common batch data + /// + /// Batch + static void SaveBatchData(MySqlConnection conn, Results.Entities.Batch b) + { + MySqlCommand cmd = new MySqlCommand("INSERT INTO VT_PRUEFREIHE_PD(" + + "ANBID, ID_Pruefstand, ID_WzPruefreihe, ID_WZTyp, Rev_WZTyp, Rev_Pruefstand_WZTyp, " + + "StartDatumZeit, EndDatumZeit, Betriebsart, QVzKontakt, " + + "FuellenBegDruck, DruckEvakVorne, DruckEvakHinten, DruckBeiAbpressen, " + + "Druckentwaessern, SpuelDurchflussIst, ProgrammVersion)" + + " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17)", conn); + + cmd.ExecuteNonQuery(); /// Returns nr. of updated rows + + if (false) + { + MySqlCommand cmd1 = new MySqlCommand("SELECT PruefungsNr, PosFehlerKalt, QBezeichnung FROM VT_PRUEFPUNKT_SOLL_SD WHERE ANBID=4 AND ID_WZTyp=:1 AND Rev_WZTyp=:2", conn); + + MySqlDataReader dr = cmd1.ExecuteReader(); + while (dr.Read()) + { + int pruefungsNr = dr.GetInt32(0); + double errLimHi = dr.GetDouble(1); + string qBezeichnung = dr.GetString(2); + if (qBezeichnung == "Q2" && errLimHi > 2.0) qBezeichnung = "Q2adj"; + if (qBezeichnung.ToLower().Contains("just") && pruefungsNr == -1) qBezeichnung = "Adjustment"; + + if (qBezeichnung.Contains("Q") || qBezeichnung == "Adjustment") + { + } + } + dr.Close(); + } + + //foreach (var testInfo in testInfos) + { + MySqlCommand cmd2 = new MySqlCommand("INSERT INTO VT_PRUEFDURCHFLUSS_PD(" + + "ANBID, ID_Pruefstand, ID_WzPruefreihe, PruefungsNr, " + + "PVOL, PMasse, MinDurchfluss, MaxDurchfluss, " + + "Q_ist, KFaktor, Q_VZ, F_VZ, RegelEinstellZeit, Drehzahl, " + + "BeginnDruck_Vorne, BeginnDruck_Hinten, EndDruck_Vorne, EndDruck_Hinten, " + + "TVWZ, IVWZ, Verwendeter_VZ, BeginnGewicht, EndGewicht)" + + " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, " + + ":16, :17, :18, :19, :20, :21, :22, :23)", conn); + + cmd2.ExecuteNonQuery(); /// Returns nr. of updated rows + } + + log.InfoFormat("Batch data saved, batchNr={0}", b.BatchNr); + } + + + static void SaveOrUpdateWM(MySqlConnection conn, Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung) + { + int sekundaere_Adr = wm.Passed ? 1 : 0; + int idBenutzer = 6; // = wm.Batch.UserNumber; + + if (max_Pruefindex % 100 == 1) + { + MySqlCommand cmd = new MySqlCommand("INSERT INTO VT_ZAEHLER_PD(Auftragsnummer, VT_Identnummer, VT_Fernum, Max_Pruefindex, Zaehlernummer, Sekundaere_Adr, Hydr_Pruefung, ID_Benutzer, ANBID, Baujahr) VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10)", conn); + + MySqlParameter parm; + parm = new MySqlParameter("Auftragsnummer", MySqlDbType.VarChar); parm.Value = wm.PurchaseOrder; cmd.Parameters.Add(parm); + parm = new MySqlParameter("VT_Identnummer", MySqlDbType.VarChar); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); + parm = new MySqlParameter("VT_Fernum", MySqlDbType.VarChar); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Max_Pruefindex", MySqlDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Zaehlernummer", MySqlDbType.Int32); parm.Value = -1; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Sekundaere_Adr", MySqlDbType.Int32); parm.Value = sekundaere_Adr; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Hydr_Pruefung", MySqlDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); + parm = new MySqlParameter("ID_Benutzer", MySqlDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm); + parm = new MySqlParameter("ANBID", MySqlDbType.Int32); parm.Value = 4; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Baujahr", MySqlDbType.Int32); parm.Value = 2018; cmd.Parameters.Add(parm); + + cmd.ExecuteNonQuery(); + log.InfoFormat("VT_ZAEHLER_PD inserted, PcbNr={0}, pos={1}, maxPruefix={2}", wm.SerialNr, wm.WMPosition, max_Pruefindex); + } + else + { + MySqlCommand cmd = new MySqlCommand("UPDATE VT_ZAEHLER_PD SET Auftragsnummer = :1, VT_Identnummer = :2, Max_Pruefindex = :3, Hydr_Pruefung= :4, ID_Benutzer= :5, Baujahr= :6 WHERE VT_Fernum = :7 and ANBID = :8", conn); + + MySqlParameter parm; + parm = new MySqlParameter("Auftragsnummer", MySqlDbType.VarChar); parm.Value = wm.PurchaseOrder; cmd.Parameters.Add(parm); + parm = new MySqlParameter("VT_Identnummer", MySqlDbType.VarChar); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Max_Pruefindex", MySqlDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Hydr_Pruefung", MySqlDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); + parm = new MySqlParameter("ID_Benutzer", MySqlDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Baujahr", MySqlDbType.Int32); parm.Value = 2018; cmd.Parameters.Add(parm); + parm = new MySqlParameter("VT_Fernum", MySqlDbType.VarChar); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); + parm = new MySqlParameter("ANBID", MySqlDbType.Int32); parm.Value = 4; cmd.Parameters.Add(parm); + + cmd.ExecuteNonQuery(); + log.InfoFormat("VT_ZAEHLER_PD updated, PcbNr={0}, pos={1}, maxPruefix={2}", wm.SerialNr, wm.WMPosition, max_Pruefindex); + } + + { + MySqlCommand cmd = new MySqlCommand("INSERT INTO VT_ZAEHLER_PINDEX_PD(" + + "VT_Fernum, Pruefindex, ANBID, ID_Pruefstand, ID_WzPruefreihe, Hydr_Pruefung, " + + "ReedKontakt, ReedKontaktOK, ReedKontaktZeit, KorrImprate, FestWertWZ, PtestOK, " + + "Zaehlerstand, WT_Platz_NR, WZgut, ID_Benutzer, AnzahlPruefungen)" + + " VALUES (:1, :2, :3, :4, :5, :6, 0, 0, 0, :7, 0, :8, 0, :9, :10, :11, :12)", conn); + MySqlParameter parm; + parm = new MySqlParameter("VT_Fernum", MySqlDbType.VarChar); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Pruefindex", MySqlDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); + parm = new MySqlParameter("ANBID", MySqlDbType.Int32); parm.Value = 4; cmd.Parameters.Add(parm); + parm = new MySqlParameter("ID_Pruefstand", MySqlDbType.Int32); parm.Value = 18000 + wm.Batch.TestBenchId; cmd.Parameters.Add(parm); + parm = new MySqlParameter("ID_WzPruefreihe", MySqlDbType.Int32); parm.Value = wm.Batch.BatchNr; cmd.Parameters.Add(parm); + parm = new MySqlParameter("Hydr_Pruefung", MySqlDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); + // ReedKontakt + // ReedKontaktOK + // ReedKontaktZeit + //parm = new MySqlParameter("KorrImprate", MySqlDbType.Double); parm.Value = wm.OrigCalibFactor; cmd.Parameters.Add(parm); + // FestWertWZ + parm = new MySqlParameter("PtestOK", MySqlDbType.Int32); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); + // Zaehlerstand + parm = new MySqlParameter("WT_Platz_NR", MySqlDbType.Int32); parm.Value = wm.WMPosition; cmd.Parameters.Add(parm); + parm = new MySqlParameter("WZgut", MySqlDbType.Int32); parm.Value = wm.Passed ? 1 : 0; cmd.Parameters.Add(parm); + parm = new MySqlParameter("ID_Benutzer", MySqlDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm); + parm = new MySqlParameter("AnzahlPruefungen", MySqlDbType.Int32); parm.Value = 3; cmd.Parameters.Add(parm); + + cmd.ExecuteNonQuery(); + log.InfoFormat("VT_ZAEHLER_PINDEX_PD inserted, PcbNr={0}, pos={1}, pruefix={2}", wm.SerialNr, wm.WMPosition, max_Pruefindex % 100); + } + + IList testInfos = new List(); + foreach (var testInfo in testInfos) + { + Results.Entities.TestData tData = wm.GetTestData(testInfo); + Results.Entities.MeterTestRslt mtr; + if (tData == null) + { + throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testInfo, wm.WMPosition)); + } + else if (tData.Repeats == 1) + { + mtr = wm.GetMeterTestRslt(testInfo); + if (mtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testInfo, wm.WMPosition)); + } + else + { + Results.Entities.MeterTestRslt firstMtr = wm.GetMeterTestRslt(Utils.TestTitle(tData, 1)); + if (firstMtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", Utils.TestTitle(tData, 1), wm.WMPosition)); + + mtr = new Results.Entities.MeterTestRslt(); + mtr.CopyContentFrom(firstMtr); + mtr.TestRslt = firstMtr.TestRslt; + mtr.WaterMeter = firstMtr.WaterMeter; + for (int i = 2; i <= tData.Repeats; i++) + { + Results.Entities.MeterTestRslt nextMtr = wm.GetMeterTestRslt(Utils.TestTitle(tData, i)); + if (nextMtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", Utils.TestTitle(tData, i), wm.WMPosition)); + + mtr.TestTime += nextMtr.TestTime; + mtr.VolumeMeter += nextMtr.VolumeMeter; + mtr.VolumeRef += nextMtr.VolumeRef; + mtr.VolumeEnd = nextMtr.VolumeEnd; + mtr.Passed = (mtr.Passed && nextMtr.Passed); + } + mtr.Error = Formulas.ErrorFromVolumes(mtr.VolumeMeter, mtr.VolumeRef); + } + + SaveMeterTestResult(conn, mtr, testInfo, max_Pruefindex); + } + } + + + /// + /// Saves a water meter result of a single test + /// + /// q = 0, 1, 2 or 3 (Adj., Q1, Q2, Q3) + /// Nr. of rows updated + static int SaveMeterTestResult(MySqlConnection conn, Results.Entities.MeterTestRslt mtr, string testInfo, int max_Pruefindex) /// + { + return 0; + } + } +} diff --git a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfg.cs b/TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfg.cs rename to TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.cs b/TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.cs rename to TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.designer.cs b/TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.designer.cs rename to TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.resx b/TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.resx rename to TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/WMPart.cs b/TBF/BenchControl/Output/DB/ProductionMonitoring/WMPart.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/WMPart.cs rename to TBF/BenchControl/Output/DB/ProductionMonitoring/WMPart.cs diff --git a/TestBenchFramework/BenchControl/Output/Enums.cs b/TBF/BenchControl/Output/Enums.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Enums.cs rename to TBF/BenchControl/Output/Enums.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Basic/FactoryCompound.cs b/TBF/BenchControl/Output/FileWriters/Basic/FactoryCompound.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Basic/FactoryCompound.cs rename to TBF/BenchControl/Output/FileWriters/Basic/FactoryCompound.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Basic/FactoryHeatMeters.cs b/TBF/BenchControl/Output/FileWriters/Basic/FactoryHeatMeters.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Basic/FactoryHeatMeters.cs rename to TBF/BenchControl/Output/FileWriters/Basic/FactoryHeatMeters.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Basic/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/Basic/FactorySingle.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Basic/FactorySingle.cs rename to TBF/BenchControl/Output/FileWriters/Basic/FactorySingle.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Basic/Writer.cs b/TBF/BenchControl/Output/FileWriters/Basic/Writer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Basic/Writer.cs rename to TBF/BenchControl/Output/FileWriters/Basic/Writer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Basic/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Basic/WriterCfg.cs rename to TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.cs rename to TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.designer.cs b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.designer.cs rename to TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.resx b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.resx rename to TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/FactoryCompound.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryCompound.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/FactoryCompound.cs rename to TBF/BenchControl/Output/FileWriters/Enhanced/FactoryCompound.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/FactoryHeatMeters.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryHeatMeters.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/FactoryHeatMeters.cs rename to TBF/BenchControl/Output/FileWriters/Enhanced/FactoryHeatMeters.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/FactorySingle.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/FactorySingle.cs rename to TBF/BenchControl/Output/FileWriters/Enhanced/FactorySingle.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/Writer.cs rename to TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs rename to TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.cs rename to TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.designer.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.designer.cs rename to TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.resx b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.resx rename to TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Enums.cs b/TBF/BenchControl/Output/FileWriters/Enums.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Enums.cs rename to TBF/BenchControl/Output/FileWriters/Enums.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs rename to TBF/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs rename to TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.cs rename to TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.designer.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.designer.cs rename to TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.resx b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.resx rename to TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/Factory.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/ImageArchiver/Factory.cs rename to TBF/BenchControl/Output/FileWriters/ImageArchiver/Factory.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryCompound.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryCompound.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryCompound.cs rename to TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryCompound.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryHeatMeters.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryHeatMeters.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryHeatMeters.cs rename to TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryHeatMeters.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactorySingle.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/FactorySingle.cs rename to TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactorySingle.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs rename to TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs rename to TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.cs rename to TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.designer.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.designer.cs rename to TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.resx b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.resx rename to TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Xml/FactoryCompound.cs b/TBF/BenchControl/Output/FileWriters/Xml/FactoryCompound.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Xml/FactoryCompound.cs rename to TBF/BenchControl/Output/FileWriters/Xml/FactoryCompound.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Xml/FactoryHeatMeters.cs b/TBF/BenchControl/Output/FileWriters/Xml/FactoryHeatMeters.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Xml/FactoryHeatMeters.cs rename to TBF/BenchControl/Output/FileWriters/Xml/FactoryHeatMeters.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Xml/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/Xml/FactorySingle.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Xml/FactorySingle.cs rename to TBF/BenchControl/Output/FileWriters/Xml/FactorySingle.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Xml/Writer.cs b/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Xml/Writer.cs rename to TBF/BenchControl/Output/FileWriters/Xml/Writer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Xml/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Xml/WriterCfg.cs rename to TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.cs rename to TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.designer.cs b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.designer.cs rename to TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.resx b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.resx rename to TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Output/HeaderFooterDlg.Designer.cs b/TBF/BenchControl/Output/HeaderFooterDlg.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/HeaderFooterDlg.Designer.cs rename to TBF/BenchControl/Output/HeaderFooterDlg.Designer.cs diff --git a/TestBenchFramework/BenchControl/Output/HeaderFooterDlg.cs b/TBF/BenchControl/Output/HeaderFooterDlg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/HeaderFooterDlg.cs rename to TBF/BenchControl/Output/HeaderFooterDlg.cs diff --git a/TestBenchFramework/BenchControl/Output/HeaderFooterDlg.resx b/TBF/BenchControl/Output/HeaderFooterDlg.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/HeaderFooterDlg.resx rename to TBF/BenchControl/Output/HeaderFooterDlg.resx diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/FactoryCompound.cs b/TBF/BenchControl/Output/Printers/Enhanced/FactoryCompound.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Enhanced/FactoryCompound.cs rename to TBF/BenchControl/Output/Printers/Enhanced/FactoryCompound.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/FactoryHeatMeters.cs b/TBF/BenchControl/Output/Printers/Enhanced/FactoryHeatMeters.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Enhanced/FactoryHeatMeters.cs rename to TBF/BenchControl/Output/Printers/Enhanced/FactoryHeatMeters.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/FactorySingle.cs b/TBF/BenchControl/Output/Printers/Enhanced/FactorySingle.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Enhanced/FactorySingle.cs rename to TBF/BenchControl/Output/Printers/Enhanced/FactorySingle.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/Printer.cs b/TBF/BenchControl/Output/Printers/Enhanced/Printer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Enhanced/Printer.cs rename to TBF/BenchControl/Output/Printers/Enhanced/Printer.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs rename to TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.Designer.cs b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.Designer.cs rename to TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.cs rename to TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.resx b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.resx rename to TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/FactoryCompound.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryCompound.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/FactoryCompound.cs rename to TBF/BenchControl/Output/Printers/OnePerMeter/FactoryCompound.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/FactoryHeatMeters.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryHeatMeters.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/FactoryHeatMeters.cs rename to TBF/BenchControl/Output/Printers/OnePerMeter/FactoryHeatMeters.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/FactorySingle.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/FactorySingle.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/FactorySingle.cs rename to TBF/BenchControl/Output/Printers/OnePerMeter/FactorySingle.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/Printer.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/Printer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/Printer.cs rename to TBF/BenchControl/Output/Printers/OnePerMeter/Printer.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs rename to TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.Designer.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.Designer.cs rename to TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs rename to TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.resx b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.resx rename to TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/FactoryCompound.cs b/TBF/BenchControl/Output/Printers/Zapiska/FactoryCompound.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Zapiska/FactoryCompound.cs rename to TBF/BenchControl/Output/Printers/Zapiska/FactoryCompound.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/FactoryHeatMeters.cs b/TBF/BenchControl/Output/Printers/Zapiska/FactoryHeatMeters.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Zapiska/FactoryHeatMeters.cs rename to TBF/BenchControl/Output/Printers/Zapiska/FactoryHeatMeters.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/FactorySingle.cs b/TBF/BenchControl/Output/Printers/Zapiska/FactorySingle.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Zapiska/FactorySingle.cs rename to TBF/BenchControl/Output/Printers/Zapiska/FactorySingle.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/Printer.cs b/TBF/BenchControl/Output/Printers/Zapiska/Printer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Zapiska/Printer.cs rename to TBF/BenchControl/Output/Printers/Zapiska/Printer.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs rename to TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs rename to TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs rename to TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.resx b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.resx rename to TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/OutputPath.cs b/TBF/BenchControl/OutputPath.cs similarity index 100% rename from TestBenchFramework/BenchControl/OutputPath.cs rename to TBF/BenchControl/OutputPath.cs diff --git a/TestBenchFramework/BenchControl/ProcedureParamsBase.cs b/TBF/BenchControl/ProcedureParamsBase.cs similarity index 100% rename from TestBenchFramework/BenchControl/ProcedureParamsBase.cs rename to TBF/BenchControl/ProcedureParamsBase.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs b/TBF/BenchControl/ResultsPrinters/Cevak/Printer.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Cevak/Printer.cs rename to TBF/BenchControl/ResultsPrinters/Cevak/Printer.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterCfg.cs b/TBF/BenchControl/ResultsPrinters/Cevak/PrinterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterCfg.cs rename to TBF/BenchControl/ResultsPrinters/Cevak/PrinterCfg.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.Designer.cs b/TBF/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.Designer.cs rename to TBF/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.cs b/TBF/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.cs rename to TBF/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.resx b/TBF/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.resx rename to TBF/BenchControl/ResultsPrinters/Cevak/PrinterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterFactory.cs b/TBF/BenchControl/ResultsPrinters/Cevak/PrinterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrinterFactory.cs rename to TBF/BenchControl/ResultsPrinters/Cevak/PrinterFactory.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs b/TBF/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs rename to TBF/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/Printer.cs b/TBF/BenchControl/ResultsPrinters/LabelPrinter/Printer.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/Printer.cs rename to TBF/BenchControl/ResultsPrinters/LabelPrinter/Printer.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfg.cs b/TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfg.cs rename to TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfg.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.Designer.cs b/TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.Designer.cs rename to TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.Designer.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.cs b/TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.cs rename to TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.resx b/TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.resx rename to TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterFactory.cs b/TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrinterFactory.cs rename to TBF/BenchControl/ResultsPrinters/LabelPrinter/PrinterFactory.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs b/TBF/BenchControl/ResultsPrinters/Munich/Printer.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs rename to TBF/BenchControl/ResultsPrinters/Munich/Printer.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfg.cs b/TBF/BenchControl/ResultsPrinters/Munich/PrinterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfg.cs rename to TBF/BenchControl/ResultsPrinters/Munich/PrinterCfg.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.cs b/TBF/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.cs rename to TBF/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.designer.cs b/TBF/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.designer.cs rename to TBF/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.resx b/TBF/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.resx rename to TBF/BenchControl/ResultsPrinters/Munich/PrinterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs b/TBF/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs rename to TBF/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs diff --git a/TestBenchFramework/BenchControl/Sequences/DeferredTestEvaluationData.cs b/TBF/BenchControl/Sequences/DeferredTestEvaluationData.cs similarity index 100% rename from TestBenchFramework/BenchControl/Sequences/DeferredTestEvaluationData.cs rename to TBF/BenchControl/Sequences/DeferredTestEvaluationData.cs diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/Sequences/MainSeq.cs rename to TBF/BenchControl/Sequences/MainSeq.cs diff --git a/TestBenchFramework/BenchControl/Sequences/ProcessData.cs b/TBF/BenchControl/Sequences/ProcessData.cs similarity index 100% rename from TestBenchFramework/BenchControl/Sequences/ProcessData.cs rename to TBF/BenchControl/Sequences/ProcessData.cs diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs similarity index 100% rename from TestBenchFramework/BenchControl/Sequences/SequenceBase.cs rename to TBF/BenchControl/Sequences/SequenceBase.cs diff --git a/TestBenchFramework/BenchControl/Sequences/Statistics.cs b/TBF/BenchControl/Sequences/Statistics.cs similarity index 100% rename from TestBenchFramework/BenchControl/Sequences/Statistics.cs rename to TBF/BenchControl/Sequences/Statistics.cs diff --git a/TestBenchFramework/BenchControl/State.cs b/TBF/BenchControl/State.cs similarity index 100% rename from TestBenchFramework/BenchControl/State.cs rename to TBF/BenchControl/State.cs diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs similarity index 100% rename from TestBenchFramework/BenchControl/StateMachine.cs rename to TBF/BenchControl/StateMachine.cs diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TBF/BenchControl/TbfComponents.cs similarity index 100% rename from TestBenchFramework/BenchControl/TbfComponents.cs rename to TBF/BenchControl/TbfComponents.cs diff --git a/TestBenchFramework/BenchControl/TestBenchSim.cs b/TBF/BenchControl/TestBenchSim.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestBenchSim.cs rename to TBF/BenchControl/TestBenchSim.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs rename to TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/Factory.cs b/TBF/BenchControl/TestMethods/Adjustment/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/Factory.cs rename to TBF/BenchControl/TestMethods/Adjustment/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs b/TBF/BenchControl/TestMethods/Adjustment/TestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs rename to TBF/BenchControl/TestMethods/Adjustment/TestMethod.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm.cs rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm.designer.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm.designer.cs rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm.resx b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm.resx rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm12.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm12.cs rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm12.designer.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm12.designer.cs rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm12.resx b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm12.resx rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.resx b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Adjustment/WMErrorsForm24.resx rename to TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs rename to TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs rename to TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs rename to TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodFactory.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodFactory.cs rename to TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodFactory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/Component.cs b/TBF/BenchControl/TestMethods/Endurance/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/Component.cs rename to TBF/BenchControl/TestMethods/Endurance/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.cs b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.cs rename to TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs rename to TBF/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.pl.resx b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.pl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.pl.resx rename to TBF/BenchControl/TestMethods/Endurance/CycleDlg.pl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.resx b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.resx rename to TBF/BenchControl/TestMethods/Endurance/CycleDlg.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.ru.resx b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.ru.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/CycleDlg.ru.resx rename to TBF/BenchControl/TestMethods/Endurance/CycleDlg.ru.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/CycleStep.cs b/TBF/BenchControl/TestMethods/Endurance/CycleStep.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/CycleStep.cs rename to TBF/BenchControl/TestMethods/Endurance/CycleStep.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs b/TBF/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs rename to TBF/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs rename to TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/Factory.cs b/TBF/BenchControl/TestMethods/Endurance/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/Factory.cs rename to TBF/BenchControl/TestMethods/Endurance/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/TestParams.cs b/TBF/BenchControl/TestMethods/Endurance/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/Endurance/TestParams.cs rename to TBF/BenchControl/TestMethods/Endurance/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs rename to TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs rename to TBF/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/Single/Factory.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/Single/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/Single/Factory.cs rename to TBF/BenchControl/TestMethods/FixedStartAdvanced/Single/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/Compound/Component.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/Compound/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/Compound/Component.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/Compound/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/Compound/Factory.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/Compound/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/Compound/Factory.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/Compound/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/Component.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/Factory.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/Factory.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestParams.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/HeatMeters/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/IntermediateData.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/IntermediateData.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/IntermediateData.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/IntermediateData.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/Single/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/Single/Component.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/Single/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/Single/Factory.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/Single/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartDeferredEvaluation/Single/Factory.cs rename to TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/Single/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Factory.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Compound/Factory.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Factory.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Factory.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Factory.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/Single/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/Single/Factory.cs rename to TBF/BenchControl/TestMethods/FixedStartMassCollection/Single/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStart/Compound/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStart/Compound/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs rename to TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStart/Single/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStart/Single/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStart/Single/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStart/Single/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/CombinedTestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/CombinedTestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/CombinedTestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/CombinedTestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Factory.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Factory.cs rename to TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/GrabImage/Component.cs b/TBF/BenchControl/TestMethods/GrabImage/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/GrabImage/Component.cs rename to TBF/BenchControl/TestMethods/GrabImage/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/GrabImage/Factory.cs b/TBF/BenchControl/TestMethods/GrabImage/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/GrabImage/Factory.cs rename to TBF/BenchControl/TestMethods/GrabImage/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs rename to TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.cs rename to TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.resx b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.resx rename to TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs rename to TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestParams.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestParams.cs rename to TBF/BenchControl/TestMethods/LeakTest/LeakTestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs rename to TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs rename to TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodFactory.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethodFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodFactory.cs rename to TBF/BenchControl/TestMethods/LeakTest/TestMethodFactory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/CfgCtrl.cs b/TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LiveStream/CfgCtrl.cs rename to TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/CfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LiveStream/CfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/CfgCtrl.resx b/TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LiveStream/CfgCtrl.resx rename to TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/Component.cs b/TBF/BenchControl/TestMethods/LiveStream/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LiveStream/Component.cs rename to TBF/BenchControl/TestMethods/LiveStream/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/Factory.cs b/TBF/BenchControl/TestMethods/LiveStream/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LiveStream/Factory.cs rename to TBF/BenchControl/TestMethods/LiveStream/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs b/TBF/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs rename to TBF/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs b/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs rename to TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/Component.cs b/TBF/BenchControl/TestMethods/OuterLoop/End/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/Component.cs rename to TBF/BenchControl/TestMethods/OuterLoop/End/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/Factory.cs b/TBF/BenchControl/TestMethods/OuterLoop/End/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/Factory.cs rename to TBF/BenchControl/TestMethods/OuterLoop/End/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/OuterLoop/Start/Component.cs b/TBF/BenchControl/TestMethods/OuterLoop/Start/Component.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/OuterLoop/Start/Component.cs rename to TBF/BenchControl/TestMethods/OuterLoop/Start/Component.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/OuterLoop/Start/Factory.cs b/TBF/BenchControl/TestMethods/OuterLoop/Start/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/OuterLoop/Start/Factory.cs rename to TBF/BenchControl/TestMethods/OuterLoop/Start/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs rename to TBF/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs rename to TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs rename to TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodFactory.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodFactory.cs rename to TBF/BenchControl/TestMethods/PMaxTest/TestMethodFactory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs rename to TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs b/TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs rename to TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs b/TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs rename to TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetection.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetection.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetection.cs rename to TBF/BenchControl/TestMethods/RoiDetection/RoiDetection.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs rename to TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.cs rename to TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.resx b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.resx rename to TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionFactory.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionFactory.cs rename to TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionFactory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs rename to TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/SensitivityTest/SensitivityTestParams.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/SensitivityTest/SensitivityTestParams.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethod.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethod.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodFactory.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/SensitivityTest/TestMethodFactory.cs rename to TBF/BenchControl/TestMethods/SensitivityTest/TestMethodFactory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/AllCompletedEventArgs.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/AllCompletedEventArgs.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/AllCompletedEventArgs.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/AllCompletedEventArgs.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/CheckBoxImage.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/CheckBoxImage.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/CheckBoxImage.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/CheckBoxImage.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/CommCompletedEventArgs.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/CommCompletedEventArgs.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/CommCompletedEventArgs.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/CommCompletedEventArgs.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.resx rename to TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodFactory.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/TestMethodFactory.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodFactory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.resx b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.resx rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlEnums.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlEnums.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlEnums.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlEnums.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/CalibrationStruct.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/CalibrationStruct.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/CalibrationStruct.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/CalibrationStruct.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ConfigStruct.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ConfigStruct.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ConfigStruct.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ConfigStruct.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Enums.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Enums.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Enums.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Enums.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Factory.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Factory.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/Factory.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.designer.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.resx b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.resx rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoReceivedEventArgs.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoReceivedEventArgs.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoReceivedEventArgs.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoReceivedEventArgs.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoTelegramRaw.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoTelegramRaw.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoTelegramRaw.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/OptoTelegramRaw.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/StatusStruct.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/StatusStruct.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlHead/StatusStruct.cs rename to TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/StatusStruct.cs diff --git a/TestBenchFramework/BenchControl/TestParamsBase.cs b/TBF/BenchControl/TestParamsBase.cs similarity index 100% rename from TestBenchFramework/BenchControl/TestParamsBase.cs rename to TBF/BenchControl/TestParamsBase.cs diff --git a/TestBenchFramework/BenchControl/Transition.cs b/TBF/BenchControl/Transition.cs similarity index 100% rename from TestBenchFramework/BenchControl/Transition.cs rename to TBF/BenchControl/Transition.cs diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs b/TBF/BenchControl/Various/ErrorFlags/Errors.cs similarity index 100% rename from TestBenchFramework/BenchControl/Various/ErrorFlags/Errors.cs rename to TBF/BenchControl/Various/ErrorFlags/Errors.cs diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfg.cs b/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfg.cs rename to TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.cs b/TBF/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.cs rename to TBF/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.designer.cs b/TBF/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.designer.cs rename to TBF/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.resx b/TBF/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.resx rename to TBF/BenchControl/Various/ErrorFlags/ErrorsCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/Factory.cs b/TBF/BenchControl/Various/ErrorFlags/Factory.cs similarity index 100% rename from TestBenchFramework/BenchControl/Various/ErrorFlags/Factory.cs rename to TBF/BenchControl/Various/ErrorFlags/Factory.cs diff --git a/TestBenchFramework/BenchControl/Various/ErrorFlags/TestParams.cs b/TBF/BenchControl/Various/ErrorFlags/TestParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/Various/ErrorFlags/TestParams.cs rename to TBF/BenchControl/Various/ErrorFlags/TestParams.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/Munich/ProcParams.cs b/TBF/BenchControl/WaterMeters/Munich/ProcParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/Munich/ProcParams.cs rename to TBF/BenchControl/WaterMeters/Munich/ProcParams.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeter.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeter.cs rename to TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs rename to TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs rename to TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.designer.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.designer.cs rename to TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.resx b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.resx rename to TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterFactory.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/Munich/WaterMeterFactory.cs rename to TBF/BenchControl/WaterMeters/Munich/WaterMeterFactory.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/ProcParams.cs b/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/WaterMeter/ProcParams.cs rename to TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs rename to TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs rename to TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.cs rename to TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.designer.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.designer.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.designer.cs rename to TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.designer.cs diff --git a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.resx b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.resx similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.resx rename to TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.resx diff --git a/TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterFactory.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterFactory.cs similarity index 100% rename from TestBenchFramework/BenchControl/WaterMeters/WaterMeter/WaterMeterFactory.cs rename to TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterFactory.cs diff --git a/TestBenchFramework/BenchesDlg.Designer.cs b/TBF/BenchesDlg.Designer.cs similarity index 100% rename from TestBenchFramework/BenchesDlg.Designer.cs rename to TBF/BenchesDlg.Designer.cs diff --git a/TestBenchFramework/BenchesDlg.cs b/TBF/BenchesDlg.cs similarity index 100% rename from TestBenchFramework/BenchesDlg.cs rename to TBF/BenchesDlg.cs diff --git a/TestBenchFramework/BenchesDlg.pl.resx b/TBF/BenchesDlg.pl.resx similarity index 100% rename from TestBenchFramework/BenchesDlg.pl.resx rename to TBF/BenchesDlg.pl.resx diff --git a/TestBenchFramework/BenchesDlg.resx b/TBF/BenchesDlg.resx similarity index 100% rename from TestBenchFramework/BenchesDlg.resx rename to TBF/BenchesDlg.resx diff --git a/TestBenchFramework/BenchesDlg.ru.resx b/TBF/BenchesDlg.ru.resx similarity index 100% rename from TestBenchFramework/BenchesDlg.ru.resx rename to TBF/BenchesDlg.ru.resx diff --git a/TestBenchFramework/Boxes/DoubleBox.cs b/TBF/Boxes/DoubleBox.cs similarity index 100% rename from TestBenchFramework/Boxes/DoubleBox.cs rename to TBF/Boxes/DoubleBox.cs diff --git a/TestBenchFramework/Boxes/FloatBox.cs b/TBF/Boxes/FloatBox.cs similarity index 100% rename from TestBenchFramework/Boxes/FloatBox.cs rename to TBF/Boxes/FloatBox.cs diff --git a/TestBenchFramework/Boxes/IBox.cs b/TBF/Boxes/IBox.cs similarity index 100% rename from TestBenchFramework/Boxes/IBox.cs rename to TBF/Boxes/IBox.cs diff --git a/TestBenchFramework/Boxes/IntBox.cs b/TBF/Boxes/IntBox.cs similarity index 100% rename from TestBenchFramework/Boxes/IntBox.cs rename to TBF/Boxes/IntBox.cs diff --git a/TestBenchFramework/CameraBinaryFiles/DiscoveryDaemon b/TBF/CameraBinaryFiles/DiscoveryDaemon similarity index 100% rename from TestBenchFramework/CameraBinaryFiles/DiscoveryDaemon rename to TBF/CameraBinaryFiles/DiscoveryDaemon diff --git a/TestBenchFramework/CameraBinaryFiles/GrabImage b/TBF/CameraBinaryFiles/GrabImage similarity index 100% rename from TestBenchFramework/CameraBinaryFiles/GrabImage rename to TBF/CameraBinaryFiles/GrabImage diff --git a/TestBenchFramework/CameraBinaryFiles/JpegLib.so b/TBF/CameraBinaryFiles/JpegLib.so similarity index 100% rename from TestBenchFramework/CameraBinaryFiles/JpegLib.so rename to TBF/CameraBinaryFiles/JpegLib.so diff --git a/TestBenchFramework/CameraBinaryFiles/Measurement b/TBF/CameraBinaryFiles/Measurement similarity index 100% rename from TestBenchFramework/CameraBinaryFiles/Measurement rename to TBF/CameraBinaryFiles/Measurement diff --git a/TestBenchFramework/CameraBinaryFiles/RoiDetection b/TBF/CameraBinaryFiles/RoiDetection similarity index 100% rename from TestBenchFramework/CameraBinaryFiles/RoiDetection rename to TBF/CameraBinaryFiles/RoiDetection diff --git a/TestBenchFramework/CameraBinaryFiles/VisionLib.so b/TBF/CameraBinaryFiles/VisionLib.so similarity index 100% rename from TestBenchFramework/CameraBinaryFiles/VisionLib.so rename to TBF/CameraBinaryFiles/VisionLib.so diff --git a/TestBenchFramework/ComponentParametersDlg.Designer.cs b/TBF/ComponentParametersDlg.Designer.cs similarity index 100% rename from TestBenchFramework/ComponentParametersDlg.Designer.cs rename to TBF/ComponentParametersDlg.Designer.cs diff --git a/TestBenchFramework/ComponentParametersDlg.cs b/TBF/ComponentParametersDlg.cs similarity index 100% rename from TestBenchFramework/ComponentParametersDlg.cs rename to TBF/ComponentParametersDlg.cs diff --git a/TestBenchFramework/ComponentParametersDlg.resx b/TBF/ComponentParametersDlg.resx similarity index 100% rename from TestBenchFramework/ComponentParametersDlg.resx rename to TBF/ComponentParametersDlg.resx diff --git a/TestBenchFramework/ComponentsManagerDlg.Designer.cs b/TBF/ComponentsManagerDlg.Designer.cs similarity index 100% rename from TestBenchFramework/ComponentsManagerDlg.Designer.cs rename to TBF/ComponentsManagerDlg.Designer.cs diff --git a/TestBenchFramework/ComponentsManagerDlg.cs b/TBF/ComponentsManagerDlg.cs similarity index 100% rename from TestBenchFramework/ComponentsManagerDlg.cs rename to TBF/ComponentsManagerDlg.cs diff --git a/TestBenchFramework/ComponentsManagerDlg.pl.resx b/TBF/ComponentsManagerDlg.pl.resx similarity index 100% rename from TestBenchFramework/ComponentsManagerDlg.pl.resx rename to TBF/ComponentsManagerDlg.pl.resx diff --git a/TestBenchFramework/ComponentsManagerDlg.resx b/TBF/ComponentsManagerDlg.resx similarity index 100% rename from TestBenchFramework/ComponentsManagerDlg.resx rename to TBF/ComponentsManagerDlg.resx diff --git a/TestBenchFramework/ComponentsManagerDlg.ru.resx b/TBF/ComponentsManagerDlg.ru.resx similarity index 100% rename from TestBenchFramework/ComponentsManagerDlg.ru.resx rename to TBF/ComponentsManagerDlg.ru.resx diff --git a/TestBenchFramework/CustomStyle.cs b/TBF/CustomStyle.cs similarity index 100% rename from TestBenchFramework/CustomStyle.cs rename to TBF/CustomStyle.cs diff --git a/TestBenchFramework/ErrorHandler.cs b/TBF/ErrorHandler.cs similarity index 100% rename from TestBenchFramework/ErrorHandler.cs rename to TBF/ErrorHandler.cs diff --git a/TestBenchFramework/Forms/AboutDlg.Designer.cs b/TBF/Forms/AboutDlg.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/AboutDlg.Designer.cs rename to TBF/Forms/AboutDlg.Designer.cs diff --git a/TestBenchFramework/Forms/AboutDlg.cs b/TBF/Forms/AboutDlg.cs similarity index 100% rename from TestBenchFramework/Forms/AboutDlg.cs rename to TBF/Forms/AboutDlg.cs diff --git a/TestBenchFramework/Forms/AboutDlg.pl.resx b/TBF/Forms/AboutDlg.pl.resx similarity index 100% rename from TestBenchFramework/Forms/AboutDlg.pl.resx rename to TBF/Forms/AboutDlg.pl.resx diff --git a/TestBenchFramework/Forms/AboutDlg.resx b/TBF/Forms/AboutDlg.resx similarity index 100% rename from TestBenchFramework/Forms/AboutDlg.resx rename to TBF/Forms/AboutDlg.resx diff --git a/TestBenchFramework/Forms/AboutDlg.ru.resx b/TBF/Forms/AboutDlg.ru.resx similarity index 100% rename from TestBenchFramework/Forms/AboutDlg.ru.resx rename to TBF/Forms/AboutDlg.ru.resx diff --git a/TestBenchFramework/Forms/DatabaseSettingsDlg.Designer.cs b/TBF/Forms/DatabaseSettingsDlg.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/DatabaseSettingsDlg.Designer.cs rename to TBF/Forms/DatabaseSettingsDlg.Designer.cs diff --git a/TestBenchFramework/Forms/DatabaseSettingsDlg.cs b/TBF/Forms/DatabaseSettingsDlg.cs similarity index 100% rename from TestBenchFramework/Forms/DatabaseSettingsDlg.cs rename to TBF/Forms/DatabaseSettingsDlg.cs diff --git a/TestBenchFramework/Forms/DatabaseSettingsDlg.resx b/TBF/Forms/DatabaseSettingsDlg.resx similarity index 100% rename from TestBenchFramework/Forms/DatabaseSettingsDlg.resx rename to TBF/Forms/DatabaseSettingsDlg.resx diff --git a/TestBenchFramework/Forms/EmergencyStopForm.cs b/TBF/Forms/EmergencyStopForm.cs similarity index 100% rename from TestBenchFramework/Forms/EmergencyStopForm.cs rename to TBF/Forms/EmergencyStopForm.cs diff --git a/TestBenchFramework/Forms/EmergencyStopForm.designer.cs b/TBF/Forms/EmergencyStopForm.designer.cs similarity index 100% rename from TestBenchFramework/Forms/EmergencyStopForm.designer.cs rename to TBF/Forms/EmergencyStopForm.designer.cs diff --git a/TestBenchFramework/Forms/EmergencyStopForm.resx b/TBF/Forms/EmergencyStopForm.resx similarity index 100% rename from TestBenchFramework/Forms/EmergencyStopForm.resx rename to TBF/Forms/EmergencyStopForm.resx diff --git a/TestBenchFramework/Forms/ErrorDlg.Designer.cs b/TBF/Forms/ErrorDlg.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/ErrorDlg.Designer.cs rename to TBF/Forms/ErrorDlg.Designer.cs diff --git a/TestBenchFramework/Forms/ErrorDlg.cs b/TBF/Forms/ErrorDlg.cs similarity index 100% rename from TestBenchFramework/Forms/ErrorDlg.cs rename to TBF/Forms/ErrorDlg.cs diff --git a/TestBenchFramework/Forms/ErrorDlg.resx b/TBF/Forms/ErrorDlg.resx similarity index 100% rename from TestBenchFramework/Forms/ErrorDlg.resx rename to TBF/Forms/ErrorDlg.resx diff --git a/TestBenchFramework/Forms/LoginDlgWithBenchSelection.cs b/TBF/Forms/LoginDlgWithBenchSelection.cs similarity index 100% rename from TestBenchFramework/Forms/LoginDlgWithBenchSelection.cs rename to TBF/Forms/LoginDlgWithBenchSelection.cs diff --git a/TestBenchFramework/Forms/LoginDlgWithBenchSelection.designer.cs b/TBF/Forms/LoginDlgWithBenchSelection.designer.cs similarity index 100% rename from TestBenchFramework/Forms/LoginDlgWithBenchSelection.designer.cs rename to TBF/Forms/LoginDlgWithBenchSelection.designer.cs diff --git a/TestBenchFramework/Forms/LoginDlgWithBenchSelection.resx b/TBF/Forms/LoginDlgWithBenchSelection.resx similarity index 100% rename from TestBenchFramework/Forms/LoginDlgWithBenchSelection.resx rename to TBF/Forms/LoginDlgWithBenchSelection.resx diff --git a/TestBenchFramework/Forms/ModelessActivityForm.cs b/TBF/Forms/ModelessActivityForm.cs similarity index 100% rename from TestBenchFramework/Forms/ModelessActivityForm.cs rename to TBF/Forms/ModelessActivityForm.cs diff --git a/TestBenchFramework/Forms/ModelessActivityForm.designer.cs b/TBF/Forms/ModelessActivityForm.designer.cs similarity index 100% rename from TestBenchFramework/Forms/ModelessActivityForm.designer.cs rename to TBF/Forms/ModelessActivityForm.designer.cs diff --git a/TestBenchFramework/Forms/ModelessActivityForm.resx b/TBF/Forms/ModelessActivityForm.resx similarity index 100% rename from TestBenchFramework/Forms/ModelessActivityForm.resx rename to TBF/Forms/ModelessActivityForm.resx diff --git a/TestBenchFramework/Forms/NoBenchOrDatabaseDlg.Designer.cs b/TBF/Forms/NoBenchOrDatabaseDlg.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/NoBenchOrDatabaseDlg.Designer.cs rename to TBF/Forms/NoBenchOrDatabaseDlg.Designer.cs diff --git a/TestBenchFramework/Forms/NoBenchOrDatabaseDlg.cs b/TBF/Forms/NoBenchOrDatabaseDlg.cs similarity index 100% rename from TestBenchFramework/Forms/NoBenchOrDatabaseDlg.cs rename to TBF/Forms/NoBenchOrDatabaseDlg.cs diff --git a/TestBenchFramework/Forms/NoBenchOrDatabaseDlg.resx b/TBF/Forms/NoBenchOrDatabaseDlg.resx similarity index 100% rename from TestBenchFramework/Forms/NoBenchOrDatabaseDlg.resx rename to TBF/Forms/NoBenchOrDatabaseDlg.resx diff --git a/TestBenchFramework/Forms/PreviousResultCtrl.Designer.cs b/TBF/Forms/PreviousResultCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/PreviousResultCtrl.Designer.cs rename to TBF/Forms/PreviousResultCtrl.Designer.cs diff --git a/TestBenchFramework/Forms/PreviousResultCtrl.cs b/TBF/Forms/PreviousResultCtrl.cs similarity index 100% rename from TestBenchFramework/Forms/PreviousResultCtrl.cs rename to TBF/Forms/PreviousResultCtrl.cs diff --git a/TestBenchFramework/Forms/PreviousResultCtrl.resx b/TBF/Forms/PreviousResultCtrl.resx similarity index 100% rename from TestBenchFramework/Forms/PreviousResultCtrl.resx rename to TBF/Forms/PreviousResultCtrl.resx diff --git a/TestBenchFramework/Forms/PreviousResultIdEventArgs.cs b/TBF/Forms/PreviousResultIdEventArgs.cs similarity index 100% rename from TestBenchFramework/Forms/PreviousResultIdEventArgs.cs rename to TBF/Forms/PreviousResultIdEventArgs.cs diff --git a/TestBenchFramework/Forms/PreviousResultsDlg.Designer.cs b/TBF/Forms/PreviousResultsDlg.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/PreviousResultsDlg.Designer.cs rename to TBF/Forms/PreviousResultsDlg.Designer.cs diff --git a/TestBenchFramework/Forms/PreviousResultsDlg.cs b/TBF/Forms/PreviousResultsDlg.cs similarity index 100% rename from TestBenchFramework/Forms/PreviousResultsDlg.cs rename to TBF/Forms/PreviousResultsDlg.cs diff --git a/TestBenchFramework/Forms/PreviousResultsDlg.resx b/TBF/Forms/PreviousResultsDlg.resx similarity index 100% rename from TestBenchFramework/Forms/PreviousResultsDlg.resx rename to TBF/Forms/PreviousResultsDlg.resx diff --git a/TestBenchFramework/Forms/PrintOrderForm.Designer.cs b/TBF/Forms/PrintOrderForm.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/PrintOrderForm.Designer.cs rename to TBF/Forms/PrintOrderForm.Designer.cs diff --git a/TestBenchFramework/Forms/PrintOrderForm.cs b/TBF/Forms/PrintOrderForm.cs similarity index 100% rename from TestBenchFramework/Forms/PrintOrderForm.cs rename to TBF/Forms/PrintOrderForm.cs diff --git a/TestBenchFramework/Forms/PrintOrderForm.resx b/TBF/Forms/PrintOrderForm.resx similarity index 100% rename from TestBenchFramework/Forms/PrintOrderForm.resx rename to TBF/Forms/PrintOrderForm.resx diff --git a/TestBenchFramework/Forms/ResultsArrangementDlg.Designer.cs b/TBF/Forms/ResultsArrangementDlg.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/ResultsArrangementDlg.Designer.cs rename to TBF/Forms/ResultsArrangementDlg.Designer.cs diff --git a/TestBenchFramework/Forms/ResultsArrangementDlg.cs b/TBF/Forms/ResultsArrangementDlg.cs similarity index 100% rename from TestBenchFramework/Forms/ResultsArrangementDlg.cs rename to TBF/Forms/ResultsArrangementDlg.cs diff --git a/TestBenchFramework/Forms/ResultsArrangementDlg.resx b/TBF/Forms/ResultsArrangementDlg.resx similarity index 100% rename from TestBenchFramework/Forms/ResultsArrangementDlg.resx rename to TBF/Forms/ResultsArrangementDlg.resx diff --git a/TestBenchFramework/Forms/TabNameDlg.Designer.cs b/TBF/Forms/TabNameDlg.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/TabNameDlg.Designer.cs rename to TBF/Forms/TabNameDlg.Designer.cs diff --git a/TestBenchFramework/Forms/TabNameDlg.cs b/TBF/Forms/TabNameDlg.cs similarity index 100% rename from TestBenchFramework/Forms/TabNameDlg.cs rename to TBF/Forms/TabNameDlg.cs diff --git a/TestBenchFramework/Forms/TabNameDlg.resx b/TBF/Forms/TabNameDlg.resx similarity index 100% rename from TestBenchFramework/Forms/TabNameDlg.resx rename to TBF/Forms/TabNameDlg.resx diff --git a/TestBenchFramework/Forms/UpgradeSelectionDlg.Designer.cs b/TBF/Forms/UpgradeSelectionDlg.Designer.cs similarity index 100% rename from TestBenchFramework/Forms/UpgradeSelectionDlg.Designer.cs rename to TBF/Forms/UpgradeSelectionDlg.Designer.cs diff --git a/TestBenchFramework/Forms/UpgradeSelectionDlg.cs b/TBF/Forms/UpgradeSelectionDlg.cs similarity index 100% rename from TestBenchFramework/Forms/UpgradeSelectionDlg.cs rename to TBF/Forms/UpgradeSelectionDlg.cs diff --git a/TestBenchFramework/Forms/UpgradeSelectionDlg.resx b/TBF/Forms/UpgradeSelectionDlg.resx similarity index 100% rename from TestBenchFramework/Forms/UpgradeSelectionDlg.resx rename to TBF/Forms/UpgradeSelectionDlg.resx diff --git a/TestBenchFramework/LocalSettings.cs b/TBF/LocalSettings.cs similarity index 100% rename from TestBenchFramework/LocalSettings.cs rename to TBF/LocalSettings.cs diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TBF/MainWnd.Designer.cs similarity index 100% rename from TestBenchFramework/MainWnd.Designer.cs rename to TBF/MainWnd.Designer.cs diff --git a/TestBenchFramework/MainWnd.cs b/TBF/MainWnd.cs similarity index 100% rename from TestBenchFramework/MainWnd.cs rename to TBF/MainWnd.cs diff --git a/TestBenchFramework/MainWnd.cs.resx b/TBF/MainWnd.cs.resx similarity index 100% rename from TestBenchFramework/MainWnd.cs.resx rename to TBF/MainWnd.cs.resx diff --git a/TestBenchFramework/MainWnd.de.resx b/TBF/MainWnd.de.resx similarity index 100% rename from TestBenchFramework/MainWnd.de.resx rename to TBF/MainWnd.de.resx diff --git a/TestBenchFramework/MainWnd.it.resx b/TBF/MainWnd.it.resx similarity index 100% rename from TestBenchFramework/MainWnd.it.resx rename to TBF/MainWnd.it.resx diff --git a/TestBenchFramework/MainWnd.pl.resx b/TBF/MainWnd.pl.resx similarity index 100% rename from TestBenchFramework/MainWnd.pl.resx rename to TBF/MainWnd.pl.resx diff --git a/TestBenchFramework/MainWnd.resx b/TBF/MainWnd.resx similarity index 100% rename from TestBenchFramework/MainWnd.resx rename to TBF/MainWnd.resx diff --git a/TestBenchFramework/MainWnd.ru.resx b/TBF/MainWnd.ru.resx similarity index 100% rename from TestBenchFramework/MainWnd.ru.resx rename to TBF/MainWnd.ru.resx diff --git a/TestBenchFramework/MainWnd.zh-CN.resx b/TBF/MainWnd.zh-CN.resx similarity index 100% rename from TestBenchFramework/MainWnd.zh-CN.resx rename to TBF/MainWnd.zh-CN.resx diff --git a/TestBenchFramework/MetrologyDlg.Designer.cs b/TBF/MetrologyDlg.Designer.cs similarity index 100% rename from TestBenchFramework/MetrologyDlg.Designer.cs rename to TBF/MetrologyDlg.Designer.cs diff --git a/TestBenchFramework/MetrologyDlg.cs b/TBF/MetrologyDlg.cs similarity index 100% rename from TestBenchFramework/MetrologyDlg.cs rename to TBF/MetrologyDlg.cs diff --git a/TestBenchFramework/MetrologyDlg.resx b/TBF/MetrologyDlg.resx similarity index 100% rename from TestBenchFramework/MetrologyDlg.resx rename to TBF/MetrologyDlg.resx diff --git a/TestBenchFramework/PathsDlg.Designer.cs b/TBF/PathsDlg.Designer.cs similarity index 100% rename from TestBenchFramework/PathsDlg.Designer.cs rename to TBF/PathsDlg.Designer.cs diff --git a/TestBenchFramework/PathsDlg.cs b/TBF/PathsDlg.cs similarity index 100% rename from TestBenchFramework/PathsDlg.cs rename to TBF/PathsDlg.cs diff --git a/TestBenchFramework/PathsDlg.pl.resx b/TBF/PathsDlg.pl.resx similarity index 100% rename from TestBenchFramework/PathsDlg.pl.resx rename to TBF/PathsDlg.pl.resx diff --git a/TestBenchFramework/PathsDlg.resx b/TBF/PathsDlg.resx similarity index 100% rename from TestBenchFramework/PathsDlg.resx rename to TBF/PathsDlg.resx diff --git a/TestBenchFramework/PathsDlg.ru.resx b/TBF/PathsDlg.ru.resx similarity index 100% rename from TestBenchFramework/PathsDlg.ru.resx rename to TBF/PathsDlg.ru.resx diff --git a/TestBenchFramework/PreferencesDlg.Designer.cs b/TBF/PreferencesDlg.Designer.cs similarity index 100% rename from TestBenchFramework/PreferencesDlg.Designer.cs rename to TBF/PreferencesDlg.Designer.cs diff --git a/TestBenchFramework/PreferencesDlg.cs b/TBF/PreferencesDlg.cs similarity index 100% rename from TestBenchFramework/PreferencesDlg.cs rename to TBF/PreferencesDlg.cs diff --git a/TestBenchFramework/PreferencesDlg.pl.resx b/TBF/PreferencesDlg.pl.resx similarity index 100% rename from TestBenchFramework/PreferencesDlg.pl.resx rename to TBF/PreferencesDlg.pl.resx diff --git a/TestBenchFramework/PreferencesDlg.resx b/TBF/PreferencesDlg.resx similarity index 100% rename from TestBenchFramework/PreferencesDlg.resx rename to TBF/PreferencesDlg.resx diff --git a/TestBenchFramework/PreferencesDlg.ru.resx b/TBF/PreferencesDlg.ru.resx similarity index 100% rename from TestBenchFramework/PreferencesDlg.ru.resx rename to TBF/PreferencesDlg.ru.resx diff --git a/TestBenchFramework/ProcedureDlg.Designer.cs b/TBF/ProcedureDlg.Designer.cs similarity index 100% rename from TestBenchFramework/ProcedureDlg.Designer.cs rename to TBF/ProcedureDlg.Designer.cs diff --git a/TestBenchFramework/ProcedureDlg.cs b/TBF/ProcedureDlg.cs similarity index 100% rename from TestBenchFramework/ProcedureDlg.cs rename to TBF/ProcedureDlg.cs diff --git a/TestBenchFramework/ProcedureDlg.pl.resx b/TBF/ProcedureDlg.pl.resx similarity index 100% rename from TestBenchFramework/ProcedureDlg.pl.resx rename to TBF/ProcedureDlg.pl.resx diff --git a/TestBenchFramework/ProcedureDlg.resx b/TBF/ProcedureDlg.resx similarity index 100% rename from TestBenchFramework/ProcedureDlg.resx rename to TBF/ProcedureDlg.resx diff --git a/TestBenchFramework/ProcedureDlg.ru.resx b/TBF/ProcedureDlg.ru.resx similarity index 100% rename from TestBenchFramework/ProcedureDlg.ru.resx rename to TBF/ProcedureDlg.ru.resx diff --git a/TestBenchFramework/ProceduresDlg.Designer.cs b/TBF/ProceduresDlg.Designer.cs similarity index 100% rename from TestBenchFramework/ProceduresDlg.Designer.cs rename to TBF/ProceduresDlg.Designer.cs diff --git a/TestBenchFramework/ProceduresDlg.cs b/TBF/ProceduresDlg.cs similarity index 100% rename from TestBenchFramework/ProceduresDlg.cs rename to TBF/ProceduresDlg.cs diff --git a/TestBenchFramework/ProceduresDlg.resx b/TBF/ProceduresDlg.resx similarity index 100% rename from TestBenchFramework/ProceduresDlg.resx rename to TBF/ProceduresDlg.resx diff --git a/TestBenchFramework/Program.cs b/TBF/Program.cs similarity index 100% rename from TestBenchFramework/Program.cs rename to TBF/Program.cs diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs similarity index 93% rename from TestBenchFramework/Properties/AssemblyInfo.cs rename to TBF/Properties/AssemblyInfo.cs index de3d19e40..d678b5766 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.788.0")] -[assembly: AssemblyFileVersion("2.18.788.0")] +[assembly: AssemblyVersion("2.18.789.0")] +[assembly: AssemblyFileVersion("2.18.789.0")] diff --git a/TestBenchFramework/Properties/Resources.Designer.cs b/TBF/Properties/Resources.Designer.cs similarity index 100% rename from TestBenchFramework/Properties/Resources.Designer.cs rename to TBF/Properties/Resources.Designer.cs diff --git a/TestBenchFramework/Properties/Resources.resx b/TBF/Properties/Resources.resx similarity index 100% rename from TestBenchFramework/Properties/Resources.resx rename to TBF/Properties/Resources.resx diff --git a/TestBenchFramework/Properties/Settings.Designer.cs b/TBF/Properties/Settings.Designer.cs similarity index 100% rename from TestBenchFramework/Properties/Settings.Designer.cs rename to TBF/Properties/Settings.Designer.cs diff --git a/TestBenchFramework/Properties/Settings.settings b/TBF/Properties/Settings.settings similarity index 100% rename from TestBenchFramework/Properties/Settings.settings rename to TBF/Properties/Settings.settings diff --git a/TestBenchFramework/Properties/app.manifest b/TBF/Properties/app.manifest similarity index 100% rename from TestBenchFramework/Properties/app.manifest rename to TBF/Properties/app.manifest diff --git a/TestBenchFramework/Resources/RoiStyle1.bmp b/TBF/Resources/RoiStyle1.bmp similarity index 100% rename from TestBenchFramework/Resources/RoiStyle1.bmp rename to TBF/Resources/RoiStyle1.bmp diff --git a/TestBenchFramework/Resources/RoiStyle2.bmp b/TBF/Resources/RoiStyle2.bmp similarity index 100% rename from TestBenchFramework/Resources/RoiStyle2.bmp rename to TBF/Resources/RoiStyle2.bmp diff --git a/TestBenchFramework/Resources/RoiStyle3.bmp b/TBF/Resources/RoiStyle3.bmp similarity index 100% rename from TestBenchFramework/Resources/RoiStyle3.bmp rename to TBF/Resources/RoiStyle3.bmp diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs similarity index 100% rename from TestBenchFramework/Resources/Strings.Designer.cs rename to TBF/Resources/Strings.Designer.cs diff --git a/TestBenchFramework/Resources/Strings.cs.Designer.cs b/TBF/Resources/Strings.cs.Designer.cs similarity index 100% rename from TestBenchFramework/Resources/Strings.cs.Designer.cs rename to TBF/Resources/Strings.cs.Designer.cs diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TBF/Resources/Strings.cs.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.cs.resx rename to TBF/Resources/Strings.cs.resx diff --git a/TestBenchFramework/Resources/Strings.de.Designer.cs b/TBF/Resources/Strings.de.Designer.cs similarity index 100% rename from TestBenchFramework/Resources/Strings.de.Designer.cs rename to TBF/Resources/Strings.de.Designer.cs diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TBF/Resources/Strings.de.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.de.resx rename to TBF/Resources/Strings.de.resx diff --git a/TestBenchFramework/Resources/Strings.es.resx b/TBF/Resources/Strings.es.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.es.resx rename to TBF/Resources/Strings.es.resx diff --git a/TestBenchFramework/Resources/Strings.fr.resx b/TBF/Resources/Strings.fr.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.fr.resx rename to TBF/Resources/Strings.fr.resx diff --git a/TestBenchFramework/Resources/Strings.it.resx b/TBF/Resources/Strings.it.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.it.resx rename to TBF/Resources/Strings.it.resx diff --git a/TestBenchFramework/Resources/Strings.pl.resx b/TBF/Resources/Strings.pl.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.pl.resx rename to TBF/Resources/Strings.pl.resx diff --git a/TestBenchFramework/Resources/Strings.resx b/TBF/Resources/Strings.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.resx rename to TBF/Resources/Strings.resx diff --git a/TestBenchFramework/Resources/Strings.ro.resx b/TBF/Resources/Strings.ro.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.ro.resx rename to TBF/Resources/Strings.ro.resx diff --git a/TestBenchFramework/Resources/Strings.ru.resx b/TBF/Resources/Strings.ru.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.ru.resx rename to TBF/Resources/Strings.ru.resx diff --git a/TestBenchFramework/Resources/Strings.sk.resx b/TBF/Resources/Strings.sk.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.sk.resx rename to TBF/Resources/Strings.sk.resx diff --git a/TestBenchFramework/Resources/Strings.zh-CN.Designer.cs b/TBF/Resources/Strings.zh-CN.Designer.cs similarity index 100% rename from TestBenchFramework/Resources/Strings.zh-CN.Designer.cs rename to TBF/Resources/Strings.zh-CN.Designer.cs diff --git a/TestBenchFramework/Resources/Strings.zh-CN.resx b/TBF/Resources/Strings.zh-CN.resx similarity index 100% rename from TestBenchFramework/Resources/Strings.zh-CN.resx rename to TBF/Resources/Strings.zh-CN.resx diff --git a/TestBenchFramework/Resources/TestFailedImage.png b/TBF/Resources/TestFailedImage.png similarity index 100% rename from TestBenchFramework/Resources/TestFailedImage.png rename to TBF/Resources/TestFailedImage.png diff --git a/TestBenchFramework/Resources/TestFailedImage2.png b/TBF/Resources/TestFailedImage2.png similarity index 100% rename from TestBenchFramework/Resources/TestFailedImage2.png rename to TBF/Resources/TestFailedImage2.png diff --git a/TestBenchFramework/Resources/TestNotDoneImage.png b/TBF/Resources/TestNotDoneImage.png similarity index 100% rename from TestBenchFramework/Resources/TestNotDoneImage.png rename to TBF/Resources/TestNotDoneImage.png diff --git a/TestBenchFramework/Resources/TestPassedImage.png b/TBF/Resources/TestPassedImage.png similarity index 100% rename from TestBenchFramework/Resources/TestPassedImage.png rename to TBF/Resources/TestPassedImage.png diff --git a/TestBenchFramework/Resources/TestPassedImage2.png b/TBF/Resources/TestPassedImage2.png similarity index 100% rename from TestBenchFramework/Resources/TestPassedImage2.png rename to TBF/Resources/TestPassedImage2.png diff --git a/TestBenchFramework/Resources/empty.png b/TBF/Resources/empty.png similarity index 100% rename from TestBenchFramework/Resources/empty.png rename to TBF/Resources/empty.png diff --git a/TestBenchFramework/Resources/sensus-logo.png b/TBF/Resources/sensus-logo.png similarity index 100% rename from TestBenchFramework/Resources/sensus-logo.png rename to TBF/Resources/sensus-logo.png diff --git a/TestBenchFramework/Resources/switch-off.png b/TBF/Resources/switch-off.png similarity index 100% rename from TestBenchFramework/Resources/switch-off.png rename to TBF/Resources/switch-off.png diff --git a/TestBenchFramework/Resources/switch-on.png b/TBF/Resources/switch-on.png similarity index 100% rename from TestBenchFramework/Resources/switch-on.png rename to TBF/Resources/switch-on.png diff --git a/TestBenchFramework/SampleConfig/SQLite.db b/TBF/SampleConfig/SQLite.db similarity index 100% rename from TestBenchFramework/SampleConfig/SQLite.db rename to TBF/SampleConfig/SQLite.db diff --git a/TestBenchFramework/SampleConfig/config.xml b/TBF/SampleConfig/config.xml similarity index 100% rename from TestBenchFramework/SampleConfig/config.xml rename to TBF/SampleConfig/config.xml diff --git a/TestBenchFramework/SampleConfig/fuzhou150.sql b/TBF/SampleConfig/fuzhou150.sql similarity index 100% rename from TestBenchFramework/SampleConfig/fuzhou150.sql rename to TBF/SampleConfig/fuzhou150.sql diff --git a/TestBenchFramework/SampleConfig/gwz-1-new.sql b/TBF/SampleConfig/gwz-1-new.sql similarity index 100% rename from TestBenchFramework/SampleConfig/gwz-1-new.sql rename to TBF/SampleConfig/gwz-1-new.sql diff --git a/TestBenchFramework/SampleConfig/log4netConfig.xml b/TBF/SampleConfig/log4netConfig.xml similarity index 100% rename from TestBenchFramework/SampleConfig/log4netConfig.xml rename to TBF/SampleConfig/log4netConfig.xml diff --git a/TestBenchFramework/SampleConfig/munich-gwz-1.sql b/TBF/SampleConfig/munich-gwz-1.sql similarity index 100% rename from TestBenchFramework/SampleConfig/munich-gwz-1.sql rename to TBF/SampleConfig/munich-gwz-1.sql diff --git a/TestBenchFramework/SampleConfig/sensus.sql b/TBF/SampleConfig/sensus.sql similarity index 100% rename from TestBenchFramework/SampleConfig/sensus.sql rename to TBF/SampleConfig/sensus.sql diff --git a/TestBenchFramework/Screens/GraphsTabPageCtrl.cs b/TBF/Screens/GraphsTabPageCtrl.cs similarity index 100% rename from TestBenchFramework/Screens/GraphsTabPageCtrl.cs rename to TBF/Screens/GraphsTabPageCtrl.cs diff --git a/TestBenchFramework/Screens/GraphsTabPageCtrl.designer.cs b/TBF/Screens/GraphsTabPageCtrl.designer.cs similarity index 100% rename from TestBenchFramework/Screens/GraphsTabPageCtrl.designer.cs rename to TBF/Screens/GraphsTabPageCtrl.designer.cs diff --git a/TestBenchFramework/Screens/GraphsTabPageCtrl.resx b/TBF/Screens/GraphsTabPageCtrl.resx similarity index 100% rename from TestBenchFramework/Screens/GraphsTabPageCtrl.resx rename to TBF/Screens/GraphsTabPageCtrl.resx diff --git a/TestBenchFramework/Screens/LogsTabPageCtrl.Designer.cs b/TBF/Screens/LogsTabPageCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/Screens/LogsTabPageCtrl.Designer.cs rename to TBF/Screens/LogsTabPageCtrl.Designer.cs diff --git a/TestBenchFramework/Screens/LogsTabPageCtrl.cs b/TBF/Screens/LogsTabPageCtrl.cs similarity index 100% rename from TestBenchFramework/Screens/LogsTabPageCtrl.cs rename to TBF/Screens/LogsTabPageCtrl.cs diff --git a/TestBenchFramework/Screens/LogsTabPageCtrl.resx b/TBF/Screens/LogsTabPageCtrl.resx similarity index 100% rename from TestBenchFramework/Screens/LogsTabPageCtrl.resx rename to TBF/Screens/LogsTabPageCtrl.resx diff --git a/TestBenchFramework/Screens/MeasurementTabPageCtrl.Designer.cs b/TBF/Screens/MeasurementTabPageCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/Screens/MeasurementTabPageCtrl.Designer.cs rename to TBF/Screens/MeasurementTabPageCtrl.Designer.cs diff --git a/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs b/TBF/Screens/MeasurementTabPageCtrl.cs similarity index 100% rename from TestBenchFramework/Screens/MeasurementTabPageCtrl.cs rename to TBF/Screens/MeasurementTabPageCtrl.cs diff --git a/TestBenchFramework/Screens/MeasurementTabPageCtrl.resx b/TBF/Screens/MeasurementTabPageCtrl.resx similarity index 100% rename from TestBenchFramework/Screens/MeasurementTabPageCtrl.resx rename to TBF/Screens/MeasurementTabPageCtrl.resx diff --git a/TestBenchFramework/Screens/PicturesTabPageCtrl.Designer.cs b/TBF/Screens/PicturesTabPageCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/Screens/PicturesTabPageCtrl.Designer.cs rename to TBF/Screens/PicturesTabPageCtrl.Designer.cs diff --git a/TestBenchFramework/Screens/PicturesTabPageCtrl.cs b/TBF/Screens/PicturesTabPageCtrl.cs similarity index 100% rename from TestBenchFramework/Screens/PicturesTabPageCtrl.cs rename to TBF/Screens/PicturesTabPageCtrl.cs diff --git a/TestBenchFramework/Screens/PicturesTabPageCtrl.resx b/TBF/Screens/PicturesTabPageCtrl.resx similarity index 100% rename from TestBenchFramework/Screens/PicturesTabPageCtrl.resx rename to TBF/Screens/PicturesTabPageCtrl.resx diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl24.Designer.cs b/TBF/Screens/ProcessTabPageCtrl24.Designer.cs similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl24.Designer.cs rename to TBF/Screens/ProcessTabPageCtrl24.Designer.cs diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs b/TBF/Screens/ProcessTabPageCtrl24.cs similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl24.cs rename to TBF/Screens/ProcessTabPageCtrl24.cs diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl24.resx b/TBF/Screens/ProcessTabPageCtrl24.resx similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl24.resx rename to TBF/Screens/ProcessTabPageCtrl24.resx diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl48.Designer.cs b/TBF/Screens/ProcessTabPageCtrl48.Designer.cs similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl48.Designer.cs rename to TBF/Screens/ProcessTabPageCtrl48.Designer.cs diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl48.cs b/TBF/Screens/ProcessTabPageCtrl48.cs similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl48.cs rename to TBF/Screens/ProcessTabPageCtrl48.cs diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl48.resx b/TBF/Screens/ProcessTabPageCtrl48.resx similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl48.resx rename to TBF/Screens/ProcessTabPageCtrl48.resx diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl6.Designer.cs b/TBF/Screens/ProcessTabPageCtrl6.Designer.cs similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl6.Designer.cs rename to TBF/Screens/ProcessTabPageCtrl6.Designer.cs diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl6.cs b/TBF/Screens/ProcessTabPageCtrl6.cs similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl6.cs rename to TBF/Screens/ProcessTabPageCtrl6.cs diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl6.resx b/TBF/Screens/ProcessTabPageCtrl6.resx similarity index 100% rename from TestBenchFramework/Screens/ProcessTabPageCtrl6.resx rename to TBF/Screens/ProcessTabPageCtrl6.resx diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs b/TBF/Screens/ResultsTabPageCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs rename to TBF/Screens/ResultsTabPageCtrl.Designer.cs diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TBF/Screens/ResultsTabPageCtrl.cs similarity index 100% rename from TestBenchFramework/Screens/ResultsTabPageCtrl.cs rename to TBF/Screens/ResultsTabPageCtrl.cs diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.resx b/TBF/Screens/ResultsTabPageCtrl.resx similarity index 100% rename from TestBenchFramework/Screens/ResultsTabPageCtrl.resx rename to TBF/Screens/ResultsTabPageCtrl.resx diff --git a/TestBenchFramework/SelectComponentClassDlg.Designer.cs b/TBF/SelectComponentClassDlg.Designer.cs similarity index 100% rename from TestBenchFramework/SelectComponentClassDlg.Designer.cs rename to TBF/SelectComponentClassDlg.Designer.cs diff --git a/TestBenchFramework/SelectComponentClassDlg.cs b/TBF/SelectComponentClassDlg.cs similarity index 100% rename from TestBenchFramework/SelectComponentClassDlg.cs rename to TBF/SelectComponentClassDlg.cs diff --git a/TestBenchFramework/SelectComponentClassDlg.pl.resx b/TBF/SelectComponentClassDlg.pl.resx similarity index 100% rename from TestBenchFramework/SelectComponentClassDlg.pl.resx rename to TBF/SelectComponentClassDlg.pl.resx diff --git a/TestBenchFramework/SelectComponentClassDlg.resx b/TBF/SelectComponentClassDlg.resx similarity index 100% rename from TestBenchFramework/SelectComponentClassDlg.resx rename to TBF/SelectComponentClassDlg.resx diff --git a/TestBenchFramework/SelectComponentClassDlg.ru.resx b/TBF/SelectComponentClassDlg.ru.resx similarity index 100% rename from TestBenchFramework/SelectComponentClassDlg.ru.resx rename to TBF/SelectComponentClassDlg.ru.resx diff --git a/TestBenchFramework/Strings.Designer.cs b/TBF/Strings.Designer.cs similarity index 100% rename from TestBenchFramework/Strings.Designer.cs rename to TBF/Strings.Designer.cs diff --git a/TestBenchFramework/TBF.csproj b/TBF/TBF.csproj similarity index 100% rename from TestBenchFramework/TBF.csproj rename to TBF/TBF.csproj diff --git a/TestBenchFramework/TBF.csproj.user b/TBF/TBF.csproj.user similarity index 100% rename from TestBenchFramework/TBF.csproj.user rename to TBF/TBF.csproj.user diff --git a/TestBenchFramework/TBF_TemporaryKey.pfx b/TBF/TBF_TemporaryKey.pfx similarity index 100% rename from TestBenchFramework/TBF_TemporaryKey.pfx rename to TBF/TBF_TemporaryKey.pfx diff --git a/TestBenchFramework/Telegram.cs b/TBF/Telegram.cs similarity index 100% rename from TestBenchFramework/Telegram.cs rename to TBF/Telegram.cs diff --git a/TestBenchFramework/TestProgressControls.cs b/TBF/TestProgressControls.cs similarity index 100% rename from TestBenchFramework/TestProgressControls.cs rename to TBF/TestProgressControls.cs diff --git a/TestBenchFramework/TestWizard/FlowSelection.Designer.cs b/TBF/TestWizard/FlowSelection.Designer.cs similarity index 100% rename from TestBenchFramework/TestWizard/FlowSelection.Designer.cs rename to TBF/TestWizard/FlowSelection.Designer.cs diff --git a/TestBenchFramework/TestWizard/FlowSelection.cs b/TBF/TestWizard/FlowSelection.cs similarity index 100% rename from TestBenchFramework/TestWizard/FlowSelection.cs rename to TBF/TestWizard/FlowSelection.cs diff --git a/TestBenchFramework/TestWizard/FlowSelection.resx b/TBF/TestWizard/FlowSelection.resx similarity index 100% rename from TestBenchFramework/TestWizard/FlowSelection.resx rename to TBF/TestWizard/FlowSelection.resx diff --git a/TestBenchFramework/TestWizard/HeatMetersSelection.Designer.cs b/TBF/TestWizard/HeatMetersSelection.Designer.cs similarity index 100% rename from TestBenchFramework/TestWizard/HeatMetersSelection.Designer.cs rename to TBF/TestWizard/HeatMetersSelection.Designer.cs diff --git a/TestBenchFramework/TestWizard/HeatMetersSelection.cs b/TBF/TestWizard/HeatMetersSelection.cs similarity index 100% rename from TestBenchFramework/TestWizard/HeatMetersSelection.cs rename to TBF/TestWizard/HeatMetersSelection.cs diff --git a/TestBenchFramework/TestWizard/HeatMetersSelection.resx b/TBF/TestWizard/HeatMetersSelection.resx similarity index 100% rename from TestBenchFramework/TestWizard/HeatMetersSelection.resx rename to TBF/TestWizard/HeatMetersSelection.resx diff --git a/TestBenchFramework/TestWizard/MethodSelection.Designer.cs b/TBF/TestWizard/MethodSelection.Designer.cs similarity index 100% rename from TestBenchFramework/TestWizard/MethodSelection.Designer.cs rename to TBF/TestWizard/MethodSelection.Designer.cs diff --git a/TestBenchFramework/TestWizard/MethodSelection.cs b/TBF/TestWizard/MethodSelection.cs similarity index 100% rename from TestBenchFramework/TestWizard/MethodSelection.cs rename to TBF/TestWizard/MethodSelection.cs diff --git a/TestBenchFramework/TestWizard/MethodSelection.resx b/TBF/TestWizard/MethodSelection.resx similarity index 100% rename from TestBenchFramework/TestWizard/MethodSelection.resx rename to TBF/TestWizard/MethodSelection.resx diff --git a/TestBenchFramework/TestWizard/PressureSelection.cs b/TBF/TestWizard/PressureSelection.cs similarity index 100% rename from TestBenchFramework/TestWizard/PressureSelection.cs rename to TBF/TestWizard/PressureSelection.cs diff --git a/TestBenchFramework/TestWizard/PressureSelection.designer.cs b/TBF/TestWizard/PressureSelection.designer.cs similarity index 100% rename from TestBenchFramework/TestWizard/PressureSelection.designer.cs rename to TBF/TestWizard/PressureSelection.designer.cs diff --git a/TestBenchFramework/TestWizard/PressureSelection.resx b/TBF/TestWizard/PressureSelection.resx similarity index 100% rename from TestBenchFramework/TestWizard/PressureSelection.resx rename to TBF/TestWizard/PressureSelection.resx diff --git a/TestBenchFramework/TestWizard/Roi1.Designer.cs b/TBF/TestWizard/Roi1.Designer.cs similarity index 100% rename from TestBenchFramework/TestWizard/Roi1.Designer.cs rename to TBF/TestWizard/Roi1.Designer.cs diff --git a/TestBenchFramework/TestWizard/Roi1.cs b/TBF/TestWizard/Roi1.cs similarity index 100% rename from TestBenchFramework/TestWizard/Roi1.cs rename to TBF/TestWizard/Roi1.cs diff --git a/TestBenchFramework/TestWizard/Roi1.resx b/TBF/TestWizard/Roi1.resx similarity index 100% rename from TestBenchFramework/TestWizard/Roi1.resx rename to TBF/TestWizard/Roi1.resx diff --git a/TestBenchFramework/TestWizard/Roi2.Designer.cs b/TBF/TestWizard/Roi2.Designer.cs similarity index 100% rename from TestBenchFramework/TestWizard/Roi2.Designer.cs rename to TBF/TestWizard/Roi2.Designer.cs diff --git a/TestBenchFramework/TestWizard/Roi2.cs b/TBF/TestWizard/Roi2.cs similarity index 100% rename from TestBenchFramework/TestWizard/Roi2.cs rename to TBF/TestWizard/Roi2.cs diff --git a/TestBenchFramework/TestWizard/Roi2.resx b/TBF/TestWizard/Roi2.resx similarity index 100% rename from TestBenchFramework/TestWizard/Roi2.resx rename to TBF/TestWizard/Roi2.resx diff --git a/TestBenchFramework/TestWizard/Roi3.Designer.cs b/TBF/TestWizard/Roi3.Designer.cs similarity index 100% rename from TestBenchFramework/TestWizard/Roi3.Designer.cs rename to TBF/TestWizard/Roi3.Designer.cs diff --git a/TestBenchFramework/TestWizard/Roi3.cs b/TBF/TestWizard/Roi3.cs similarity index 100% rename from TestBenchFramework/TestWizard/Roi3.cs rename to TBF/TestWizard/Roi3.cs diff --git a/TestBenchFramework/TestWizard/Roi3.resx b/TBF/TestWizard/Roi3.resx similarity index 100% rename from TestBenchFramework/TestWizard/Roi3.resx rename to TBF/TestWizard/Roi3.resx diff --git a/TestBenchFramework/TestWizard/RoiData.cs b/TBF/TestWizard/RoiData.cs similarity index 100% rename from TestBenchFramework/TestWizard/RoiData.cs rename to TBF/TestWizard/RoiData.cs diff --git a/TestBenchFramework/TestWizard/VolumeAndErrorSelection.Designer.cs b/TBF/TestWizard/VolumeAndErrorSelection.Designer.cs similarity index 100% rename from TestBenchFramework/TestWizard/VolumeAndErrorSelection.Designer.cs rename to TBF/TestWizard/VolumeAndErrorSelection.Designer.cs diff --git a/TestBenchFramework/TestWizard/VolumeAndErrorSelection.cs b/TBF/TestWizard/VolumeAndErrorSelection.cs similarity index 100% rename from TestBenchFramework/TestWizard/VolumeAndErrorSelection.cs rename to TBF/TestWizard/VolumeAndErrorSelection.cs diff --git a/TestBenchFramework/TestWizard/VolumeAndErrorSelection.resx b/TBF/TestWizard/VolumeAndErrorSelection.resx similarity index 100% rename from TestBenchFramework/TestWizard/VolumeAndErrorSelection.resx rename to TBF/TestWizard/VolumeAndErrorSelection.resx diff --git a/TestBenchFramework/Tools/ByteFormatter.cs b/TBF/Tools/ByteFormatter.cs similarity index 100% rename from TestBenchFramework/Tools/ByteFormatter.cs rename to TBF/Tools/ByteFormatter.cs diff --git a/TestBenchFramework/Tools/IniUtil.cs b/TBF/Tools/IniUtil.cs similarity index 100% rename from TestBenchFramework/Tools/IniUtil.cs rename to TBF/Tools/IniUtil.cs diff --git a/TestBenchFramework/Tools/XmlTools.cs b/TBF/Tools/XmlTools.cs similarity index 100% rename from TestBenchFramework/Tools/XmlTools.cs rename to TBF/Tools/XmlTools.cs diff --git a/TestBenchFramework/TransitionsDlg.Designer.cs b/TBF/TransitionsDlg.Designer.cs similarity index 100% rename from TestBenchFramework/TransitionsDlg.Designer.cs rename to TBF/TransitionsDlg.Designer.cs diff --git a/TestBenchFramework/TransitionsDlg.cs b/TBF/TransitionsDlg.cs similarity index 100% rename from TestBenchFramework/TransitionsDlg.cs rename to TBF/TransitionsDlg.cs diff --git a/TestBenchFramework/TransitionsDlg.pl.resx b/TBF/TransitionsDlg.pl.resx similarity index 100% rename from TestBenchFramework/TransitionsDlg.pl.resx rename to TBF/TransitionsDlg.pl.resx diff --git a/TestBenchFramework/TransitionsDlg.resx b/TBF/TransitionsDlg.resx similarity index 100% rename from TestBenchFramework/TransitionsDlg.resx rename to TBF/TransitionsDlg.resx diff --git a/TestBenchFramework/TransitionsDlg.ru.resx b/TBF/TransitionsDlg.ru.resx similarity index 100% rename from TestBenchFramework/TransitionsDlg.ru.resx rename to TBF/TransitionsDlg.ru.resx diff --git a/TestBenchFramework/UiBridge/ActivityEventArgs.cs b/TBF/UiBridge/ActivityEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/ActivityEventArgs.cs rename to TBF/UiBridge/ActivityEventArgs.cs diff --git a/TestBenchFramework/UiBridge/AdjustmentInProgressEventArgs.cs b/TBF/UiBridge/AdjustmentInProgressEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/AdjustmentInProgressEventArgs.cs rename to TBF/UiBridge/AdjustmentInProgressEventArgs.cs diff --git a/TestBenchFramework/UiBridge/Bridge.cs b/TBF/UiBridge/Bridge.cs similarity index 100% rename from TestBenchFramework/UiBridge/Bridge.cs rename to TBF/UiBridge/Bridge.cs diff --git a/TestBenchFramework/UiBridge/ButtonsEtcEventArgs.cs b/TBF/UiBridge/ButtonsEtcEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/ButtonsEtcEventArgs.cs rename to TBF/UiBridge/ButtonsEtcEventArgs.cs diff --git a/TestBenchFramework/UiBridge/CameraInfoEventArgs.cs b/TBF/UiBridge/CameraInfoEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/CameraInfoEventArgs.cs rename to TBF/UiBridge/CameraInfoEventArgs.cs diff --git a/TestBenchFramework/UiBridge/CameraUICmdEventArgs.cs b/TBF/UiBridge/CameraUICmdEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/CameraUICmdEventArgs.cs rename to TBF/UiBridge/CameraUICmdEventArgs.cs diff --git a/TestBenchFramework/UiBridge/EmergencyStopEventArgs.cs b/TBF/UiBridge/EmergencyStopEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/EmergencyStopEventArgs.cs rename to TBF/UiBridge/EmergencyStopEventArgs.cs diff --git a/TestBenchFramework/UiBridge/Enums.cs b/TBF/UiBridge/Enums.cs similarity index 100% rename from TestBenchFramework/UiBridge/Enums.cs rename to TBF/UiBridge/Enums.cs diff --git a/TestBenchFramework/UiBridge/ImageEventArgs.cs b/TBF/UiBridge/ImageEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/ImageEventArgs.cs rename to TBF/UiBridge/ImageEventArgs.cs diff --git a/TestBenchFramework/UiBridge/LogEventArgs.cs b/TBF/UiBridge/LogEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/LogEventArgs.cs rename to TBF/UiBridge/LogEventArgs.cs diff --git a/TestBenchFramework/UiBridge/ProcedureCompletedEventArgs.cs b/TBF/UiBridge/ProcedureCompletedEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/ProcedureCompletedEventArgs.cs rename to TBF/UiBridge/ProcedureCompletedEventArgs.cs diff --git a/TestBenchFramework/UiBridge/ProcedureSelectedEventArgs.cs b/TBF/UiBridge/ProcedureSelectedEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/ProcedureSelectedEventArgs.cs rename to TBF/UiBridge/ProcedureSelectedEventArgs.cs diff --git a/TestBenchFramework/UiBridge/ProcessDataEventArgs.cs b/TBF/UiBridge/ProcessDataEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/ProcessDataEventArgs.cs rename to TBF/UiBridge/ProcessDataEventArgs.cs diff --git a/TestBenchFramework/UiBridge/StateChangedEventArgs.cs b/TBF/UiBridge/StateChangedEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/StateChangedEventArgs.cs rename to TBF/UiBridge/StateChangedEventArgs.cs diff --git a/TestBenchFramework/UiBridge/TestCompletedEventArgs.cs b/TBF/UiBridge/TestCompletedEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/TestCompletedEventArgs.cs rename to TBF/UiBridge/TestCompletedEventArgs.cs diff --git a/TestBenchFramework/UiBridge/TestProgressEventArgs.cs b/TBF/UiBridge/TestProgressEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/TestProgressEventArgs.cs rename to TBF/UiBridge/TestProgressEventArgs.cs diff --git a/TestBenchFramework/UiBridge/TestSelectedEventArgs.cs b/TBF/UiBridge/TestSelectedEventArgs.cs similarity index 100% rename from TestBenchFramework/UiBridge/TestSelectedEventArgs.cs rename to TBF/UiBridge/TestSelectedEventArgs.cs diff --git a/TestBenchFramework/UiControls/BaseWithListViewEx.cs b/TBF/UiControls/BaseWithListViewEx.cs similarity index 100% rename from TestBenchFramework/UiControls/BaseWithListViewEx.cs rename to TBF/UiControls/BaseWithListViewEx.cs diff --git a/TestBenchFramework/UiControls/BenchControlPanel.Designer.cs b/TBF/UiControls/BenchControlPanel.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.Designer.cs rename to TBF/UiControls/BenchControlPanel.Designer.cs diff --git a/TestBenchFramework/UiControls/BenchControlPanel.cs b/TBF/UiControls/BenchControlPanel.cs similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.cs rename to TBF/UiControls/BenchControlPanel.cs diff --git a/TestBenchFramework/UiControls/BenchControlPanel.cs.resx b/TBF/UiControls/BenchControlPanel.cs.resx similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.cs.resx rename to TBF/UiControls/BenchControlPanel.cs.resx diff --git a/TestBenchFramework/UiControls/BenchControlPanel.de.resx b/TBF/UiControls/BenchControlPanel.de.resx similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.de.resx rename to TBF/UiControls/BenchControlPanel.de.resx diff --git a/TestBenchFramework/UiControls/BenchControlPanel.it.resx b/TBF/UiControls/BenchControlPanel.it.resx similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.it.resx rename to TBF/UiControls/BenchControlPanel.it.resx diff --git a/TestBenchFramework/UiControls/BenchControlPanel.pl.resx b/TBF/UiControls/BenchControlPanel.pl.resx similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.pl.resx rename to TBF/UiControls/BenchControlPanel.pl.resx diff --git a/TestBenchFramework/UiControls/BenchControlPanel.resx b/TBF/UiControls/BenchControlPanel.resx similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.resx rename to TBF/UiControls/BenchControlPanel.resx diff --git a/TestBenchFramework/UiControls/BenchControlPanel.ru.resx b/TBF/UiControls/BenchControlPanel.ru.resx similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.ru.resx rename to TBF/UiControls/BenchControlPanel.ru.resx diff --git a/TestBenchFramework/UiControls/BenchControlPanel.zh-CN.resx b/TBF/UiControls/BenchControlPanel.zh-CN.resx similarity index 100% rename from TestBenchFramework/UiControls/BenchControlPanel.zh-CN.resx rename to TBF/UiControls/BenchControlPanel.zh-CN.resx diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl.Designer.cs b/TBF/UiControls/CameraPictureCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl.Designer.cs rename to TBF/UiControls/CameraPictureCtrl.Designer.cs diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl.cs b/TBF/UiControls/CameraPictureCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl.cs rename to TBF/UiControls/CameraPictureCtrl.cs diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl.resx b/TBF/UiControls/CameraPictureCtrl.resx similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl.resx rename to TBF/UiControls/CameraPictureCtrl.resx diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl2.Designer.cs b/TBF/UiControls/CameraPictureCtrl2.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl2.Designer.cs rename to TBF/UiControls/CameraPictureCtrl2.Designer.cs diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl2.cs b/TBF/UiControls/CameraPictureCtrl2.cs similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl2.cs rename to TBF/UiControls/CameraPictureCtrl2.cs diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl2.resx b/TBF/UiControls/CameraPictureCtrl2.resx similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl2.resx rename to TBF/UiControls/CameraPictureCtrl2.resx diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl3.Designer.cs b/TBF/UiControls/CameraPictureCtrl3.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl3.Designer.cs rename to TBF/UiControls/CameraPictureCtrl3.Designer.cs diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl3.cs b/TBF/UiControls/CameraPictureCtrl3.cs similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl3.cs rename to TBF/UiControls/CameraPictureCtrl3.cs diff --git a/TestBenchFramework/UiControls/CameraPictureCtrl3.resx b/TBF/UiControls/CameraPictureCtrl3.resx similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureCtrl3.resx rename to TBF/UiControls/CameraPictureCtrl3.resx diff --git a/TestBenchFramework/UiControls/CameraPictureFullCtrl.Designer.cs b/TBF/UiControls/CameraPictureFullCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureFullCtrl.Designer.cs rename to TBF/UiControls/CameraPictureFullCtrl.Designer.cs diff --git a/TestBenchFramework/UiControls/CameraPictureFullCtrl.cs b/TBF/UiControls/CameraPictureFullCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureFullCtrl.cs rename to TBF/UiControls/CameraPictureFullCtrl.cs diff --git a/TestBenchFramework/UiControls/CameraPictureFullCtrl.resx b/TBF/UiControls/CameraPictureFullCtrl.resx similarity index 100% rename from TestBenchFramework/UiControls/CameraPictureFullCtrl.resx rename to TBF/UiControls/CameraPictureFullCtrl.resx diff --git a/TestBenchFramework/UiControls/ICameraPicture.cs b/TBF/UiControls/ICameraPicture.cs similarity index 100% rename from TestBenchFramework/UiControls/ICameraPicture.cs rename to TBF/UiControls/ICameraPicture.cs diff --git a/TestBenchFramework/UiControls/IMetrologyDlgTab.cs b/TBF/UiControls/IMetrologyDlgTab.cs similarity index 100% rename from TestBenchFramework/UiControls/IMetrologyDlgTab.cs rename to TBF/UiControls/IMetrologyDlgTab.cs diff --git a/TestBenchFramework/UiControls/IParentOfListViewEx.cs b/TBF/UiControls/IParentOfListViewEx.cs similarity index 100% rename from TestBenchFramework/UiControls/IParentOfListViewEx.cs rename to TBF/UiControls/IParentOfListViewEx.cs diff --git a/TestBenchFramework/UiControls/ITabWithListViewEx.cs b/TBF/UiControls/ITabWithListViewEx.cs similarity index 100% rename from TestBenchFramework/UiControls/ITabWithListViewEx.cs rename to TBF/UiControls/ITabWithListViewEx.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs b/TBF/UiControls/MetrologyDlgBalanceTab.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgBalanceTab.Designer.cs rename to TBF/UiControls/MetrologyDlgBalanceTab.Designer.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs b/TBF/UiControls/MetrologyDlgBalanceTab.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgBalanceTab.cs rename to TBF/UiControls/MetrologyDlgBalanceTab.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgBalanceTab.resx b/TBF/UiControls/MetrologyDlgBalanceTab.resx similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgBalanceTab.resx rename to TBF/UiControls/MetrologyDlgBalanceTab.resx diff --git a/TestBenchFramework/UiControls/MetrologyDlgDensityTab.Designer.cs b/TBF/UiControls/MetrologyDlgDensityTab.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgDensityTab.Designer.cs rename to TBF/UiControls/MetrologyDlgDensityTab.Designer.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgDensityTab.cs b/TBF/UiControls/MetrologyDlgDensityTab.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgDensityTab.cs rename to TBF/UiControls/MetrologyDlgDensityTab.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgDensityTab.resx b/TBF/UiControls/MetrologyDlgDensityTab.resx similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgDensityTab.resx rename to TBF/UiControls/MetrologyDlgDensityTab.resx diff --git a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.Designer.cs b/TBF/UiControls/MetrologyDlgFlowMeterTab.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.Designer.cs rename to TBF/UiControls/MetrologyDlgFlowMeterTab.Designer.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs b/TBF/UiControls/MetrologyDlgFlowMeterTab.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.cs rename to TBF/UiControls/MetrologyDlgFlowMeterTab.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.resx b/TBF/UiControls/MetrologyDlgFlowMeterTab.resx similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgFlowMeterTab.resx rename to TBF/UiControls/MetrologyDlgFlowMeterTab.resx diff --git a/TestBenchFramework/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs b/TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs rename to TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.cs b/TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.cs rename to TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.resx b/TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.resx similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.resx rename to TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.resx diff --git a/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.Designer.cs b/TBF/UiControls/MetrologyDlgPressMeterTab.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.Designer.cs rename to TBF/UiControls/MetrologyDlgPressMeterTab.Designer.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.cs b/TBF/UiControls/MetrologyDlgPressMeterTab.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.cs rename to TBF/UiControls/MetrologyDlgPressMeterTab.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.resx b/TBF/UiControls/MetrologyDlgPressMeterTab.resx similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgPressMeterTab.resx rename to TBF/UiControls/MetrologyDlgPressMeterTab.resx diff --git a/TestBenchFramework/UiControls/MetrologyDlgTempMeterTab.Designer.cs b/TBF/UiControls/MetrologyDlgTempMeterTab.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgTempMeterTab.Designer.cs rename to TBF/UiControls/MetrologyDlgTempMeterTab.Designer.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgTempMeterTab.cs b/TBF/UiControls/MetrologyDlgTempMeterTab.cs similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgTempMeterTab.cs rename to TBF/UiControls/MetrologyDlgTempMeterTab.cs diff --git a/TestBenchFramework/UiControls/MetrologyDlgTempMeterTab.resx b/TBF/UiControls/MetrologyDlgTempMeterTab.resx similarity index 100% rename from TestBenchFramework/UiControls/MetrologyDlgTempMeterTab.resx rename to TBF/UiControls/MetrologyDlgTempMeterTab.resx diff --git a/TestBenchFramework/UiControls/PathsBenchCtrl.cs b/TBF/UiControls/PathsBenchCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/PathsBenchCtrl.cs rename to TBF/UiControls/PathsBenchCtrl.cs diff --git a/TestBenchFramework/UiControls/PathsFeedingCtrl.cs b/TBF/UiControls/PathsFeedingCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/PathsFeedingCtrl.cs rename to TBF/UiControls/PathsFeedingCtrl.cs diff --git a/TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs b/TBF/UiControls/PathsHeatMetersCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/PathsHeatMetersCtrl.cs rename to TBF/UiControls/PathsHeatMetersCtrl.cs diff --git a/TestBenchFramework/UiControls/PathsMetersCtrl.cs b/TBF/UiControls/PathsMetersCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/PathsMetersCtrl.cs rename to TBF/UiControls/PathsMetersCtrl.cs diff --git a/TestBenchFramework/UiControls/PathsOutputCtrl.cs b/TBF/UiControls/PathsOutputCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/PathsOutputCtrl.cs rename to TBF/UiControls/PathsOutputCtrl.cs diff --git a/TestBenchFramework/UiControls/ProcedureParamsCtrl.Designer.cs b/TBF/UiControls/ProcedureParamsCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/ProcedureParamsCtrl.Designer.cs rename to TBF/UiControls/ProcedureParamsCtrl.Designer.cs diff --git a/TestBenchFramework/UiControls/ProcedureParamsCtrl.cs b/TBF/UiControls/ProcedureParamsCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/ProcedureParamsCtrl.cs rename to TBF/UiControls/ProcedureParamsCtrl.cs diff --git a/TestBenchFramework/UiControls/ProcedureParamsCtrl.resx b/TBF/UiControls/ProcedureParamsCtrl.resx similarity index 100% rename from TestBenchFramework/UiControls/ProcedureParamsCtrl.resx rename to TBF/UiControls/ProcedureParamsCtrl.resx diff --git a/TestBenchFramework/UiControls/ProceduresCtrl.cs b/TBF/UiControls/ProceduresCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/ProceduresCtrl.cs rename to TBF/UiControls/ProceduresCtrl.cs diff --git a/TestBenchFramework/UiControls/SharedButtons.Designer.cs b/TBF/UiControls/SharedButtons.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/SharedButtons.Designer.cs rename to TBF/UiControls/SharedButtons.Designer.cs diff --git a/TestBenchFramework/UiControls/SharedButtons.cs b/TBF/UiControls/SharedButtons.cs similarity index 100% rename from TestBenchFramework/UiControls/SharedButtons.cs rename to TBF/UiControls/SharedButtons.cs diff --git a/TestBenchFramework/UiControls/SharedButtons.resx b/TBF/UiControls/SharedButtons.resx similarity index 100% rename from TestBenchFramework/UiControls/SharedButtons.resx rename to TBF/UiControls/SharedButtons.resx diff --git a/TestBenchFramework/UiControls/TestParamsCtrl.Designer.cs b/TBF/UiControls/TestParamsCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/TestParamsCtrl.Designer.cs rename to TBF/UiControls/TestParamsCtrl.Designer.cs diff --git a/TestBenchFramework/UiControls/TestParamsCtrl.cs b/TBF/UiControls/TestParamsCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/TestParamsCtrl.cs rename to TBF/UiControls/TestParamsCtrl.cs diff --git a/TestBenchFramework/UiControls/TestParamsCtrl.resx b/TBF/UiControls/TestParamsCtrl.resx similarity index 100% rename from TestBenchFramework/UiControls/TestParamsCtrl.resx rename to TBF/UiControls/TestParamsCtrl.resx diff --git a/TestBenchFramework/UiControls/TestProgressCtrl.Designer.cs b/TBF/UiControls/TestProgressCtrl.Designer.cs similarity index 100% rename from TestBenchFramework/UiControls/TestProgressCtrl.Designer.cs rename to TBF/UiControls/TestProgressCtrl.Designer.cs diff --git a/TestBenchFramework/UiControls/TestProgressCtrl.cs b/TBF/UiControls/TestProgressCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/TestProgressCtrl.cs rename to TBF/UiControls/TestProgressCtrl.cs diff --git a/TestBenchFramework/UiControls/TestProgressCtrl.resx b/TBF/UiControls/TestProgressCtrl.resx similarity index 100% rename from TestBenchFramework/UiControls/TestProgressCtrl.resx rename to TBF/UiControls/TestProgressCtrl.resx diff --git a/TestBenchFramework/UiControls/TransitionStepsCtrl.cs b/TBF/UiControls/TransitionStepsCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/TransitionStepsCtrl.cs rename to TBF/UiControls/TransitionStepsCtrl.cs diff --git a/TestBenchFramework/UiControls/VirtualBenchStepsCtrl.cs b/TBF/UiControls/VirtualBenchStepsCtrl.cs similarity index 100% rename from TestBenchFramework/UiControls/VirtualBenchStepsCtrl.cs rename to TBF/UiControls/VirtualBenchStepsCtrl.cs diff --git a/TestBenchFramework/Utils.cs b/TBF/Utils.cs similarity index 100% rename from TestBenchFramework/Utils.cs rename to TBF/Utils.cs diff --git a/TestBenchFramework/app.config b/TBF/app.config similarity index 100% rename from TestBenchFramework/app.config rename to TBF/app.config diff --git a/TestBenchFramework/packages.config b/TBF/packages.config similarity index 100% rename from TestBenchFramework/packages.config rename to TBF/packages.config diff --git a/TestBenchFramework/pic/flowmeter.png b/TBF/pic/flowmeter.png similarity index 100% rename from TestBenchFramework/pic/flowmeter.png rename to TBF/pic/flowmeter.png diff --git a/TestBenchFramework/pic/regulvalve.png b/TBF/pic/regulvalve.png similarity index 100% rename from TestBenchFramework/pic/regulvalve.png rename to TBF/pic/regulvalve.png diff --git a/TestBenchFramework/pic/reservoir.png b/TBF/pic/reservoir.png similarity index 100% rename from TestBenchFramework/pic/reservoir.png rename to TBF/pic/reservoir.png diff --git a/TestBenchFramework/pic/valve-closed.png b/TBF/pic/valve-closed.png similarity index 100% rename from TestBenchFramework/pic/valve-closed.png rename to TBF/pic/valve-closed.png diff --git a/TestBenchFramework/pic/valve-open.png b/TBF/pic/valve-open.png similarity index 100% rename from TestBenchFramework/pic/valve-open.png rename to TBF/pic/valve-open.png diff --git a/TestBenchFramework/pic/watermeter.png b/TBF/pic/watermeter.png similarity index 100% rename from TestBenchFramework/pic/watermeter.png rename to TBF/pic/watermeter.png diff --git a/TestBenchFramework/x64/SQLite.Interop.dll b/TBF/x64/SQLite.Interop.dll similarity index 100% rename from TestBenchFramework/x64/SQLite.Interop.dll rename to TBF/x64/SQLite.Interop.dll diff --git a/TestBenchFramework/x86/SQLite.Interop.dll b/TBF/x86/SQLite.Interop.dll similarity index 100% rename from TestBenchFramework/x86/SQLite.Interop.dll rename to TBF/x86/SQLite.Interop.dll diff --git a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs b/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs deleted file mode 100644 index febc26146..000000000 --- a/TestBenchFramework/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs +++ /dev/null @@ -1,604 +0,0 @@ -/// -/// Copyright (c) 2018 Sensus Slovensko a.s. -/// -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using log4net; -using MySql.Data.MySqlClient; -using Config; -using Config.Entities; -using TBF.BenchControl; -using TBF.BenchControl.Sequences; -using TBF.Resources; - -namespace TBF.BenchControl.Output.DB.ProductionMonitoring -{ - public enum Retv - { - OK, - Error, - } - - public class Monitoring : ComponentBase, IOperation, GenericDevices.IResultsWriter, Generic.IDevice - { - private static readonly ILog log = LogManager.GetLogger(typeof(Monitoring)); - public override string ToString() { return string.Format("Monitoring({0})", Cfg.ToString(1)); } - - - enum CurrentOp - { - None, - LoadProcesses, - SaveMonitoringRecords, - } - CurrentOp currentOp; - bool opCompleted; - bool anyError; - - - /// - /// Results to print - /// - Results.Entities.Batch batch; - - - MonitoringCfg monitoringCfg; - string workplace { get { return monitoringCfg.Workplace; } } - MySqlConnection connection; - - - public Monitoring() {} - - public Monitoring(Generic.IComponentCfg cfg) - : base(cfg) - { - monitoringCfg = cfg as MonitoringCfg; - currentOp = CurrentOp.None; - log.Debug(this.ToString()); - } - - public void Initialize() - { - if (monitoringCfg.DebugLevel == DebugMode.Simulate) return; - - /// - /// Do something with the database to see if the connection works well - /// - connection = new MySqlConnection(monitoringCfg.ConnStr); - if (connection != null) - { - connection.Open(); - connection.Close(); - } - } - - public void RunDeviceBefore() {} - public void RunDeviceAfter() {} - - public void StopDevice() - { - if (connection != null) connection.Dispose(); - } - - public void StopDevice2() { } - - - /// - /// Writes the test cycle results into a file, Events: Event.ResultsWritten - /// - /// Procedure to print the results of - /// Results to write into the file - /// Reference to the operation - public IOperation WriteResultsOp(Results.Entities.Batch batch) - { - if (currentOp != CurrentOp.None) - throw new Exception("Sequence error"); - else - currentOp = CurrentOp.WriteResults; - - this.batch = batch; - - string fname = GetLogFileName(batch.StartTime); - - try - { - logger = new StreamWriter(System.IO.File.Create(fname)); - } - catch - { - logger = null; - log.ErrorFormat("Was not able to open LU log file {0}", fname); - } - - return this; - } - - public IOperation CheckBarcodeScanningOp(GenericDevices.IRegisterReader[] iperlHeads) - { - if (currentOp != CurrentOp.None) - throw new Exception("Sequence error"); - else - currentOp = CurrentOp.CheckBarcodeScanning; - - this.iperlHeads = iperlHeads; - - return this; - } - - /// Start this operation - public void Start() - { - opCompleted = false; - anyError = false; - } - - /// Run this operation - /// Event.ResultsWritten or Event.Error - public Event Run() - { - if (currentOp == CurrentOp.WriteResults) - { - if (!opCompleted) - { - if (batch.WaterMeters.Count == 0) return Event.ResultsWritten; -#if ORACLE_DB - if (DBCfg.DebugLevel != DebugMode.Simulate && connection != null) - { - if (WriteResultsToDatabase(connection, batch, false) == Retv.Error) anyError = true; - } -#endif - WriteLogsToDisk(logger, batch); - - opCompleted = true; - } - - if (anyError) - return Event.ResultsNotWritten; - else - return Event.ResultsWritten; - } - else if (currentOp == CurrentOp.CheckBarcodeScanning) - { - if (!opCompleted) - { -#if ORACLE_DB - if (DBCfg.DebugLevel != DebugMode.Simulate && connection != null) - { - if (CheckBarcodeScanning(connection, iperlHeads) == Retv.Error) anyError = true; ; - } -#endif - opCompleted = true; - } - - if (anyError) - return Event.CheckNotDone; - else - return Event.CheckDone; - } - else - { - return Event.None; - } - } - - /// Stop this operation - public void Stop() - { - currentOp = CurrentOp.None; - } - - - public static Retv WriteLogsToDisk(StreamWriter logger, Results.Entities.Batch batch) - { - return Retv.OK; /// OK - } - - - public static Retv WriteResultsToDatabase(MySqlConnection conn, Results.Entities.Batch batch, bool safeMode) - { - MySqlTransaction transaction = null; - - try - { - conn.Open(); /// Open the Oracle database - transaction = conn.BeginTransaction(); - - foreach (var wMtr in batch.WaterMeters) - { - SaveSingleWM2DB(conn, wMtr, safeMode); - } - - transaction.Commit(); - } - catch (Exception exc) - { - if (transaction != null) transaction.Rollback(); - - log.ErrorFormat("Results of batch {0} not written to ORACLE database: {1}", - batch.BatchNr, exc.Message); - - conn.Close(); - return Retv.Error; - } - - conn.Close(); - return Retv.OK; - } - - - /// - /// Write one meter results into the database - /// - /// 0-based water meter number - /// Sorted list of results to save - static void SaveSingleWM2DB(MySqlConnection conn, Results.Entities.WaterMeter wm, bool safeMode) - { - if (string.IsNullOrEmpty(wm.SerialNr)) return; /// No database activity possible w/o PCB number - - if (safeMode && !wm.Passed) return; - - /// - /// Read a list of all prufindexes for a given PCB Number - /// - IList pruefindexes = new List(); - { - OracleParameter parm = new OracleParameter(); - parm.OracleDbType = OracleDbType.Varchar2; - parm.Value = wm.SerialNr; - - OracleCommand cmd1 = new OracleCommand("SELECT Pruefindex FROM VT_ZAEHLER_PINDEX_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); - cmd1.Parameters.Add(parm); - - OracleDataReader dr = cmd1.ExecuteReader(); - while (dr.Read()) { pruefindexes.Add(dr.GetInt32(0)); } - dr.Close(); - } - { - OracleParameter parm = new OracleParameter(); - parm.OracleDbType = OracleDbType.Varchar2; - parm.Value = wm.SerialNr; - - OracleCommand cmd1 = new OracleCommand("SELECT Max_Pruefindex FROM VT_ZAEHLER_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); - cmd1.Parameters.Add(parm); - - OracleDataReader dr = cmd1.ExecuteReader(); - while (dr.Read()) { pruefindexes.Add(dr.GetInt32(0)); } - dr.Close(); - } - - /// - /// Determine MAX_Pruefindex - /// - int maxpruefindexLowPart = 0; - foreach (var v in pruefindexes) - { - if ((v % 100) > maxpruefindexLowPart) maxpruefindexLowPart = (v % 100); - } - int MAX_Pruefindex = 100 * DBCfg.TestBenchId + maxpruefindexLowPart + 1; - - - int Hydr_Pruefung; - if (wm.Passed) - { - /// Passed - if (maxpruefindexLowPart == 0) - Hydr_Pruefung = 96; - else - Hydr_Pruefung = 224; - } - else - { - /// Failed - Hydr_Pruefung = 97; /// Hydr. test failed, Pressure test passed - } - - wm.Pruefindex = MAX_Pruefindex; - wm.HydrPruefung = Hydr_Pruefung; - SaveOrUpdateWM(conn, wm, MAX_Pruefindex, Hydr_Pruefung); - } - - - /// - /// Save common batch data - /// - /// Batch - static void SaveBatchData(OracleConnection conn, Results.Entities.Batch b) - { - OracleParameter parm; - - OracleCommand cmd = new OracleCommand("INSERT INTO VT_PRUEFREIHE_PD(" + - "ANBID, ID_Pruefstand, ID_WzPruefreihe, ID_WZTyp, Rev_WZTyp, Rev_Pruefstand_WZTyp, " + - "StartDatumZeit, EndDatumZeit, Betriebsart, QVzKontakt, " + - "FuellenBegDruck, DruckEvakVorne, DruckEvakHinten, DruckBeiAbpressen, " + - "Druckentwaessern, SpuelDurchflussIst, ProgrammVersion)" + - " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17)", conn); - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:1 - parm = new OracleParameter("ID_Pruefstand", OracleDbType.Int32); parm.Value = 18000 + b.TestBenchId; cmd.Parameters.Add(parm); ///:2 - parm = new OracleParameter("ID_WzPruefreihe", OracleDbType.Int32); parm.Value = b.BatchNr; cmd.Parameters.Add(parm); ///:3 - parm = new OracleParameter("ID_WZTyp", OracleDbType.Int32); parm.Value = b.WaterMeters[0].WaterMeterData.WMTypeId; cmd.Parameters.Add(parm); ///:4 - parm = new OracleParameter("Rev_WZTyp", OracleDbType.Int32); parm.Value = b.WaterMeters[0].WaterMeterData.WMTypeRev; cmd.Parameters.Add(parm); ///:5 - parm = new OracleParameter("Rev_Pruefstand_WZTyp", OracleDbType.Int32); parm.Value = 1; cmd.Parameters.Add(parm); ///:6 - - parm = new OracleParameter("StartDatumZeit", OracleDbType.TimeStamp); parm.Value = b.StartTime; cmd.Parameters.Add(parm); ///:7 - parm = new OracleParameter("EndDatumZeit", OracleDbType.TimeStamp); parm.Value = b.EndTime; cmd.Parameters.Add(parm); ///:8 - parm = new OracleParameter("Betriebsart", OracleDbType.Varchar2); parm.Value = ""; cmd.Parameters.Add(parm); ///:9 - parm = new OracleParameter("QVzKontakt", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:10 - - parm = new OracleParameter("FuellenBegDruck", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:11 - parm = new OracleParameter("DruckEvakVorne", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:12 - parm = new OracleParameter("DruckEvakHinten", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:13 - parm = new OracleParameter("DruckBeiAbpressen", OracleDbType.Double); parm.Value = 0; /*TODO*/ cmd.Parameters.Add(parm); ///:14 - - parm = new OracleParameter("Druckentwaessern", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:15 - parm = new OracleParameter("SpuelDurchflussIst", OracleDbType.Double); parm.Value = 0; /*TODO*/ cmd.Parameters.Add(parm); ///:16 - parm = new OracleParameter("ProgrammVersion", OracleDbType.Varchar2); parm.Value = "TBF v." + b.ProgramVersion; cmd.Parameters.Add(parm); ///:17 - - cmd.ExecuteNonQuery(); /// Returns nr. of updated rows - - if ((id_WZTyp != b.WaterMeters[0].WaterMeterData.WMTypeId) || (rev_WZTyp != b.WaterMeters[0].WaterMeterData.WMTypeRev) || testInfos.Count == 0) - { - testInfos.Clear(); - id_WZTyp = b.WaterMeters[0].WaterMeterData.WMTypeId; - rev_WZTyp = b.WaterMeters[0].WaterMeterData.WMTypeRev; - - OracleCommand cmd1 = new OracleCommand("SELECT PruefungsNr, PosFehlerKalt, QBezeichnung FROM VT_PRUEFPUNKT_SOLL_SD WHERE ANBID=4 AND ID_WZTyp=:1 AND Rev_WZTyp=:2", conn); - parm = new OracleParameter("ID_WZTyp", OracleDbType.Int32); parm.Value = id_WZTyp; cmd1.Parameters.Add(parm); ///:1 - parm = new OracleParameter("Rev_WZTyp", OracleDbType.Int32); parm.Value = rev_WZTyp; cmd1.Parameters.Add(parm); ///:2 - - OracleDataReader dr = cmd1.ExecuteReader(); - while (dr.Read()) - { - int pruefungsNr = dr.GetInt32(0); - double errLimHi = dr.GetDouble(1); - string qBezeichnung = dr.GetString(2); - if (qBezeichnung == "Q2" && errLimHi > 2.0) qBezeichnung = "Q2adj"; - if (qBezeichnung.ToLower().Contains("just") && pruefungsNr == -1) qBezeichnung = "Adjustment"; - - if (qBezeichnung.Contains("Q") || qBezeichnung == "Adjustment") - { - testInfos.Add(new TestInfo(pruefungsNr, qBezeichnung)); - log.WarnFormat("VT_PRUEFPUNKT_SOLL_SD info : ID_WZTyp={0} Rev_WZTyp={1} PruefungsNr={2} PosFehlerKalt={3} QBezeichnung={4}", - id_WZTyp, rev_WZTyp, pruefungsNr, errLimHi, qBezeichnung); - } - } - dr.Close(); - } - - foreach (var testInfo in testInfos) - { - Results.Entities.TestRslt tr = b.GetTestRslt(testInfo.QBezeichnung, 0); - - if (tr == null) tr = b.GetTestRslt(testInfo.QBezeichnung, 1); /// TODO: Remove this workaround for large watermeters with multiple parts at Q3 - - if (tr == null) continue; - - OracleCommand cmd2 = new OracleCommand("INSERT INTO VT_PRUEFDURCHFLUSS_PD(" + - "ANBID, ID_Pruefstand, ID_WzPruefreihe, PruefungsNr, " + - "PVOL, PMasse, MinDurchfluss, MaxDurchfluss, " + - "Q_ist, KFaktor, Q_VZ, F_VZ, RegelEinstellZeit, Drehzahl, " + - "BeginnDruck_Vorne, BeginnDruck_Hinten, EndDruck_Vorne, EndDruck_Hinten, " + - "TVWZ, IVWZ, Verwendeter_VZ, BeginnGewicht, EndGewicht)" + - " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, " + - ":16, :17, :18, :19, :20, :21, :22, :23)", conn); - - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd2.Parameters.Add(parm); ///:1 - parm = new OracleParameter("ID_Pruefstand", OracleDbType.Int32); parm.Value = 18000 + b.TestBenchId; cmd2.Parameters.Add(parm); ///:2 - parm = new OracleParameter("ID_WzPruefreihe", OracleDbType.Int32); parm.Value = b.BatchNr; cmd2.Parameters.Add(parm); ///:3 - parm = new OracleParameter("PruefungsNr", OracleDbType.Int32); parm.Value = testInfo.PruefungsNr; cmd2.Parameters.Add(parm); ///:4 - /// - parm = new OracleParameter("PVOL", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.l, tr.VolumeCTV); cmd2.Parameters.Add(parm); ///:5 - parm = new OracleParameter("PMasse", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.kg, tr.MassEnd-tr.MassStart); cmd2.Parameters.Add(parm); ///:6 - parm = new OracleParameter("MinDurchfluss", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.lph, tr.FlowMin); cmd2.Parameters.Add(parm); ///:7 - parm = new OracleParameter("MaxDurchfluss", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.lph, tr.FlowMax); cmd2.Parameters.Add(parm); ///:8 - - double Q_ist = (tr.VolumeMaster != 0) ? (tr.FlowVolume * tr.VolumeCTV / tr.VolumeMaster) : (double)tr.FlowVolume; - parm = new OracleParameter("Q_ist", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.lph, Q_ist); cmd2.Parameters.Add(parm); ///:9 - parm = new OracleParameter("KFaktor", OracleDbType.Double); parm.Value = tr.ConstMaster; cmd2.Parameters.Add(parm); ///:10 - parm = new OracleParameter("Q_VZ", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.lph, tr.FlowVolume); cmd2.Parameters.Add(parm); ///:11 - parm = new OracleParameter("F_VZ", OracleDbType.Double); parm.Value = tr.ErrorMaster; cmd2.Parameters.Add(parm); ///:12 - parm = new OracleParameter("RegelEinstellZeit", OracleDbType.Double); parm.Value = (double)tr.FlowSetTime; cmd2.Parameters.Add(parm); ///:13 - parm = new OracleParameter("Drehzahl", OracleDbType.Int32); parm.Value = 0; /* TODO */ cmd2.Parameters.Add(parm); ///:14 - /// - parm = new OracleParameter("BeginnDruck_Vorne", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.bar, tr.PressUpStart); cmd2.Parameters.Add(parm); ///:15 - parm = new OracleParameter("BeginnDruck_Hinten", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.bar, tr.PressDownStart); cmd2.Parameters.Add(parm); ///:16 - parm = new OracleParameter("EndDruck_Vorne", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.bar, tr.PressUpEnd); cmd2.Parameters.Add(parm); ///:17 - parm = new OracleParameter("EndDruck_Hinten", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.bar, tr.PressDownEnd); cmd2.Parameters.Add(parm); ///:18 - /// - parm = new OracleParameter("TVWZ", OracleDbType.Double); parm.Value = tr.TestTime; cmd2.Parameters.Add(parm); ///:19 - parm = new OracleParameter("IVWZ", OracleDbType.Int32); parm.Value = tr.PulsesMaster; cmd2.Parameters.Add(parm); ///:20 - parm = new OracleParameter("Verwendeter_VZ", OracleDbType.Int32); parm.Value = 0; /* TODO */ cmd2.Parameters.Add(parm); ///:21 - parm = new OracleParameter("BeginnGewicht", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.kg, tr.MassStart); cmd2.Parameters.Add(parm); ///:22 - parm = new OracleParameter("EndGewicht", OracleDbType.Double); parm.Value = Units.ConvertTo(Unit.kg, tr.MassEnd); cmd2.Parameters.Add(parm); ///:23 - - cmd2.ExecuteNonQuery(); /// Returns nr. of updated rows - } - - log.InfoFormat("Batch data saved, batchNr={0}", b.BatchNr); - } - - - static void SaveOrUpdateWM(OracleConnection conn, Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung) - { - int sekundaere_Adr = wm.Passed ? 1 : 0; - int idBenutzer = 6; // = wm.Batch.UserNumber; - - if (max_Pruefindex % 100 == 1) - { - OracleCommand cmd = new OracleCommand("INSERT INTO VT_ZAEHLER_PD(Auftragsnummer, VT_Identnummer, VT_Fernum, Max_Pruefindex, Zaehlernummer, Sekundaere_Adr, Hydr_Pruefung, ID_Benutzer, ANBID, Baujahr) VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10)", conn); - - OracleParameter parm; - parm = new OracleParameter("Auftragsnummer", OracleDbType.Varchar2); parm.Value = wm.PurchaseOrder; cmd.Parameters.Add(parm); - parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); - parm = new OracleParameter("Zaehlernummer", OracleDbType.Int32); parm.Value = -1; cmd.Parameters.Add(parm); - parm = new OracleParameter("Sekundaere_Adr", OracleDbType.Int32); parm.Value = sekundaere_Adr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm); - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); - parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = DBCfg.Baujahr; cmd.Parameters.Add(parm); - - cmd.ExecuteNonQuery(); - log.InfoFormat("VT_ZAEHLER_PD inserted, PcbNr={0}, pos={1}, maxPruefix={2}", wm.SerialNr, wm.WMPosition, max_Pruefindex); - } - else - { - OracleCommand cmd = new OracleCommand("UPDATE VT_ZAEHLER_PD SET Auftragsnummer = :1, VT_Identnummer = :2, Max_Pruefindex = :3, Hydr_Pruefung= :4, ID_Benutzer= :5, Baujahr= :6 WHERE VT_Fernum = :7 and ANBID = :8", conn); - - OracleParameter parm; - parm = new OracleParameter("Auftragsnummer", OracleDbType.Varchar2); parm.Value = wm.PurchaseOrder; cmd.Parameters.Add(parm); - parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); - parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); - parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm); - parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = DBCfg.Baujahr; cmd.Parameters.Add(parm); - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); - - cmd.ExecuteNonQuery(); - log.InfoFormat("VT_ZAEHLER_PD updated, PcbNr={0}, pos={1}, maxPruefix={2}", wm.SerialNr, wm.WMPosition, max_Pruefindex); - } - - { - OracleCommand cmd = new OracleCommand("INSERT INTO VT_ZAEHLER_PINDEX_PD(" + - "VT_Fernum, Pruefindex, ANBID, ID_Pruefstand, ID_WzPruefreihe, Hydr_Pruefung, " + - "ReedKontakt, ReedKontaktOK, ReedKontaktZeit, KorrImprate, FestWertWZ, PtestOK, " + - "Zaehlerstand, WT_Platz_NR, WZgut, ID_Benutzer, AnzahlPruefungen)" + - " VALUES (:1, :2, :3, :4, :5, :6, 0, 0, 0, :7, 0, :8, 0, :9, :10, :11, :12)", conn); - OracleParameter parm; - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_Pruefstand", OracleDbType.Int32); parm.Value = 18000 + wm.Batch.TestBenchId; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_WzPruefreihe", OracleDbType.Int32); parm.Value = wm.Batch.BatchNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); - // ReedKontakt - // ReedKontaktOK - // ReedKontaktZeit - parm = new OracleParameter("KorrImprate", OracleDbType.Double); parm.Value = wm.OrigCalibFactor; cmd.Parameters.Add(parm); - // FestWertWZ - parm = new OracleParameter("PtestOK", OracleDbType.Int32); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); - // Zaehlerstand - parm = new OracleParameter("WT_Platz_NR", OracleDbType.Int32); parm.Value = wm.WMPosition; cmd.Parameters.Add(parm); - parm = new OracleParameter("WZgut", OracleDbType.Int32); parm.Value = wm.Passed ? 1 : 0; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm); - parm = new OracleParameter("AnzahlPruefungen", OracleDbType.Int32); parm.Value = 3; cmd.Parameters.Add(parm); - - cmd.ExecuteNonQuery(); - log.InfoFormat("VT_ZAEHLER_PINDEX_PD inserted, PcbNr={0}, pos={1}, pruefix={2}", wm.SerialNr, wm.WMPosition, max_Pruefindex % 100); - } - - - foreach (var testInfo in testInfos) - { - Results.Entities.TestData tData = wm.GetTestData(testInfo.QBezeichnung); - Results.Entities.MeterTestRslt mtr; - if (tData == null) - { - throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testInfo.QBezeichnung, wm.WMPosition)); - } - else if (tData.Repeats == 1) - { - mtr = wm.GetMeterTestRslt(testInfo.QBezeichnung); - if (mtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testInfo.QBezeichnung, wm.WMPosition)); - } - else - { - Results.Entities.MeterTestRslt firstMtr = wm.GetMeterTestRslt(Utils.TestTitle(tData, 1)); - if (firstMtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", Utils.TestTitle(tData, 1), wm.WMPosition)); - - mtr = new Results.Entities.MeterTestRslt(); - mtr.CopyContentFrom(firstMtr); - mtr.TestRslt = firstMtr.TestRslt; - mtr.WaterMeter = firstMtr.WaterMeter; - for (int i = 2; i <= tData.Repeats; i++) - { - Results.Entities.MeterTestRslt nextMtr = wm.GetMeterTestRslt(Utils.TestTitle(tData, i)); - if (nextMtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", Utils.TestTitle(tData, i), wm.WMPosition)); - - mtr.TestTime += nextMtr.TestTime; - mtr.VolumeMeter += nextMtr.VolumeMeter; - mtr.VolumeRef += nextMtr.VolumeRef; - mtr.VolumeEnd = nextMtr.VolumeEnd; - mtr.Passed = (mtr.Passed && nextMtr.Passed); - } - mtr.Error = Formulas.ErrorFromVolumes(mtr.VolumeMeter, mtr.VolumeRef); - } - - SaveMeterTestResult(conn, mtr, testInfo.PruefungsNr, max_Pruefindex); - } - - - { - double q2ErrWOCorrection = Math.Min(100.0, Math.Max(-100.0, wm.Q2ErrWOCorrection)); - - OracleCommand cmd = new OracleCommand("INSERT INTO VT_IP_ZAEHLER_PINDEX_PD(" + - "VT_Fernum, Pruefindex, ANBID, WITHCORRECTION2HZ, CORRECTION2HZ, DIFF2HZ8HZ, " + - "WITHQ2CORRECTION, ERRQ2, Q2CORRECTIONFLOWRIGHT, Q2CORRECTIONLEFT, Q2CORRECTIONRIGHT)" + - " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11)", conn); - OracleParameter parm; - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); ///:1 - parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); ///:2 - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:3 - parm = new OracleParameter("WITHCORRECTION2HZ", OracleDbType.Int32); parm.Value = wm.Hz2CorrectionDone ? 1 : 0; cmd.Parameters.Add(parm); ///:4 - parm = new OracleParameter("CORRECTION2HZ", OracleDbType.Double); parm.Value = wm.Hz2Correction; cmd.Parameters.Add(parm); ///:5 - parm = new OracleParameter("DIFF2HZ8HZ", OracleDbType.Double); parm.Value = Math.Min(99.0, Math.Max(-99.0, wm.Diff2Hz8Hz)); cmd.Parameters.Add(parm); ///:6 - parm = new OracleParameter("WITHQ2CORRECTION", OracleDbType.Int32); parm.Value = wm.Q2CorrectionDone ? 1 : 0; cmd.Parameters.Add(parm); ///:7 - parm = new OracleParameter("ERRQ2", OracleDbType.Double); parm.Value = q2ErrWOCorrection; cmd.Parameters.Add(parm); ///:8 - parm = new OracleParameter("Q2CORRECTIONFLOWRIGHT", OracleDbType.Int32);parm.Value = wm.Q2CorrFlowRight;/*1=right to left*/ cmd.Parameters.Add(parm); ///:9 - parm = new OracleParameter("Q2CORRECTIONLEFT", OracleDbType.Int32); parm.Value = wm.Q2CorrLFlow; cmd.Parameters.Add(parm); ///:10 - parm = new OracleParameter("Q2CORRECTIONRIGHT", OracleDbType.Int32); parm.Value = wm.Q2CorrRFlow; cmd.Parameters.Add(parm); ///:11 - - int rowsUpdated = cmd.ExecuteNonQuery(); - log.InfoFormat("VT_IP_ZAEHLER_PINDEX_PD inserted, PcbNr={0}, pruefix={1}", wm.SerialNr, max_Pruefindex); - } - } - - - /// - /// Saves a water meter result of a single test - /// - /// q = 0, 1, 2 or 3 (Adj., Q1, Q2, Q3) - /// Nr. of rows updated - static int SaveMeterTestResult(OracleConnection conn, Results.Entities.MeterTestRslt mtr, int pruefungsNr, int max_Pruefindex) /// - { - double Q_wm = 3600.0 * mtr.VolumeMeter / mtr.TestTime; /// in [l/hour] - double Q_wm_with_upper_bound = Math.Min(2 * 1000 * mtr.TestRslt.FlowVolume, Math.Max(0.0, Q_wm)); - - OracleCommand cmd = new OracleCommand("INSERT INTO VT_PRUEFREIHE_IST_PD(" + - "VT_Fernum, Pruefindex, PruefungsNr, ANBID, ID_WZTyp, Rev_WZTyp, Rev_WZPruefpunkt, " + - "Q_WZ, Q_Fehler, Q_Best, NIZ, AnfangZStand, EndZStand, " + - "KorrErrQok, KorrErrQ, KorrQWz, TIZ, Vol_WZ_US, TempMittel_US)" + - " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, 0, :14, 0, :15, 0, 0)", conn); - OracleParameter parm; - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = mtr.WaterMeter.SerialNr; cmd.Parameters.Add(parm); ///:1 - parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); ///:2 - parm = new OracleParameter("PruefungsNr", OracleDbType.Int32); parm.Value = pruefungsNr; cmd.Parameters.Add(parm); ///:3 - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:4 - parm = new OracleParameter("ID_WZTyp", OracleDbType.Int32); parm.Value = mtr.WaterMeter.WaterMeterData.WMTypeId; cmd.Parameters.Add(parm); ///:5 - parm = new OracleParameter("Rev_WZTyp", OracleDbType.Int32); parm.Value = mtr.WaterMeter.WaterMeterData.WMTypeRev; cmd.Parameters.Add(parm); ///:6 - parm = new OracleParameter("Rev_WZPruefpunkt", OracleDbType.Int32); parm.Value = 1; cmd.Parameters.Add(parm); ///:7 - parm = new OracleParameter("Q_WZ", OracleDbType.Double); parm.Value = Q_wm_with_upper_bound; cmd.Parameters.Add(parm); ///:8 - parm = new OracleParameter("Q_Fehler", OracleDbType.Double); parm.Value = Math.Min(100.0, Math.Max(-100.0, mtr.Error)); cmd.Parameters.Add(parm); ///:9 - parm = new OracleParameter("Q_Best", OracleDbType.Int32); parm.Value = mtr.Passed ? 1 : 0; cmd.Parameters.Add(parm); ///:10 - parm = new OracleParameter("NIZ", OracleDbType.Int32); parm.Value = 0; cmd.Parameters.Add(parm); ///:11 - parm = new OracleParameter("AnfangZStand", OracleDbType.Double); parm.Value = mtr.VolumeStart; cmd.Parameters.Add(parm); ///:12 - parm = new OracleParameter("EndZStand", OracleDbType.Double); parm.Value = mtr.VolumeEnd; cmd.Parameters.Add(parm); ///:13 - /// KorrErrQok bool true = Q2 within limits, 'passed' in case of Q1, Q3, Q4 - parm = new OracleParameter("KorrErrQ", OracleDbType.Double); parm.Value = Math.Min(100.0, Math.Max(-100.0, mtr.KorrErrQ)); cmd.Parameters.Add(parm); ///:14 - /// KorrErrQ double 'Q2 error before correction' when correction done or 'Q2 error' when correction not done - /// = q2.WaterMeter.Q2CorrectionDone ? q2.WaterMeter.Q2ErrWOCorrection.ToString(Program.AltCulture) : q2.Error.ToString(Program.AltCulture))); - /// KorrQWz double - parm = new OracleParameter("TIZ", OracleDbType.Double); parm.Value = Math.Min(100000, mtr.TestTime); cmd.Parameters.Add(parm); ///:15 - /// Vol_WZ_US - /// TempMittel_US - - int retv = cmd.ExecuteNonQuery(); - log.DebugFormat("VT_PRUEFREIHE_IST_PD inserted, PcbNr={0}, pruefungsNr={1}, error={2}", mtr.WaterMeter.SerialNr, pruefungsNr, mtr.Error); - return retv; - } -#endif - } -} diff --git a/clean.bat b/clean.bat index 7c3cdbdd6..450f20eee 100644 --- a/clean.bat +++ b/clean.bat @@ -12,10 +12,10 @@ rmdir /s /q Results\bin rmdir /s /q Results\obj rmdir /s /q ResultsBrowser\bin rmdir /s /q ResultsBrowser\obj +rmdir /s /q TBF\bin +rmdir /s /q TBF\obj rmdir /s /q TBFSetup\Debug rmdir /s /q TBFSetup\Release -rmdir /s /q TestBenchFramework\bin -rmdir /s /q TestBenchFramework\obj rmdir /s /q Users\bin rmdir /s /q Users\obj rmdir /s /q UserManagement\bin