diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.deployment b/dml-examples/Scenario_Coloc_BEFG/DML-Model/min.deployment
similarity index 100%
rename from dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.deployment
rename to dml-examples/Scenario_Coloc_BEFG/DML-Model/min.deployment
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.repository b/dml-examples/Scenario_Coloc_BEFG/DML-Model/min.repository
similarity index 75%
rename from dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.repository
rename to dml-examples/Scenario_Coloc_BEFG/DML-Model/min.repository
index a35015d256e53ec81721c6104726640a5e51b8c7..68ad974c09a6604c0171b8eabfdbafb194fdcd6d 100644
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.repository
+++ b/dml-examples/Scenario_Coloc_BEFG/DML-Model/min.repository
@@ -37,14 +37,6 @@
         <actions xsi:type="servicebehavior:ExternalCallAction">
           <externalCall id="_jPXogO2bEeib_P5jAe7dPw" name="ToB" signature="_xapQ4e2aEeib_P5jAe7dPw" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_pR8ecPMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -68,14 +60,6 @@
         <actions xsi:type="servicebehavior:ExternalCallAction">
           <externalCall id="_3Nfj0O2bEeib_P5jAe7dPw" name="ToE" signature="_JCed0u2bEeib_P5jAe7dPw" interfaceRequiringRole="_pW0u8e2bEeib_P5jAe7dPw"/>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_-H9EAfMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -104,14 +88,6 @@
             </explicitDescription>
           </loopIterationCount>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="__bzRgfMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -127,14 +103,6 @@
             <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
           </resourceDemand>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_ADsX8fMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -158,14 +126,6 @@
         <actions xsi:type="servicebehavior:ExternalCallAction">
           <externalCall id="_PVKcgO2eEeib_P5jAe7dPw" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_BLBzcfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -200,14 +160,6 @@
             </explicitDescription>
           </branchProbabilities>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_CE2-cfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -223,14 +175,6 @@
             <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
           </resourceDemand>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_DWdJMfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.resourcelandscape b/dml-examples/Scenario_Coloc_BEFG/DML-Model/min.resourcelandscape
similarity index 100%
rename from dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.resourcelandscape
rename to dml-examples/Scenario_Coloc_BEFG/DML-Model/min.resourcelandscape
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.system b/dml-examples/Scenario_Coloc_BEFG/DML-Model/min.system
similarity index 65%
rename from dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.system
rename to dml-examples/Scenario_Coloc_BEFG/DML-Model/min.system
index a7f8c17eb298181efae8cb8ce5094b005d71480b..aecdb5db5ad61ca14ddff8173fbd8bf2fb7b3daa 100644
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.system
+++ b/dml-examples/Scenario_Coloc_BEFG/DML-Model/min.system
@@ -5,14 +5,8 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="2308.85"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-16.6927" knot="130">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="20.2149" knot="12" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="198.143"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="-4.29435" knot="5">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
@@ -25,14 +19,14 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="2310.01"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-16.9205" knot="129">
+      <basisFunctions xsi:type="system:Constant" coefficient="176.742"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="22.136" knot="5" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="20.1429" knot="12" side="RIGHT">
+      <basisFunctions xsi:type="system:Hinge" coefficient="-3.94524" knot="5">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
@@ -45,20 +39,20 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="4495.59"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="20.2453" knot="124" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="71.8014"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="11.6327" knot="2" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-37.0924" knot="124">
+      <basisFunctions xsi:type="system:Hinge" coefficient="-3.49954" knot="2">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="7.34225" knot="18">
+      <basisFunctions xsi:type="system:Hinge" coefficient="6.41323" knot="1">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
@@ -71,14 +65,14 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="5.89376"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="13.3709" knot="195" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="11.2564"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="2.27731" knot="2" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
           <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="6.12246" knot="0" side="RIGHT">
+      <basisFunctions xsi:type="system:Hinge" coefficient="2.89095" knot="1" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
           <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
@@ -91,26 +85,8 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="82.1774"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="7.47513" knot="3" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-5.42698" knot="26" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="8.81552" knot="2" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-3.60446" knot="2">
+      <basisFunctions xsi:type="system:Constant" coefficient="67.5568"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="6.16587" knot="0" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
@@ -123,26 +99,14 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="47.7013"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="19.0544" knot="2" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="50.2176"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="21.0063" knot="2" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-9.52963" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-3.70568" knot="5" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-14.43" knot="37" side="RIGHT">
+      <basisFunctions xsi:type="system:Hinge" coefficient="-12.6718" knot="2">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
@@ -155,26 +119,8 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="197.812"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="5.75745" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-89.32" knot="14" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="70.9197" knot="12" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-15.5075" knot="12">
+      <basisFunctions xsi:type="system:Constant" coefficient="20.1862"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="10.6119" knot="0" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.system.bak b/dml-examples/Scenario_Coloc_BEFG/DML-Model/min.system.bak
similarity index 100%
rename from dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.system.bak
rename to dml-examples/Scenario_Coloc_BEFG/DML-Model/min.system.bak
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.usageprofile b/dml-examples/Scenario_Coloc_BEFG/DML-Model/min.usageprofile
similarity index 100%
rename from dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.usageprofile
rename to dml-examples/Scenario_Coloc_BEFG/DML-Model/min.usageprofile
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_B.dql b/dml-examples/Scenario_Coloc_BEFG/DQL-Queries/Analysis.dql
similarity index 63%
rename from dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_B.dql
rename to dml-examples/Scenario_Coloc_BEFG/DQL-Queries/Analysis.dql
index 9f64a755d0fcf1f11b2c4bdf5fde7a0b047c3513..99ddb806b8d6eed028e1fd5fb50a5f0a089e4035 100644
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_B.dql
+++ b/dml-examples/Scenario_Coloc_BEFG/DQL-Queries/Analysis.dql
@@ -1,27 +1,24 @@
-SELECT usageToA.avgResponseTime, CPA_CPU.utilization, ToB.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
+SELECT CPA_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPFG_CPU.utilization, usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime
 EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
