diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
index 82bb07225..45b78639d 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
@@ -130,9 +130,9 @@ namespace TBF.BenchControl.Elde
 
         public void UpdateWeights()
         {
-            for (int i = 0; i < MettlerToledo.BalanceDev.BalancesCount; i++)
+			for (int i = 0; i < MettlerToledo.Standard.BalanceDev.BalancesCount; i++)
             {
-                controlCom.SetWeight(i, MettlerToledo.BalanceDev.Masses[i]);
+				controlCom.SetWeight(i, MettlerToledo.Standard.BalanceDev.Masses[i]);
             }
         }
 
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/BalanceCfg.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfg.cs
similarity index 97%
rename from TestBenchFramework/BenchControl/MettlerToledo/BalanceCfg.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfg.cs
index c68000d18..f08a7b765 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/BalanceCfg.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfg.cs
@@ -7,7 +7,7 @@ using System.IO.Ports;
 using System.Xml.Serialization;
 using TBF.BenchControl.Generic;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
     public class BalanceCfg : ComponentCfgBase, Generic.IComponentCfg
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.Designer.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.Designer.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.Designer.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.Designer.cs
index d575616da..c8333fff6 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.Designer.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.Designer.cs
@@ -1,7 +1,7 @@
 ///
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	partial class BalanceCfgCtrl
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
index 6cb7e6a21..00ad4d6ce 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
@@ -8,7 +8,7 @@ using System.IO.Ports;
 using log4net;
 using TBF.BenchControl.Generic;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	public partial class BalanceCfgCtrl : UserControl, IComponentCfgCtrl
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.resx b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.resx
similarity index 100%
rename from TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.resx
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.resx
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/BalanceDev.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/MettlerToledo/BalanceDev.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs
index 143a93dfd..e1bc9d6e3 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/BalanceDev.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs
@@ -10,7 +10,7 @@ using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
     /// <summary>
 	/// Mettler Toledo ICS4_5 Weighting terminal connected via serial interface (RS232)
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/BalanceFactory.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs
similarity index 95%
rename from TestBenchFramework/BenchControl/MettlerToledo/BalanceFactory.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs
index 773900d83..9f19d52ad 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/BalanceFactory.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using TBF.BenchControl.Generic;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	public class BalanceFactory : IComponentFactory
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/BalanceNewDev.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/MettlerToledo/BalanceNewDev.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs
index 75c6c6ad0..aabf52ea5 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/BalanceNewDev.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs
@@ -9,7 +9,7 @@ using System.IO.Ports;
 using log4net;
 using TBF.BenchControl.Generic;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
     /// <summary>
 	/// Mettler Toledo ICS4_5 Weighting terminal connected via serial interface (RS232)
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/BalanceNewFactory.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs
similarity index 95%
rename from TestBenchFramework/BenchControl/MettlerToledo/BalanceNewFactory.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs
index 53aaac47c..71151b0c0 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/BalanceNewFactory.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using TBF.BenchControl.Generic;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	public class BalanceNewFactory : IComponentFactory
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/GetBalanceSNOp.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/GetBalanceSNOp.cs
similarity index 96%
rename from TestBenchFramework/BenchControl/MettlerToledo/GetBalanceSNOp.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/GetBalanceSNOp.cs
index 668d4acae..a50915b43 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/GetBalanceSNOp.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/GetBalanceSNOp.cs
@@ -4,7 +4,7 @@
 using System;
 using log4net;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	public class GetBalanceSNOp : IOperation
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/ReadMassOp.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassOp.cs
similarity index 97%
rename from TestBenchFramework/BenchControl/MettlerToledo/ReadMassOp.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassOp.cs
index a58c9365a..f10c24dc5 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/ReadMassOp.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassOp.cs
@@ -5,7 +5,7 @@ using System;
 using log4net;
 using TBF.Boxes;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	public class ReadMassOp : IOperation
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/ReadMassesOp.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassesOp.cs
similarity index 97%
rename from TestBenchFramework/BenchControl/MettlerToledo/ReadMassesOp.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassesOp.cs
index ba5fdc48b..56bf364b4 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/ReadMassesOp.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassesOp.cs
@@ -4,7 +4,7 @@
 using System;
 using log4net;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	public class ReadMassesOp : IOperation
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/ReadStableMassOp.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs
similarity index 98%
rename from TestBenchFramework/BenchControl/MettlerToledo/ReadStableMassOp.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs
index 7555a1976..0743f25c5 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/ReadStableMassOp.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs
@@ -5,7 +5,7 @@ using System;
 using log4net;
 using TBF.Boxes;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	/// <summary>
 	/// Operation to read more mass values and average them to obtain a more accurate result.
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/SetUnitsOp.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/SetUnitsOp.cs
similarity index 96%
rename from TestBenchFramework/BenchControl/MettlerToledo/SetUnitsOp.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/SetUnitsOp.cs
index 451ebd707..4c6258875 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/SetUnitsOp.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/SetUnitsOp.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using log4net;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	public class SetUnitsOp : IOperation
 	{
diff --git a/TestBenchFramework/BenchControl/MettlerToledo/TaringOp.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/TaringOp.cs
similarity index 97%
rename from TestBenchFramework/BenchControl/MettlerToledo/TaringOp.cs
rename to TestBenchFramework/BenchControl/MettlerToledo/Standard/TaringOp.cs
index c45e16c8d..8d98f70a2 100644
--- a/TestBenchFramework/BenchControl/MettlerToledo/TaringOp.cs
+++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/TaringOp.cs
@@ -5,7 +5,7 @@ using System;
 using log4net;
 using TBF.Boxes;
 
-namespace TBF.BenchControl.MettlerToledo
+namespace TBF.BenchControl.MettlerToledo.Standard
 {
 	public class TaringOp : IOperation
 	{
diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
index 3e01cd891..771f540fc 100644
--- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
@@ -148,7 +148,7 @@ namespace TBF.BenchControl.Sequences
             Bridge.OnActivity(this, Strings.Measuring_the_weight);
             State.Create("MainSeq : Mesuring the weight for the 1st time")
                    .AddOperation(checkUiOp)
-                 .AddOperation(new MettlerToledo.ReadMassesOp())
+				 .AddOperation(new MettlerToledo.Standard.ReadMassesOp())
                  .EnterState();
             do
             {
diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs
index 87619e562..8c98a06af 100644
--- a/TestBenchFramework/BenchControl/TbfComponents.cs
+++ b/TestBenchFramework/BenchControl/TbfComponents.cs
@@ -38,8 +38,8 @@ namespace TBF.BenchControl
 			Factories.Add(new Ambient.Greco.Factory());
 			Factories.Add(new Cameras.IdcCamera.IdcCameraFactory());
 			Factories.Add(new TestMethods.LeakTest.TestMethodFactory());
-			Factories.Add(new MettlerToledo.BalanceFactory());
-			Factories.Add(new MettlerToledo.BalanceNewFactory());
+			Factories.Add(new MettlerToledo.Standard.BalanceFactory());
+			Factories.Add(new MettlerToledo.Standard.BalanceNewFactory());
 			Factories.Add(new TestMethods.PMaxTest.TestMethodFactory());
 			Factories.Add(new Elde.PressureMeter.PressureMeterFactory());
 			Factories.Add(new Elde.Pump.PumpFactory());
diff --git a/TestBenchFramework/MetrologyDlg.cs b/TestBenchFramework/MetrologyDlg.cs
index 5b437e906..31f00eae1 100644
--- a/TestBenchFramework/MetrologyDlg.cs
+++ b/TestBenchFramework/MetrologyDlg.cs
@@ -56,8 +56,8 @@ namespace TBF
 			{
 				BenchControl.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
 
-				if (factory is BenchControl.MettlerToledo.BalanceFactory ||
-					factory is BenchControl.MettlerToledo.BalanceNewFactory)
+				if (factory is BenchControl.MettlerToledo.Standard.BalanceFactory ||
+					factory is BenchControl.MettlerToledo.Standard.BalanceNewFactory)
 				{
 					balancesCount++;
                     TabPage tabPage = new TabPage("  " + cmpnt.Name + "  ");
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index 2d17856f2..65dffac22 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -157,6 +157,23 @@
       <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </Compile>
     <Compile Include="BenchControl\Elde\Diverter\Handlers.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\BalanceCfg.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\BalanceCfgCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="BenchControl\MettlerToledo\Standard\BalanceCfgCtrl.designer.cs">
+      <DependentUpon>BalanceCfgCtrl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="BenchControl\MettlerToledo\Standard\BalanceDev.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\BalanceFactory.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\BalanceNewDev.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\BalanceNewFactory.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\GetBalanceSNOp.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\ReadMassesOp.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\ReadMassOp.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\ReadStableMassOp.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\SetUnitsOp.cs" />
+    <Compile Include="BenchControl\MettlerToledo\Standard\TaringOp.cs" />
     <Compile Include="PrintOrderDocument.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -466,14 +483,6 @@
     <Compile Include="BenchControl\Elde\Valve\ValveCfgCtrl.Designer.cs">
       <DependentUpon>ValveCfgCtrl.cs</DependentUpon>
     </Compile>
-    <Compile Include="BenchControl\MettlerToledo\BalanceCfgCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="BenchControl\MettlerToledo\BalanceCfgCtrl.Designer.cs">
-      <DependentUpon>BalanceCfgCtrl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="BenchControl\MettlerToledo\BalanceNewFactory.cs" />
-    <Compile Include="BenchControl\MettlerToledo\ReadMassesOp.cs" />
     <Compile Include="BenchControl\Operations\AskYesNoOp.cs" />
     <Compile Include="BenchControl\Operations\AskYesNoForm.cs">
       <SubType>Form</SubType>
@@ -762,15 +771,6 @@
     <Compile Include="BenchControl\Generic\IComponent.cs" />
     <Compile Include="BenchControl\Generic\IComponentFactory.cs" />
     <Compile Include="BenchControl\Generic\IComponentCfg.cs" />
-    <Compile Include="BenchControl\MettlerToledo\BalanceCfg.cs" />
-    <Compile Include="BenchControl\MettlerToledo\BalanceDev.cs" />
-    <Compile Include="BenchControl\MettlerToledo\BalanceNewDev.cs" />
-    <Compile Include="BenchControl\MettlerToledo\BalanceFactory.cs" />
-    <Compile Include="BenchControl\MettlerToledo\GetBalanceSNOp.cs" />
-    <Compile Include="BenchControl\MettlerToledo\ReadMassOp.cs" />
-    <Compile Include="BenchControl\MettlerToledo\ReadStableMassOp.cs" />
-    <Compile Include="BenchControl\MettlerToledo\SetUnitsOp.cs" />
-    <Compile Include="BenchControl\MettlerToledo\TaringOp.cs" />
     <Compile Include="BenchControl\TbfComponents.cs" />
     <Compile Include="ComponentParametersDlg.cs">
       <SubType>Form</SubType>
@@ -1215,7 +1215,7 @@
     <EmbeddedResource Include="BenchControl\Elde\Valve\ValveCfgCtrl.resx">
       <DependentUpon>ValveCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BenchControl\MettlerToledo\BalanceCfgCtrl.resx">
+    <EmbeddedResource Include="BenchControl\MettlerToledo\Standard\BalanceCfgCtrl.resx">
       <DependentUpon>BalanceCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="BenchControl\Operations\AskYesNoForm.resx">