+	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.005, 0.008, 0.011, 0.014, 0.017, 0.020>
 FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
 	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
 	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
+	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
 	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
+	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
+	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
+	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
+	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
 	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
+	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPFG_Network,
+	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
 	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
+	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
+	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPFG_CPU,
+	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
+	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
 	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
+	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
+	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network
 USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis.dql b/dml-examples/Scenario_Coloc_BEFG/DQL-Queries/Analysis_FG.dql
similarity index 72%
rename from dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis.dql
rename to dml-examples/Scenario_Coloc_BEFG/DQL-Queries/Analysis_FG.dql
index 9a9855399ff0fff5f869f6c4dd7143b97572e995..ec5b60ecd85afd18fb4db569a8aaf3a04c2b2a4e 100644
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis.dql
+++ b/dml-examples/Scenario_Coloc_BEFG/DQL-Queries/Analysis_FG.dql
@@ -1,24 +1,25 @@
-SELECT	usageToA.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPFG_CPU.utilization
+SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime
+CONSTRAINED AS 'USE_STATISTICAL_MODEL:F:G'
 EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.030>
+	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.005, 0.008, 0.011, 0.014, 0.017, 0.020>
 FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
 	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
+	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
+	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
 	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
 	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
 	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
+	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
+	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
 	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
+	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPFG_Network,
+	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
+	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
 	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
 	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPFG_CPU,
+	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
+	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
 	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPFG_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network
+	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
+	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network
 USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/minmodel.properties b/dml-examples/Scenario_Coloc_BEFG/DQL-Queries/minmodel.properties
similarity index 100%
rename from dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/minmodel.properties
rename to dml-examples/Scenario_Coloc_BEFG/DQL-Queries/minmodel.properties
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis.dql
deleted file mode 100644
index 05e052d390a05f02ea4b33efae9869e4c9b3ecf3..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT	usageToA.avgResponseTime, usageToA.throughput
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_A.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_B.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_B.dql
deleted file mode 100644
index 9f64a755d0fcf1f11b2c4bdf5fde7a0b047c3513..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, CPA_CPU.utilization, ToB.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_C.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_C.dql
deleted file mode 100644
index c22e02f702c0f8131aeb747da2e1a2a0c1aacf63..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CE.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CE.dql
deleted file mode 100644
index 7b6c2add372e5fcbe2c0b3bebc56146e6f198763..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CF.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CF.dql
deleted file mode 100644
index ee7052cc316140e384047868c10c58752489ad46..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CG.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CG.dql
deleted file mode 100644
index 5b598836fd88e2f2a56a789a8309338ee21f2bf7..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_D.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_D.dql
deleted file mode 100644
index c917706a5995679b94c94a2e18dffd6da3d40323..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_DE.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_DE.dql
deleted file mode 100644
index 236885ae632e45744d1d134cd0988e013095d904..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_E.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_E.dql
deleted file mode 100644
index 7a2f201841b1b4163ecf1389b4818fe6d0393d86..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_F.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_F.dql
deleted file mode 100644
index 320108c326024f375d76987c9c850806765fe0cf..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_G.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_G.dql
deleted file mode 100644
index 7b2029c1d3bc7267a92b0dd6662f70521d3ebb1b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/Analysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis.dql
deleted file mode 100644
index eb7655f15f9f6e7b9289269df92c18b3b257ae2e..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT	usageToA.avgResponseTime
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_A.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_C.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_C.dql
deleted file mode 100644
index 368207562086fc13b7cc9a9878bdcdabf201963b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql
deleted file mode 100644
index 8ab240aefc1e2c5b91dea753babe6cbd7a42f1c9..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql
deleted file mode 100644
index 54bb1c2346d2d2b0b27bf61df86a1fcf095a7e92..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql
deleted file mode 100644
index 499a3449ba26349c0dec8e0a69f5c367ababf581..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_D.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_D.dql
deleted file mode 100644
index fdbc0e87bc87f0487c36bfa37cde31438524648f..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql
deleted file mode 100644
index 5c796306aa5f93c081f33bbeab41c771ff279c28..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_E.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_E.dql
deleted file mode 100644
index b4a02fd19e9d00e0afe82df3140d50ee16944320..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_F.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_F.dql
deleted file mode 100644
index 864f0ef63acca6ec91d0fe7afb04ab2dce41b617..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_G.dql b/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_G.dql
deleted file mode 100644
index ea851f2c026ea0d1a0f3a47dd70b9762ab0bbb89..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.deployment b/dml-examples/Scenario_Coloc_DG/DML-Model/min.deployment
similarity index 100%
rename from dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.deployment
rename to dml-examples/Scenario_Coloc_DG/DML-Model/min.deployment
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.repository b/dml-examples/Scenario_Coloc_DG/DML-Model/min.repository
similarity index 75%
rename from dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.repository
rename to dml-examples/Scenario_Coloc_DG/DML-Model/min.repository
index a35015d256e53ec81721c6104726640a5e51b8c7..68ad974c09a6604c0171b8eabfdbafb194fdcd6d 100644
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.repository
+++ b/dml-examples/Scenario_Coloc_DG/DML-Model/min.repository
@@ -37,14 +37,6 @@
         <actions xsi:type="servicebehavior:ExternalCallAction">
           <externalCall id="_jPXogO2bEeib_P5jAe7dPw" name="ToB" signature="_xapQ4e2aEeib_P5jAe7dPw" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_pR8ecPMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -68,14 +60,6 @@
         <actions xsi:type="servicebehavior:ExternalCallAction">
           <externalCall id="_3Nfj0O2bEeib_P5jAe7dPw" name="ToE" signature="_JCed0u2bEeib_P5jAe7dPw" interfaceRequiringRole="_pW0u8e2bEeib_P5jAe7dPw"/>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_-H9EAfMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -104,14 +88,6 @@
             </explicitDescription>
           </loopIterationCount>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="__bzRgfMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -127,14 +103,6 @@
             <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
           </resourceDemand>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_ADsX8fMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -158,14 +126,6 @@
         <actions xsi:type="servicebehavior:ExternalCallAction">
           <externalCall id="_PVKcgO2eEeib_P5jAe7dPw" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_BLBzcfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -200,14 +160,6 @@
             </explicitDescription>
           </branchProbabilities>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_CE2-cfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
@@ -223,14 +175,6 @@
             <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
           </resourceDemand>
         </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_DWdJMfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
       </behavior>
     </fineGrainedBehavior>
   </components>
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.resourcelandscape b/dml-examples/Scenario_Coloc_DG/DML-Model/min.resourcelandscape
similarity index 100%
rename from dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.resourcelandscape
rename to dml-examples/Scenario_Coloc_DG/DML-Model/min.resourcelandscape
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.system b/dml-examples/Scenario_Coloc_DG/DML-Model/min.system
similarity index 62%
rename from dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.system
rename to dml-examples/Scenario_Coloc_DG/DML-Model/min.system
index 68bd17bd651a61010d41464ad67129344fb0a78d..a48caf883a3fae5f76d46d4392b290bbad32a683 100644
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DML-Model/min.system
+++ b/dml-examples/Scenario_Coloc_DG/DML-Model/min.system
@@ -5,20 +5,8 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="1749.06"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="6.2297" knot="119" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-13.4573" knot="119">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="14.8184" knot="13" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="185.15"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="8.04676" knot="2" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
@@ -31,20 +19,14 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="1753.89"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="6.51562" knot="118" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="186.754"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="16.8891" knot="5" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-13.7529" knot="118">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="14.5185" knot="12" side="RIGHT">
+      <basisFunctions xsi:type="system:Hinge" coefficient="-6.26601" knot="5">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
@@ -57,20 +39,8 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="137.399"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-6.36542" knot="102" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="28.1516" knot="6" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-13.8997" knot="6">
+      <basisFunctions xsi:type="system:Constant" coefficient="71.2698"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="10.0688" knot="1" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
           <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
@@ -83,20 +53,14 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="13.895"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-1.44364" knot="189" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="12.0121"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="3.76215" knot="1" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
           <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="5.11961" knot="2" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-2.35322" knot="2">
+      <basisFunctions xsi:type="system:Hinge" coefficient="0.713359" knot="2" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
           <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
@@ -109,20 +73,14 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="-10.0172"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="27.4665" knot="6" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="54.4443"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="7.97152" knot="2">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-22.1361" knot="6">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="7.74679" knot="26">
+      <basisFunctions xsi:type="system:Hinge" coefficient="12.7134" knot="0" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
@@ -135,20 +93,8 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="323.529"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="7.01828" knot="2" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="16.7387" knot="23" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-12.8696" knot="23" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="37.1576"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="11.5088" knot="1" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
@@ -161,20 +107,14 @@
     <statisticalModel xsi:type="system:MARSModel">
       <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
       <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="150.043"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="6.62827" knot="2" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="5.17938" knot="12" side="RIGHT">
+      <basisFunctions xsi:type="system:Constant" coefficient="43.1767"/>
+      <basisFunctions xsi:type="system:Hinge" coefficient="17.0205" knot="2" side="RIGHT">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
         </variableReference>
       </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-10.5134" knot="12">
+      <basisFunctions xsi:type="system:Hinge" coefficient="-11.1821" knot="2">
         <variableReference xsi:type="system:WorkloadIntensity">
           <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
           <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.system.bak b/dml-examples/Scenario_Coloc_DG/DML-Model/min.system.bak
similarity index 100%
rename from dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.system.bak
rename to dml-examples/Scenario_Coloc_DG/DML-Model/min.system.bak
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.usageprofile b/dml-examples/Scenario_Coloc_DG/DML-Model/min.usageprofile
similarity index 100%
rename from dml-examples/Scenario_Coloc_DG_with_MARS/DML-Model/min.usageprofile
rename to dml-examples/Scenario_Coloc_DG/DML-Model/min.usageprofile
diff --git a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_B.dql b/dml-examples/Scenario_Coloc_DG/DQL-Queries/Analysis.dql
similarity index 61%
rename from dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_B.dql
rename to dml-examples/Scenario_Coloc_DG/DQL-Queries/Analysis.dql
index ce4bdad143e0924e8822c93d09bccb52ebd246cc..9c51f98e725914664e75870a18f80affe87ff6d6 100644
--- a/dml-examples/Scenario_Coloc_BEFG_with_MARS/DQL-Queries/TimeAnalysis_B.dql
+++ b/dml-examples/Scenario_Coloc_DG/DQL-Queries/Analysis.dql
@@ -1,27 +1,24 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
+SELECT CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPFG_CPU.utilization, usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime
 EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
+	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025>
 FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
 	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
 	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
+	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
 	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
+	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
+	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
+	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
 	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
 	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
+	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
+	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
+	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPFG_CPU,
+	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPFG_Network,
 	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
 	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
+	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
+	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
+	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
+	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network
 USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG/DQL-Queries/Analysis_mars.dql b/dml-examples/Scenario_Coloc_DG/DQL-Queries/Analysis_mars.dql
new file mode 100644
index 0000000000000000000000000000000000000000..c10a4721aab3dcb6c51d85ff012f4eb57ab800c2
--- /dev/null
+++ b/dml-examples/Scenario_Coloc_DG/DQL-Queries/Analysis_mars.dql
@@ -0,0 +1,13 @@
+SELECT usageToA.avgResponseTime//, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime
+CONSTRAINED AS 'USE_STATISTICAL_MODEL:F:G'
+EVALUATE DOF
+	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.020>
+FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
+	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
+	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
+	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
+	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
+	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
+	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
+	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF
+USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/minmodel.properties b/dml-examples/Scenario_Coloc_DG/DQL-Queries/minmodel.properties
similarity index 100%
rename from dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/minmodel.properties
rename to dml-examples/Scenario_Coloc_DG/DQL-Queries/minmodel.properties
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis.dql
deleted file mode 100644
index 05e052d390a05f02ea4b33efae9869e4c9b3ecf3..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT	usageToA.avgResponseTime, usageToA.throughput
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_A.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_C.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_C.dql
deleted file mode 100644
index c22e02f702c0f8131aeb747da2e1a2a0c1aacf63..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CE.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CE.dql
deleted file mode 100644
index 7b6c2add372e5fcbe2c0b3bebc56146e6f198763..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CF.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CF.dql
deleted file mode 100644
index ee7052cc316140e384047868c10c58752489ad46..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CG.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CG.dql
deleted file mode 100644
index 5b598836fd88e2f2a56a789a8309338ee21f2bf7..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_D.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_D.dql
deleted file mode 100644
index c917706a5995679b94c94a2e18dffd6da3d40323..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_DE.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_DE.dql
deleted file mode 100644
index 236885ae632e45744d1d134cd0988e013095d904..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_E.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_E.dql
deleted file mode 100644
index 7a2f201841b1b4163ecf1389b4818fe6d0393d86..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_F.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_F.dql
deleted file mode 100644
index 320108c326024f375d76987c9c850806765fe0cf..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_G.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_G.dql
deleted file mode 100644
index 7b2029c1d3bc7267a92b0dd6662f70521d3ebb1b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/Analysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis.dql
deleted file mode 100644
index eb7655f15f9f6e7b9289269df92c18b3b257ae2e..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT	usageToA.avgResponseTime
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_A.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_B.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_B.dql
deleted file mode 100644
index ce4bdad143e0924e8822c93d09bccb52ebd246cc..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_C.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_C.dql
deleted file mode 100644
index 368207562086fc13b7cc9a9878bdcdabf201963b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql
deleted file mode 100644
index 8ab240aefc1e2c5b91dea753babe6cbd7a42f1c9..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql
deleted file mode 100644
index 54bb1c2346d2d2b0b27bf61df86a1fcf095a7e92..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql
deleted file mode 100644
index 499a3449ba26349c0dec8e0a69f5c367ababf581..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_D.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_D.dql
deleted file mode 100644
index fdbc0e87bc87f0487c36bfa37cde31438524648f..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql
deleted file mode 100644
index 5c796306aa5f93c081f33bbeab41c771ff279c28..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_E.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_E.dql
deleted file mode 100644
index b4a02fd19e9d00e0afe82df3140d50ee16944320..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_F.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_F.dql
deleted file mode 100644
index 864f0ef63acca6ec91d0fe7afb04ab2dce41b617..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_G.dql b/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_G.dql
deleted file mode 100644
index ea851f2c026ea0d1a0f3a47dd70b9762ab0bbb89..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_DG_with_MARS/DQL-Queries/TimeAnalysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis.dql
index d29e44537f067885ac02a14c4ed87a957a739b89..32303af97a15dab81b0be03061e2bd33bb6b8a7f 100644
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis.dql
+++ b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis.dql
@@ -1,5 +1,4 @@
 SELECT CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPFG_CPU.utilization, usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F:G'
 EVALUATE DOF
 	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.020>
 FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_A.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_B.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_B.dql
deleted file mode 100644
index 9f64a755d0fcf1f11b2c4bdf5fde7a0b047c3513..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, CPA_CPU.utilization, ToB.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_C.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_C.dql
deleted file mode 100644
index c22e02f702c0f8131aeb747da2e1a2a0c1aacf63..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CE.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CE.dql
deleted file mode 100644
index 7b6c2add372e5fcbe2c0b3bebc56146e6f198763..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CF.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CF.dql
deleted file mode 100644
index ee7052cc316140e384047868c10c58752489ad46..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CG.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CG.dql
deleted file mode 100644
index 5b598836fd88e2f2a56a789a8309338ee21f2bf7..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_D.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_D.dql
deleted file mode 100644
index c917706a5995679b94c94a2e18dffd6da3d40323..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_DE.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_DE.dql
deleted file mode 100644
index 236885ae632e45744d1d134cd0988e013095d904..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_E.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_E.dql
deleted file mode 100644
index 7a2f201841b1b4163ecf1389b4818fe6d0393d86..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_F.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_F.dql
deleted file mode 100644
index 320108c326024f375d76987c9c850806765fe0cf..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_G.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_G.dql
deleted file mode 100644
index 7b2029c1d3bc7267a92b0dd6662f70521d3ebb1b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_mars.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_mars.dql
new file mode 100644
index 0000000000000000000000000000000000000000..c10a4721aab3dcb6c51d85ff012f4eb57ab800c2
--- /dev/null
+++ b/dml-examples/Scenario_Coloc_FG/DQL-Queries/Analysis_mars.dql
@@ -0,0 +1,13 @@
+SELECT usageToA.avgResponseTime//, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime
+CONSTRAINED AS 'USE_STATISTICAL_MODEL:F:G'
+EVALUATE DOF
+	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.020>
+FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
+	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
+	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
+	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
+	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
+	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
+	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
+	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF
+USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis.dql
deleted file mode 100644
index 6504af4e74cc191f100728a31fd716627c875f8b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis.dql
+++ /dev/null
@@ -1,12 +0,0 @@
-SELECT	usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_A.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_B.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_B.dql
deleted file mode 100644
index ce4bdad143e0924e8822c93d09bccb52ebd246cc..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_C.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_C.dql
deleted file mode 100644
index 368207562086fc13b7cc9a9878bdcdabf201963b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CE.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CE.dql
deleted file mode 100644
index 8ab240aefc1e2c5b91dea753babe6cbd7a42f1c9..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CF.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CF.dql
deleted file mode 100644
index 54bb1c2346d2d2b0b27bf61df86a1fcf095a7e92..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CG.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CG.dql
deleted file mode 100644
index 499a3449ba26349c0dec8e0a69f5c367ababf581..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_D.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_D.dql
deleted file mode 100644
index fdbc0e87bc87f0487c36bfa37cde31438524648f..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_DE.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_DE.dql
deleted file mode 100644
index 5c796306aa5f93c081f33bbeab41c771ff279c28..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_E.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_E.dql
deleted file mode 100644
index b4a02fd19e9d00e0afe82df3140d50ee16944320..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_F.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_F.dql
deleted file mode 100644
index 864f0ef63acca6ec91d0fe7afb04ab2dce41b617..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_G.dql b/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_G.dql
deleted file mode 100644
index ea851f2c026ea0d1a0f3a47dd70b9762ab0bbb89..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG/DQL-Queries/TimeAnalysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.deployment b/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.deployment
deleted file mode 100644
index 8e0f7f051b92b8d867a7d94d1afb7855e5b604b8..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.deployment
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment:Deployment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:deployment="http://www.descartes.tools/metamodel/deployment/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_04BXQOa4EeGWevb6qKkohg" name="depl">
-  <system href="min.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <targetResourceLandscape href="min.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
-  <deploymentContexts id="_cpot0O2fEeib_P5jAe7dPw" name="A --> CPA">
-    <assemblyContext href="min.system#A"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_c_BH8e2fEeib_P5jAe7dPw" name="B --> CPB">
-    <assemblyContext href="min.system#B"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_We1_g-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dD0vce2fEeib_P5jAe7dPw" name="C --> CPC">
-    <assemblyContext href="min.system#C"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_WjRMg-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dJi88e2fEeib_P5jAe7dPw" name="D --> CPD">
-    <assemblyContext href="min.system#D"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_Wr9Oc-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dT7A8e2fEeib_P5jAe7dPw" name="E --> CPE">
-    <assemblyContext href="min.system#E"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_W2Lhc-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dcUH8e2fEeib_P5jAe7dPw" name="F --> CPFG">
-    <assemblyContext href="min.system#F"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_W9C-c-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_othWce2fEeib_P5jAe7dPw" name="G --> CPFG">
-    <assemblyContext href="min.system#G"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_W9C-c-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-</deployment:Deployment>
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.repository b/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.repository
deleted file mode 100644
index a35015d256e53ec81721c6104726640a5e51b8c7..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.repository
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<repository:Repository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:resourcetype="http://www.descartes.tools/metamodel/resourcetype/1.0" xmlns:servicebehavior="http://www.descartes.tools/metamodel/servicebehavior/1.0" id="_O2wgMEcEEeOgk9V4uRCQAw" name="repositoryName">
-  <interfaces id="_uqNJk-2aEeib_P5jAe7dPw" name="A">
-    <signatures id="_vzGrUO2aEeib_P5jAe7dPw" name="A"/>
-  </interfaces>
-  <interfaces id="_xapQ4O2aEeib_P5jAe7dPw" name="B">
-    <signatures id="_xapQ4e2aEeib_P5jAe7dPw" name="B"/>
-  </interfaces>
-  <interfaces id="_xf4WMu2aEeib_P5jAe7dPw" name="C">
-    <signatures id="_xf4WM-2aEeib_P5jAe7dPw" name="C"/>
-  </interfaces>
-  <interfaces id="_I6TZQu2bEeib_P5jAe7dPw" name="D">
-    <signatures id="_I6TZQ-2bEeib_P5jAe7dPw" name="D"/>
-  </interfaces>
-  <interfaces id="_JCed0e2bEeib_P5jAe7dPw" name="E">
-    <signatures id="_JCed0u2bEeib_P5jAe7dPw" name="E"/>
-  </interfaces>
-  <interfaces id="_JTZ1wu2bEeib_P5jAe7dPw" name="F">
-    <signatures id="_JTZ1w-2bEeib_P5jAe7dPw" name="F"/>
-  </interfaces>
-  <interfaces id="_JqhVQu2bEeib_P5jAe7dPw" name="G">
-    <signatures id="_JqhVQ-2bEeib_P5jAe7dPw" name="G"/>
-  </interfaces>
-  <components xsi:type="repository:BasicComponent" id="_Q2VbtO2bEeib_P5jAe7dPw" name="A">
-    <interfaceProvidingRoles id="_SHb3MO2bEeib_P5jAe7dPw" name="A" interface="_uqNJk-2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_S0bgEe2bEeib_P5jAe7dPw" name="B" interface="_xapQ4O2aEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_vzGrUO2aEeib_P5jAe7dPw" interfaceProvidingRole="_SHb3MO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_Z0axAO2bEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.05"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_jPXogO2bEeib_P5jAe7dPw" name="ToB" signature="_xapQ4e2aEeib_P5jAe7dPw" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_pR8ecPMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_ng-npO2bEeib_P5jAe7dPw" name="B">
-    <interfaceProvidingRoles id="_oTaxMO2bEeib_P5jAe7dPw" name="B" interface="_xapQ4O2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_o-tJ4e2bEeib_P5jAe7dPw" name="C" interface="_xf4WMu2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_pW0u8e2bEeib_P5jAe7dPw" name="E" interface="_JCed0e2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_xapQ4e2aEeib_P5jAe7dPw" interfaceProvidingRole="_oTaxMO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_wQn4UO2bEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="20"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_1XjV4O2bEeib_P5jAe7dPw" name="ToC" signature="_xf4WM-2aEeib_P5jAe7dPw" interfaceRequiringRole="_o-tJ4e2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_3Nfj0O2bEeib_P5jAe7dPw" name="ToE" signature="_JCed0u2bEeib_P5jAe7dPw" interfaceRequiringRole="_pW0u8e2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_-H9EAfMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_5tliBO2bEeib_P5jAe7dPw" name="C">
-    <interfaceProvidingRoles id="_7gZjcO2bEeib_P5jAe7dPw" name="C" interface="_xf4WMu2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_674hIe2bEeib_P5jAe7dPw" name="D" interface="_I6TZQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_xf4WM-2aEeib_P5jAe7dPw" interfaceProvidingRole="_7gZjcO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_CXbssO2cEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:NormalDistribution" mu="10" sigma="1"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:LoopAction">
-          <loopBodyBehavior>
-            <actions xsi:type="servicebehavior:ExternalCallAction">
-              <externalCall id="_W7bVMO2cEeib_P5jAe7dPw" name="ToD" signature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_674hIe2bEeib_P5jAe7dPw"/>
-            </actions>
-          </loopBodyBehavior>
-          <loopIterationCount id="_HkxUQO2cEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:IntLiteral" value="5"/>
-            </explicitDescription>
-          </loopIterationCount>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="__bzRgfMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_szxFBO2dEeib_P5jAe7dPw" name="D">
-    <interfaceProvidingRoles id="_uP8vIO2dEeib_P5jAe7dPw" name="D" interface="_I6TZQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceProvidingRole="_uP8vIO2dEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_zA8Y8O2dEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:NormalDistribution" mu="10" sigma="1"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_ADsX8fMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_59cRBO2dEeib_P5jAe7dPw" name="E">
-    <interfaceProvidingRoles id="_6wgFoO2dEeib_P5jAe7dPw" name="E" interface="_JCed0e2bEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_7K9NAe2dEeib_P5jAe7dPw" name="F" interface="_JTZ1wu2bEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_7nafge2dEeib_P5jAe7dPw" name="G" interface="_JqhVQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JCed0u2bEeib_P5jAe7dPw" interfaceProvidingRole="_6wgFoO2dEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_Df43oO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.2"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_NSR-wO2eEeib_P5jAe7dPw" name="ToF" signature="_JTZ1w-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7K9NAe2dEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_PVKcgO2eEeib_P5jAe7dPw" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_BLBzcfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_RZ57dO2eEeib_P5jAe7dPw" name="F">
-    <interfaceProvidingRoles id="_S_LQIO2eEeib_P5jAe7dPw" name="F" interface="_JTZ1wu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JTZ1w-2bEeib_P5jAe7dPw" interfaceProvidingRole="_S_LQIO2eEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:BranchAction">
-          <branches>
-            <actions xsi:type="servicebehavior:InternalAction">
-              <resourceDemand id="_cG0KEO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-                <explicitDescription>
-                  <probFunction xsi:type="functions:DoubleLiteral" value="20"/>
-                </explicitDescription>
-                <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-              </resourceDemand>
-            </actions>
-          </branches>
-          <branches>
-            <actions xsi:type="servicebehavior:InternalAction">
-              <resourceDemand id="_gSfgUe2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-                <explicitDescription>
-                  <probFunction xsi:type="functions:DoubleLiteral" value="100"/>
-                </explicitDescription>
-                <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-              </resourceDemand>
-            </actions>
-          </branches>
-          <branchProbabilities id="_XbBJUO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.8"/>
-            </explicitDescription>
-          </branchProbabilities>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_CE2-cfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_R1LiNO2eEeib_P5jAe7dPw" name="G">
-    <interfaceProvidingRoles id="_TRbdwO2eEeib_P5jAe7dPw" name="G" interface="_JqhVQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceProvidingRole="_TRbdwO2eEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_mprE0O2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.03333333333"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_DWdJMfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-</repository:Repository>
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.resourcelandscape b/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.resourcelandscape
deleted file mode 100644
index b029f2ee2769874a461d641d6e31a53667121605..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.resourcelandscape
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc">
-  <consistsOf id="_FnQfwEnuEeOWVc_o6w1CBw" name="dc">
-    <computeNodes id="_EuLk4ObvEeWHMYaSILpfIw" name="CPA">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_yS7WwfMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_0rctUPMLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_We1_g-2fEeib_P5jAe7dPw" name="CPB">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_We1_hO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_We1_he2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6JPywPMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6JPywfMLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_WjRMg-2fEeib_P5jAe7dPw" name="CPC">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_WjRMhO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_WjRMhe2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6aFrIvMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6aFrI_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_Wr9Oc-2fEeib_P5jAe7dPw" name="CPD">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_Wr9OdO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_Wr9Ode2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6uWD4vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6uWD4_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_W2Lhc-2fEeib_P5jAe7dPw" name="CPE">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_W2LhdO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_W2Lhde2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_7J0e8vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_7J0e8_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_W9C-c-2fEeib_P5jAe7dPw" name="CPFG">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_W9C-dO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_W9C-de2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_7nRP8vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_7nRP8_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-  </consistsOf>
-</resourcelandscape:DistributedDataCenter>
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.system b/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.system
deleted file mode 100644
index d7813942d6d04ee3612ba03b44920aa50d04a913..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.system
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<system:System xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:system="http://www.descartes.tools/metamodel/system/1.0" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys">
-  <assemblyContexts id="A" name="A">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_Q2VbtO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="786.347"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-5.41497" knot="108">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="22.1636" knot="10" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-4.29429" knot="10">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="B" name="B">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_ng-npO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="228.853"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-5.4159" knot="107" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="27.5766" knot="9" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-9.66078" knot="9">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="C" name="C">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_5tliBO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="98.4225"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-5.16605" knot="101">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="27.4128" knot="4" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-9.58874" knot="4">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="D" name="D">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_szxFBO2dEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="996.405"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="2.89923" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-5.0915" knot="195">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="E" name="E">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_59cRBO2dEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="308.985"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="6.68849" knot="4">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="25.0551" knot="16" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-17.2412" knot="16">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="4.87276" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="F" name="F">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_RZ57dO2eEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="-1.22861E+13"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-1.22861E+13" knot="3" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="1.22861E+13" knot="3">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="1.22861E+13" knot="2" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-1.22861E+13" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="G" name="G">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_R1LiNO2eEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="119.169"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="6.21579" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="22.0653" knot="7" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-15.4502" knot="7">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyConnectors id="_95dlMe2eEeib_P5jAe7dPw" name="A --> B" providingAssemblyContext="B" requiringAssemblyContext="A">
-    <interfaceRequiringRole href="min.repository#_S0bgEe2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_-u-Q4e2eEeib_P5jAe7dPw" name="B --> C" providingAssemblyContext="C" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_o-tJ4e2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__Da24e2eEeib_P5jAe7dPw" name="C --> D" providingAssemblyContext="D" requiringAssemblyContext="C">
-    <interfaceRequiringRole href="min.repository#_674hIe2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__NpJ4e2eEeib_P5jAe7dPw" name="B --> E" providingAssemblyContext="E" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_pW0u8e2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__X3c4e2eEeib_P5jAe7dPw" name="E --> F" providingAssemblyContext="F" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7K9NAe2dEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__iQH8e2eEeib_P5jAe7dPw" name="E --> G" providingAssemblyContext="G" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7nafge2dEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <providingDelegationConnectors id="_7NJv8u2eEeib_P5jAe7dPw" name="A --> A" assemblyContext="A" outerInterfaceProvidingRole="_43ITxO2eEeib_P5jAe7dPw">
-    <innerInterfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_43ITxO2eEeib_P5jAe7dPw" name="outerA">
-    <interface href="min.repository#_uqNJk-2aEeib_P5jAe7dPw"/>
-  </interfaceProvidingRoles>
-</system:System>
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.system.bak b/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.system.bak
deleted file mode 100644
index 3cdb13a02436942b69798895c41abd40aa854575..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.system.bak
+++ /dev/null
@@ -1,165 +0,0 @@
-<system:System xmlns:system="http://www.descartes.tools/metamodel/system/1.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys" xmi:version="2.0">
-  <assemblyContexts id="A" name="A">
-    <encapsulatedComponent href="min.repository#_Q2VbtO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="262.84963425757894" xsi:type="system:Constant" /><basisFunctions coefficient="25.1950842561908" knot="9" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-5.976227106218841" knot="9" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-18.661905059764372" knot="107" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="B" name="B">
-    <encapsulatedComponent href="min.repository#_ng-npO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="232.2645484858773" xsi:type="system:Constant" /><basisFunctions coefficient="25.52707636070293" knot="8" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-5.8673196423639755" knot="8" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-1.4301195149020542" knot="58" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="C" name="C">
-    <encapsulatedComponent href="min.repository#_5tliBO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="111.82389647914309" xsi:type="system:Constant" /><basisFunctions coefficient="26.158780903204537" knot="4" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-8.269589171172274" knot="4" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-1.5943941620931752" knot="37" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="D" name="D">
-    <encapsulatedComponent href="min.repository#_szxFBO2dEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="1777.895105277294" xsi:type="system:Constant" /><basisFunctions coefficient="-12.048274165389246" knot="4" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="13.624554538340941" knot="4" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-17.19997044564344" knot="106" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="E" name="E">
-    <encapsulatedComponent href="min.repository#_59cRBO2dEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="80.694074311176" xsi:type="system:Constant" /><basisFunctions coefficient="12.175649652283221" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-2.6639153640224316" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-14.347524289871105" knot="18" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="F" name="F">
-    <encapsulatedComponent href="min.repository#_RZ57dO2eEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="196540843982208.88" xsi:type="system:Constant" /><basisFunctions coefficient="-39308168796415.17" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="39308168796422.97" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="39308168796428.94" knot="7" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-39308168796432.36" knot="7" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="G" name="G">
-    <encapsulatedComponent href="min.repository#_R1LiNO2eEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="41.50498064823611" xsi:type="system:Constant" /><basisFunctions coefficient="11.831802896944605" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-8.973996639715038" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyConnectors id="_95dlMe2eEeib_P5jAe7dPw" name="A --&gt; B" providingAssemblyContext="B" requiringAssemblyContext="A">
-    <interfaceRequiringRole href="min.repository#_S0bgEe2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="_-u-Q4e2eEeib_P5jAe7dPw" name="B --&gt; C" providingAssemblyContext="C" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_o-tJ4e2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__Da24e2eEeib_P5jAe7dPw" name="C --&gt; D" providingAssemblyContext="D" requiringAssemblyContext="C">
-    <interfaceRequiringRole href="min.repository#_674hIe2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__NpJ4e2eEeib_P5jAe7dPw" name="B --&gt; E" providingAssemblyContext="E" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_pW0u8e2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__X3c4e2eEeib_P5jAe7dPw" name="E --&gt; F" providingAssemblyContext="F" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7K9NAe2dEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__iQH8e2eEeib_P5jAe7dPw" name="E --&gt; G" providingAssemblyContext="G" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7nafge2dEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <providingDelegationConnectors assemblyContext="A" id="_7NJv8u2eEeib_P5jAe7dPw" name="A --&gt; A" outerInterfaceProvidingRole="_43ITxO2eEeib_P5jAe7dPw">
-    <innerInterfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_43ITxO2eEeib_P5jAe7dPw" name="outerA">
-    <interface href="min.repository#_uqNJk-2aEeib_P5jAe7dPw" />
-  </interfaceProvidingRoles>
-</system:System>
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.usageprofile b/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.usageprofile
deleted file mode 100644
index 1b2f4a29ad6005566ac8d3518eeca8cb266d3386..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DML-Model/min.usageprofile
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<usageprofile:UsageProfile xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:usageprofile="http://www.descartes.tools/metamodel/usageprofile/1.0" id="_yiEmIEeqEeSW4Op0B0CyhQ" name="usgProfile">
-  <imports importURI="min.system"/>
-  <imports importURI="min.repository"/>
-  <system href="min.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="usagescenario">
-    <scenarioBehavior>
-      <actions xsi:type="usageprofile:SystemCallUserAction" id="_A_DeMEmxEeOPLK3yYyEQWQ" name="usageToA">
-        <providingRole href="min.system#_43ITxO2eEeib_P5jAe7dPw"/>
-        <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-      </actions>
-    </scenarioBehavior>
-    <workloadType xsi:type="usageprofile:OpenWorkloadType">
-      <interArrivalTime>
-        <probFunction xsi:type="functions:ExponentialDistribution" rate="0.005"/>
-      </interArrivalTime>
-    </workloadType>
-  </usageScenarios>
-</usageprofile:UsageProfile>
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_A.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_B.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_B.dql
deleted file mode 100644
index 9f64a755d0fcf1f11b2c4bdf5fde7a0b047c3513..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, CPA_CPU.utilization, ToB.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_C.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_C.dql
deleted file mode 100644
index c22e02f702c0f8131aeb747da2e1a2a0c1aacf63..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CE.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CE.dql
deleted file mode 100644
index 7b6c2add372e5fcbe2c0b3bebc56146e6f198763..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CF.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CF.dql
deleted file mode 100644
index ee7052cc316140e384047868c10c58752489ad46..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CG.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CG.dql
deleted file mode 100644
index 5b598836fd88e2f2a56a789a8309338ee21f2bf7..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_D.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_D.dql
deleted file mode 100644
index c917706a5995679b94c94a2e18dffd6da3d40323..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_DE.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_DE.dql
deleted file mode 100644
index 236885ae632e45744d1d134cd0988e013095d904..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_E.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_E.dql
deleted file mode 100644
index 7a2f201841b1b4163ecf1389b4818fe6d0393d86..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_F.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_F.dql
deleted file mode 100644
index 320108c326024f375d76987c9c850806765fe0cf..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_G.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_G.dql
deleted file mode 100644
index 7b2029c1d3bc7267a92b0dd6662f70521d3ebb1b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/Analysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis.dql
deleted file mode 100644
index eb7655f15f9f6e7b9289269df92c18b3b257ae2e..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT	usageToA.avgResponseTime
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_A.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_B.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_B.dql
deleted file mode 100644
index ce4bdad143e0924e8822c93d09bccb52ebd246cc..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_C.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_C.dql
deleted file mode 100644
index 368207562086fc13b7cc9a9878bdcdabf201963b..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql
deleted file mode 100644
index 8ab240aefc1e2c5b91dea753babe6cbd7a42f1c9..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql
deleted file mode 100644
index 54bb1c2346d2d2b0b27bf61df86a1fcf095a7e92..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql
deleted file mode 100644
index 499a3449ba26349c0dec8e0a69f5c367ababf581..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_D.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_D.dql
deleted file mode 100644
index fdbc0e87bc87f0487c36bfa37cde31438524648f..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql
deleted file mode 100644
index 5c796306aa5f93c081f33bbeab41c771ff279c28..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_E.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_E.dql
deleted file mode 100644
index b4a02fd19e9d00e0afe82df3140d50ee16944320..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_F.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_F.dql
deleted file mode 100644
index 864f0ef63acca6ec91d0fe7afb04ab2dce41b617..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_G.dql b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_G.dql
deleted file mode 100644
index ea851f2c026ea0d1a0f3a47dd70b9762ab0bbb89..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/TimeAnalysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/minmodel.properties b/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/minmodel.properties
deleted file mode 100644
index b003bdf2ce2cef82cdc5f8807bcffa80136a8537..0000000000000000000000000000000000000000
--- a/dml-examples/Scenario_Coloc_FG_with_MARS/DQL-Queries/minmodel.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-## Model Instance
-dml.files.usageprofile=/../DML-Model/min.usageprofile
-dml.files.system=/../DML-Model/min.system
-dml.files.resourcelandscape=/../DML-Model/min.resourcelandscape
-dml.files.repository=/../DML-Model/min.repository
-dml.files.deployment=/../DML-Model/min.deployment
-#dml.outputdirectory=/../results/
\ No newline at end of file