diff --git a/edu.kit.ipd.descartes.mm.workload/.classpath b/edu.kit.ipd.descartes.mm.workload/.classpath
deleted file mode 100644
index 121e527a9386dd66bdd0ec178fc2d28d734b82f8..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/edu.kit.ipd.descartes.mm.workload/.project b/edu.kit.ipd.descartes.mm.workload/.project
deleted file mode 100644
index 8e2331ec2a71cc9dbfad57ae7356bb6d1d70c861..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>edu.kit.ipd.descartes.mm.workload</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/edu.kit.ipd.descartes.mm.workload/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.workload/META-INF/MANIFEST.MF
deleted file mode 100644
index 1c2ac980e6fb8178d60ae3a100a1f0759333930a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: edu.kit.ipd.descartes.mm.workload;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: edu.kit.ipd.descartes.mm.workload,
- edu.kit.ipd.descartes.mm.workload.impl,
- edu.kit.ipd.descartes.mm.workload.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- edu.kit.ipd.descartes.mm.applicationlevel;visibility:=reexport,
- edu.kit.ipd.descartes.core;visibility:=reexport,
- edu.kit.ipd.descartes.identifier;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/edu.kit.ipd.descartes.mm.workload/build.properties b/edu.kit.ipd.descartes.mm.workload/build.properties
deleted file mode 100644
index 9c36b4543433d302c3e41714c5fb8f62ddfb2cfa..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/edu.kit.ipd.descartes.mm.workload/model/workload.ecore b/edu.kit.ipd.descartes.mm.workload/model/workload.ecore
deleted file mode 100644
index e7ab54c6c64213013961b8778da1f2735b12472c..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/model/workload.ecore
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="workload" nsURI="http://www.descartes-research.net/metamodel/workload/0.1"
-    nsPrefix="workload">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
-    <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
-    <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="Workload" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="system" ordered="false"
-        eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/system.ecore#//System"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="usageScenarios" ordered="false"
-        upperBound="-1" eType="#//UsageScenario" containment="true" eOpposite="#//UsageScenario/usageModel"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UsageScenario" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="usageModel" ordered="false"
-        lowerBound="1" eType="#//Workload" eOpposite="#//Workload/usageScenarios"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="scenarioBehavior" ordered="false"
-        lowerBound="1" eType="#//ScenarioBehavior" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="workloadType" ordered="false"
-        lowerBound="1" eType="#//WorkloadType" containment="true" eOpposite="#//WorkloadType/usageScenario"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ScenarioBehavior">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"
-        eType="#//AbstractUserAction" containment="true" eOpposite="#//AbstractUserAction/parentScenarioBehavior"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WorkloadType" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="usageScenario" ordered="false"
-        lowerBound="1" eType="#//UsageScenario" eOpposite="#//UsageScenario/workloadType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OpenWorkloadType" eSuperTypes="#//WorkloadType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-      <details key="constraints" value="interArrivalTimeInOpenWorkloadNeedsToBeSpecified"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-      <details key="interArrivalTimeInOpenWorkloadNeedsToBeSpecified" value="not self.interArrivalTime.oclIsUndefined() and not self.interArrivalTime.probFunction.oclIsUndefined()"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="interArrivalTime" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore#//RandomVariable"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ClosedWorkloadType" eSuperTypes="#//WorkloadType">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-      <details key="constraints" value="thinkTimeInClosedWorkloadNeedsToBeSpecified populationInClosedWorkloadNeedsToBeGreaterThanZero"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-      <details key="thinkTimeInClosedWorkloadNeedsToBeSpecified" value="not self.thinkTime.oclIsUndefined() and not self.thinkTime.probFunction.oclIsUndefined()"/>
-      <details key="populationInClosedWorkloadNeedsToBeGreaterThanZero" value="self.population > 0"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="population" ordered="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="thinkTime" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore#//RandomVariable"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractUserAction" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentScenarioBehavior"
-        ordered="false" lowerBound="1" eType="#//ScenarioBehavior" eOpposite="#//ScenarioBehavior/actions"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LoopUserAction" eSuperTypes="#//AbstractUserAction">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopBodyScenarioBehavior"
-        ordered="false" lowerBound="1" eType="#//ScenarioBehavior" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopIterationCount" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore#//RandomVariable"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DelayUserAction" eSuperTypes="#//AbstractUserAction">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="timeSpecification" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore#//RandomVariable"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BranchUserAction" eSuperTypes="#//AbstractUserAction">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="branches" upperBound="-1"
-        eType="#//ScenarioBehavior" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="branchUserProbabilities"
-        ordered="false" lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore#//RandomVariable"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EntryLevelSystemCall" eSuperTypes="#//AbstractUserAction">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="providingRole" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore#//InterfaceProvidingRole"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="signature" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore#//Signature"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputParameterSettings"
-        ordered="false" upperBound="-1" eType="#//CallParameterSetting" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CallParameterSetting">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="characterization" ordered="false"
-        lowerBound="1" eType="ecore:EEnum ../../edu.kit.ipd.descartes.mm.applicationlevel/model/parameterdependency.ecore#//ParameterCharacterizationType"
-        defaultValueLiteral="VALUE"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore#//RandomVariable"
-        containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/edu.kit.ipd.descartes.mm.workload/model/workload.ecore.oclinecore b/edu.kit.ipd.descartes.mm.workload/model/workload.ecore.oclinecore
deleted file mode 100644
index 13fa727b4000f751c3d7d6433c54cd4dbd7c45ab..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/model/workload.ecore.oclinecore
+++ /dev/null
@@ -1,81 +0,0 @@
-import ecore_0 : 'http://www.eclipse.org/emf/2002/Ecore#/';
-import core_0 : '../../edu.kit.ipd.descartes.core/model/core.ecore#/';
-import repository_0 : '../../edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore#/';
-import functions_0 : '../../edu.kit.ipd.descartes.mm.applicationlevel/model/functions.ecore#/';
-import parameterdependency_0 : '../../edu.kit.ipd.descartes.mm.applicationlevel/model/parameterdependency.ecore#/'; 
-import system_0 : '../../edu.kit.ipd.descartes.mm.applicationlevel/model/system.ecore#/'; 
-
-package workload : workload = 'http://www.descartes-research.net/metamodel/workload/0.1'
-	{
-		class Workload extends core_0::Entity
-		{
-			property system : system_0::System[?];
-			property usageScenarios#usageModel : UsageScenario[0..*] { composes };
-		}
-		
-		class UsageScenario extends core_0::Entity
-		{
-			property usageModel#usageScenarios : Workload[1]; 
-			property scenarioBehavior : ScenarioBehavior[1] { composes };
-			property workloadType#usageScenario : WorkloadType[1] { composes };
-		}
-		
-		class ScenarioBehavior
-		{
-			property actions#parentScenarioBehavior : AbstractUserAction[*] { composes, ordered };
-		}
-
-		abstract class WorkloadType 
-		{
-			property usageScenario#workloadType : UsageScenario[1];
-		} 
-		
-		class OpenWorkloadType extends WorkloadType
-		{
-			property interArrivalTime : functions_0::RandomVariable[1] {composes};
-			invariant interArrivalTimeInOpenWorkloadNeedsToBeSpecified :
-			          not self.interArrivalTime.oclIsUndefined() and not self.interArrivalTime.probFunction.oclIsUndefined();
-		}
-		class ClosedWorkloadType extends WorkloadType
-		{
-			attribute population : Integer[1];
-			property thinkTime : functions_0::RandomVariable[1] {composes};
-			invariant thinkTimeInClosedWorkloadNeedsToBeSpecified :
-			            not self.thinkTime.oclIsUndefined() and not self.thinkTime.probFunction.oclIsUndefined();
-			invariant populationInClosedWorkloadNeedsToBeGreaterThanZero :
-			 		    self.population > 0;	
-		}
-		
-		abstract class AbstractUserAction
-		{
-			property parentScenarioBehavior#actions : ScenarioBehavior[1];
-		}		
-		class LoopUserAction extends AbstractUserAction
-		{
-			property loopBodyScenarioBehavior : ScenarioBehavior[1] { composes };
-			property loopIterationCount : functions_0::RandomVariable[1] {composes};
-		}	
-		class DelayUserAction extends AbstractUserAction
-		{
-			property timeSpecification : functions_0::RandomVariable[1] {composes};
-		}
-		class BranchUserAction extends AbstractUserAction
-		{
-			property branches : ScenarioBehavior[0..*] { composes, ordered };
-			property branchUserProbabilities : functions_0::RandomVariable[1] {composes};
-		}
-		
-		class EntryLevelSystemCall extends AbstractUserAction
-		{
-			property providingRole : repository_0::InterfaceProvidingRole[1];
-			property signature : repository_0::Signature[1];
-			property inputParameterSettings : CallParameterSetting[0..*] { composes };
-			-- TODO check: outputParameterUsage necessary?
-			--   property outputParameterUsages#variableUsage : VariableUsage[0..*] { composes };
-		}
-		class CallParameterSetting {
-			attribute name : String[1];
-			attribute characterization : parameterdependency_0::ParameterCharacterizationType[1] = 'VALUE';
-			property value : functions_0::RandomVariable[1] {composes};	
-		}	
-	}
\ No newline at end of file
diff --git a/edu.kit.ipd.descartes.mm.workload/model/workload.genmodel b/edu.kit.ipd.descartes.mm.workload/model/workload.genmodel
deleted file mode 100644
index ccf1f0f67071cef44dc99d28d3bc33f0c6e6a8c2..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/model/workload.genmodel
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT"
-    modelDirectory="/edu.kit.ipd.descartes.mm.workload/src" modelPluginID="edu.kit.ipd.descartes.mm.workload"
-    modelName="Workload" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"
-    copyrightFields="false" usedGenPackages="../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//functions ../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//parameterdependencies ../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//repository ../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//servicebehavior ../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//system ../../edu.kit.ipd.descartes.core/model/core.genmodel#//core ../../edu.kit.ipd.descartes.identifier/model/identifier.genmodel#//identifier ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.genmodel#//resourcetype">
-  <foreignModel>workload.ecore</foreignModel>
-  <genPackages prefix="Workload" basePackage="edu.kit.ipd.descartes.mm" disposableProviderFactory="true"
-      ecorePackage="workload.ecore#/">
-    <genClasses ecoreClass="workload.ecore#//Workload">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference workload.ecore#//Workload/system"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//Workload/usageScenarios"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//UsageScenario">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference workload.ecore#//UsageScenario/usageModel"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//UsageScenario/scenarioBehavior"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//UsageScenario/workloadType"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//ScenarioBehavior">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//ScenarioBehavior/actions"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="workload.ecore#//WorkloadType">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference workload.ecore#//WorkloadType/usageScenario"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//OpenWorkloadType">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//OpenWorkloadType/interArrivalTime"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//ClosedWorkloadType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute workload.ecore#//ClosedWorkloadType/population"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//ClosedWorkloadType/thinkTime"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="workload.ecore#//AbstractUserAction">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference workload.ecore#//AbstractUserAction/parentScenarioBehavior"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//LoopUserAction">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//LoopUserAction/loopBodyScenarioBehavior"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//LoopUserAction/loopIterationCount"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//DelayUserAction">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//DelayUserAction/timeSpecification"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//BranchUserAction">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//BranchUserAction/branches"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//BranchUserAction/branchUserProbabilities"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//EntryLevelSystemCall">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference workload.ecore#//EntryLevelSystemCall/providingRole"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference workload.ecore#//EntryLevelSystemCall/signature"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//EntryLevelSystemCall/inputParameterSettings"/>
-    </genClasses>
-    <genClasses ecoreClass="workload.ecore#//CallParameterSetting">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute workload.ecore#//CallParameterSetting/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute workload.ecore#//CallParameterSetting/characterization"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference workload.ecore#//CallParameterSetting/value"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/edu.kit.ipd.descartes.mm.workload/plugin.properties b/edu.kit.ipd.descartes.mm.workload/plugin.properties
deleted file mode 100644
index 89d6ae29cab07fb5d72bd5544bcbd797483e6e61..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
-
-pluginName = Workload Model
-providerName = www.example.org
diff --git a/edu.kit.ipd.descartes.mm.workload/plugin.xml b/edu.kit.ipd.descartes.mm.workload/plugin.xml
deleted file mode 100644
index 87d4e0fda45dd49ab62f1e7c7b42ab77dc01867d..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.descartes-research.net/metamodel/workload/0.1"
-            class="edu.kit.ipd.descartes.mm.workload.WorkloadPackage"
-            genModel="model/workload.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/edu.kit.ipd.descartes.mm.workload/pom.xml b/edu.kit.ipd.descartes.mm.workload/pom.xml
deleted file mode 100644
index 135d4be5464b2d769941bb4c09844def8cd3e69f..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>edu.kit.ipd.descartes.mm.workload</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  
-  <parent>
-  	<groupId>edu.kit.ipd.descartes.mm</groupId>
-  	<artifactId>edu.kit.ipd.descartes.mm.releng</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
-	<relativePath>../../releng/edu.kit.ipd.descartes.mm.releng</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/AbstractUserAction.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/AbstractUserAction.java
deleted file mode 100644
index e74a349eb78d921759c04027451f9e1c266d5bb4..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/AbstractUserAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract User Action</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.AbstractUserAction#getParentScenarioBehavior <em>Parent Scenario Behavior</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getAbstractUserAction()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractUserAction extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Parent Scenario Behavior</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior#getActions <em>Actions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent Scenario Behavior</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent Scenario Behavior</em>' container reference.
-	 * @see #setParentScenarioBehavior(ScenarioBehavior)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getAbstractUserAction_ParentScenarioBehavior()
-	 * @see edu.kit.ipd.descartes.mm.workload.ScenarioBehavior#getActions
-	 * @model opposite="actions" required="true" transient="false" ordered="false"
-	 * @generated
-	 */
-	ScenarioBehavior getParentScenarioBehavior();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.AbstractUserAction#getParentScenarioBehavior <em>Parent Scenario Behavior</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Scenario Behavior</em>' container reference.
-	 * @see #getParentScenarioBehavior()
-	 * @generated
-	 */
-	void setParentScenarioBehavior(ScenarioBehavior value);
-
-} // AbstractUserAction
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/BranchUserAction.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/BranchUserAction.java
deleted file mode 100644
index 2caf26bc0836ec8e10aa15884bf1311b31de9609..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/BranchUserAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Branch User Action</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.BranchUserAction#getBranches <em>Branches</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.BranchUserAction#getBranchUserProbabilities <em>Branch User Probabilities</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getBranchUserAction()
- * @model
- * @generated
- */
-public interface BranchUserAction extends AbstractUserAction {
-	/**
-	 * Returns the value of the '<em><b>Branches</b></em>' containment reference list.
-	 * The list contents are of type {@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Branches</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Branches</em>' containment reference list.
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getBranchUserAction_Branches()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<ScenarioBehavior> getBranches();
-
-	/**
-	 * Returns the value of the '<em><b>Branch User Probabilities</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Branch User Probabilities</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Branch User Probabilities</em>' containment reference.
-	 * @see #setBranchUserProbabilities(RandomVariable)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getBranchUserAction_BranchUserProbabilities()
-	 * @model containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	RandomVariable getBranchUserProbabilities();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.BranchUserAction#getBranchUserProbabilities <em>Branch User Probabilities</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Branch User Probabilities</em>' containment reference.
-	 * @see #getBranchUserProbabilities()
-	 * @generated
-	 */
-	void setBranchUserProbabilities(RandomVariable value);
-
-} // BranchUserAction
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/CallParameterSetting.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/CallParameterSetting.java
deleted file mode 100644
index 6b35c087e7e3486813f9eaf0ade5e8677f531ad8..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/CallParameterSetting.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterCharacterizationType;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Call Parameter Setting</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getName <em>Name</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getCharacterization <em>Characterization</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getCallParameterSetting()
- * @model
- * @generated
- */
-public interface CallParameterSetting extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getCallParameterSetting_Name()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Characterization</b></em>' attribute.
-	 * The default value is <code>"VALUE"</code>.
-	 * The literals are from the enumeration {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterCharacterizationType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Characterization</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Characterization</em>' attribute.
-	 * @see edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterCharacterizationType
-	 * @see #setCharacterization(ParameterCharacterizationType)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getCallParameterSetting_Characterization()
-	 * @model default="VALUE" required="true" ordered="false"
-	 * @generated
-	 */
-	ParameterCharacterizationType getCharacterization();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getCharacterization <em>Characterization</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Characterization</em>' attribute.
-	 * @see edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterCharacterizationType
-	 * @see #getCharacterization()
-	 * @generated
-	 */
-	void setCharacterization(ParameterCharacterizationType value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' containment reference.
-	 * @see #setValue(RandomVariable)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getCallParameterSetting_Value()
-	 * @model containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	RandomVariable getValue();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getValue <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' containment reference.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(RandomVariable value);
-
-} // CallParameterSetting
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/ClosedWorkloadType.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/ClosedWorkloadType.java
deleted file mode 100644
index a817ed9736757222ca14eee53c89cecf9b8f2191..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/ClosedWorkloadType.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import java.math.BigInteger;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Closed Workload Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType#getPopulation <em>Population</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType#getThinkTime <em>Think Time</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getClosedWorkloadType()
- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='thinkTimeInClosedWorkloadNeedsToBeSpecified populationInClosedWorkloadNeedsToBeGreaterThanZero'"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot thinkTimeInClosedWorkloadNeedsToBeSpecified='not self.thinkTime.oclIsUndefined() and not self.thinkTime.probFunction.oclIsUndefined()' populationInClosedWorkloadNeedsToBeGreaterThanZero='self.population > 0'"
- * @generated
- */
-public interface ClosedWorkloadType extends WorkloadType {
-	/**
-	 * Returns the value of the '<em><b>Population</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Population</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Population</em>' attribute.
-	 * @see #setPopulation(BigInteger)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getClosedWorkloadType_Population()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	BigInteger getPopulation();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType#getPopulation <em>Population</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Population</em>' attribute.
-	 * @see #getPopulation()
-	 * @generated
-	 */
-	void setPopulation(BigInteger value);
-
-	/**
-	 * Returns the value of the '<em><b>Think Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Think Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Think Time</em>' containment reference.
-	 * @see #setThinkTime(RandomVariable)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getClosedWorkloadType_ThinkTime()
-	 * @model containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	RandomVariable getThinkTime();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType#getThinkTime <em>Think Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Think Time</em>' containment reference.
-	 * @see #getThinkTime()
-	 * @generated
-	 */
-	void setThinkTime(RandomVariable value);
-
-} // ClosedWorkloadType
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/DelayUserAction.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/DelayUserAction.java
deleted file mode 100644
index cbd71240ef03d278c63ca95523ff2c94535b89a1..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/DelayUserAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Delay User Action</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.DelayUserAction#getTimeSpecification <em>Time Specification</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getDelayUserAction()
- * @model
- * @generated
- */
-public interface DelayUserAction extends AbstractUserAction {
-	/**
-	 * Returns the value of the '<em><b>Time Specification</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time Specification</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time Specification</em>' containment reference.
-	 * @see #setTimeSpecification(RandomVariable)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getDelayUserAction_TimeSpecification()
-	 * @model containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	RandomVariable getTimeSpecification();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.DelayUserAction#getTimeSpecification <em>Time Specification</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time Specification</em>' containment reference.
-	 * @see #getTimeSpecification()
-	 * @generated
-	 */
-	void setTimeSpecification(RandomVariable value);
-
-} // DelayUserAction
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/EntryLevelSystemCall.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/EntryLevelSystemCall.java
deleted file mode 100644
index cd4fad694bbd1e0d402e6206164f65d453bbf31a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/EntryLevelSystemCall.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRole;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Signature;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Entry Level System Call</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getProvidingRole <em>Providing Role</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getSignature <em>Signature</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getInputParameterSettings <em>Input Parameter Settings</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getEntryLevelSystemCall()
- * @model
- * @generated
- */
-public interface EntryLevelSystemCall extends AbstractUserAction {
-	/**
-	 * Returns the value of the '<em><b>Providing Role</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Providing Role</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Providing Role</em>' reference.
-	 * @see #setProvidingRole(InterfaceProvidingRole)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getEntryLevelSystemCall_ProvidingRole()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	InterfaceProvidingRole getProvidingRole();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getProvidingRole <em>Providing Role</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Providing Role</em>' reference.
-	 * @see #getProvidingRole()
-	 * @generated
-	 */
-	void setProvidingRole(InterfaceProvidingRole value);
-
-	/**
-	 * Returns the value of the '<em><b>Signature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Signature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Signature</em>' reference.
-	 * @see #setSignature(Signature)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getEntryLevelSystemCall_Signature()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	Signature getSignature();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getSignature <em>Signature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Signature</em>' reference.
-	 * @see #getSignature()
-	 * @generated
-	 */
-	void setSignature(Signature value);
-
-	/**
-	 * Returns the value of the '<em><b>Input Parameter Settings</b></em>' containment reference list.
-	 * The list contents are of type {@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Input Parameter Settings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Input Parameter Settings</em>' containment reference list.
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getEntryLevelSystemCall_InputParameterSettings()
-	 * @model containment="true" ordered="false"
-	 * @generated
-	 */
-	EList<CallParameterSetting> getInputParameterSettings();
-
-} // EntryLevelSystemCall
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/LoopUserAction.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/LoopUserAction.java
deleted file mode 100644
index 1b4c870a914a0b3d44e1b0ba230c118115cfe56e..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/LoopUserAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Loop User Action</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.LoopUserAction#getLoopBodyScenarioBehavior <em>Loop Body Scenario Behavior</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.LoopUserAction#getLoopIterationCount <em>Loop Iteration Count</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getLoopUserAction()
- * @model
- * @generated
- */
-public interface LoopUserAction extends AbstractUserAction {
-	/**
-	 * Returns the value of the '<em><b>Loop Body Scenario Behavior</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Loop Body Scenario Behavior</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Loop Body Scenario Behavior</em>' containment reference.
-	 * @see #setLoopBodyScenarioBehavior(ScenarioBehavior)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getLoopUserAction_LoopBodyScenarioBehavior()
-	 * @model containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	ScenarioBehavior getLoopBodyScenarioBehavior();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.LoopUserAction#getLoopBodyScenarioBehavior <em>Loop Body Scenario Behavior</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Loop Body Scenario Behavior</em>' containment reference.
-	 * @see #getLoopBodyScenarioBehavior()
-	 * @generated
-	 */
-	void setLoopBodyScenarioBehavior(ScenarioBehavior value);
-
-	/**
-	 * Returns the value of the '<em><b>Loop Iteration Count</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Loop Iteration Count</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Loop Iteration Count</em>' containment reference.
-	 * @see #setLoopIterationCount(RandomVariable)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getLoopUserAction_LoopIterationCount()
-	 * @model containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	RandomVariable getLoopIterationCount();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.LoopUserAction#getLoopIterationCount <em>Loop Iteration Count</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Loop Iteration Count</em>' containment reference.
-	 * @see #getLoopIterationCount()
-	 * @generated
-	 */
-	void setLoopIterationCount(RandomVariable value);
-
-} // LoopUserAction
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/OpenWorkloadType.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/OpenWorkloadType.java
deleted file mode 100644
index ea7c27a601e13e628a284c90494712ccefae4ba4..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/OpenWorkloadType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Open Workload Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.OpenWorkloadType#getInterArrivalTime <em>Inter Arrival Time</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getOpenWorkloadType()
- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='interArrivalTimeInOpenWorkloadNeedsToBeSpecified'"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot interArrivalTimeInOpenWorkloadNeedsToBeSpecified='not self.interArrivalTime.oclIsUndefined() and not self.interArrivalTime.probFunction.oclIsUndefined()'"
- * @generated
- */
-public interface OpenWorkloadType extends WorkloadType {
-	/**
-	 * Returns the value of the '<em><b>Inter Arrival Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Inter Arrival Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Inter Arrival Time</em>' containment reference.
-	 * @see #setInterArrivalTime(RandomVariable)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getOpenWorkloadType_InterArrivalTime()
-	 * @model containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	RandomVariable getInterArrivalTime();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.OpenWorkloadType#getInterArrivalTime <em>Inter Arrival Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Inter Arrival Time</em>' containment reference.
-	 * @see #getInterArrivalTime()
-	 * @generated
-	 */
-	void setInterArrivalTime(RandomVariable value);
-
-} // OpenWorkloadType
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/ScenarioBehavior.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/ScenarioBehavior.java
deleted file mode 100644
index c6c6b13042c3531ccb4689bcb8e83e4be1acd532..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/ScenarioBehavior.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Scenario Behavior</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior#getActions <em>Actions</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getScenarioBehavior()
- * @model
- * @generated
- */
-public interface ScenarioBehavior extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Actions</b></em>' containment reference list.
-	 * The list contents are of type {@link edu.kit.ipd.descartes.mm.workload.AbstractUserAction}.
-	 * It is bidirectional and its opposite is '{@link edu.kit.ipd.descartes.mm.workload.AbstractUserAction#getParentScenarioBehavior <em>Parent Scenario Behavior</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Actions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Actions</em>' containment reference list.
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getScenarioBehavior_Actions()
-	 * @see edu.kit.ipd.descartes.mm.workload.AbstractUserAction#getParentScenarioBehavior
-	 * @model opposite="parentScenarioBehavior" containment="true"
-	 * @generated
-	 */
-	EList<AbstractUserAction> getActions();
-
-} // ScenarioBehavior
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/UsageScenario.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/UsageScenario.java
deleted file mode 100644
index 9d069a8cb05348d83067c10e6700b85856767cb9..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/UsageScenario.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.core.Entity;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Usage Scenario</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getUsageModel <em>Usage Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getScenarioBehavior <em>Scenario Behavior</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getWorkloadType <em>Workload Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getUsageScenario()
- * @model
- * @generated
- */
-public interface UsageScenario extends Entity {
-	/**
-	 * Returns the value of the '<em><b>Usage Model</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link edu.kit.ipd.descartes.mm.workload.Workload#getUsageScenarios <em>Usage Scenarios</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Usage Model</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Usage Model</em>' container reference.
-	 * @see #setUsageModel(Workload)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getUsageScenario_UsageModel()
-	 * @see edu.kit.ipd.descartes.mm.workload.Workload#getUsageScenarios
-	 * @model opposite="usageScenarios" required="true" transient="false" ordered="false"
-	 * @generated
-	 */
-	Workload getUsageModel();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getUsageModel <em>Usage Model</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usage Model</em>' container reference.
-	 * @see #getUsageModel()
-	 * @generated
-	 */
-	void setUsageModel(Workload value);
-
-	/**
-	 * Returns the value of the '<em><b>Scenario Behavior</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Scenario Behavior</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Scenario Behavior</em>' containment reference.
-	 * @see #setScenarioBehavior(ScenarioBehavior)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getUsageScenario_ScenarioBehavior()
-	 * @model containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	ScenarioBehavior getScenarioBehavior();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getScenarioBehavior <em>Scenario Behavior</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scenario Behavior</em>' containment reference.
-	 * @see #getScenarioBehavior()
-	 * @generated
-	 */
-	void setScenarioBehavior(ScenarioBehavior value);
-
-	/**
-	 * Returns the value of the '<em><b>Workload Type</b></em>' containment reference.
-	 * It is bidirectional and its opposite is '{@link edu.kit.ipd.descartes.mm.workload.WorkloadType#getUsageScenario <em>Usage Scenario</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Workload Type</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Workload Type</em>' containment reference.
-	 * @see #setWorkloadType(WorkloadType)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getUsageScenario_WorkloadType()
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadType#getUsageScenario
-	 * @model opposite="usageScenario" containment="true" required="true" ordered="false"
-	 * @generated
-	 */
-	WorkloadType getWorkloadType();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getWorkloadType <em>Workload Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Workload Type</em>' containment reference.
-	 * @see #getWorkloadType()
-	 * @generated
-	 */
-	void setWorkloadType(WorkloadType value);
-
-} // UsageScenario
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/Workload.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/Workload.java
deleted file mode 100644
index c2aaa19fb58a2abe6da5ede3b06191e9d2ccf6dd..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/Workload.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.core.Entity;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Workload</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.Workload#getSystem <em>System</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.Workload#getUsageScenarios <em>Usage Scenarios</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getWorkload()
- * @model
- * @generated
- */
-public interface Workload extends Entity {
-	/**
-	 * Returns the value of the '<em><b>System</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>System</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>System</em>' reference.
-	 * @see #setSystem(edu.kit.ipd.descartes.mm.applicationlevel.system.System)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getWorkload_System()
-	 * @model ordered="false"
-	 * @generated
-	 */
-	edu.kit.ipd.descartes.mm.applicationlevel.system.System getSystem();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.Workload#getSystem <em>System</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>System</em>' reference.
-	 * @see #getSystem()
-	 * @generated
-	 */
-	void setSystem(edu.kit.ipd.descartes.mm.applicationlevel.system.System value);
-
-	/**
-	 * Returns the value of the '<em><b>Usage Scenarios</b></em>' containment reference list.
-	 * The list contents are of type {@link edu.kit.ipd.descartes.mm.workload.UsageScenario}.
-	 * It is bidirectional and its opposite is '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getUsageModel <em>Usage Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Usage Scenarios</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Usage Scenarios</em>' containment reference list.
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getWorkload_UsageScenarios()
-	 * @see edu.kit.ipd.descartes.mm.workload.UsageScenario#getUsageModel
-	 * @model opposite="usageModel" containment="true" ordered="false"
-	 * @generated
-	 */
-	EList<UsageScenario> getUsageScenarios();
-
-} // Workload
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadFactory.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadFactory.java
deleted file mode 100644
index b4b99ff55dcf5c740bafe9ac9ca15f92f7523a05..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage
- * @generated
- */
-public interface WorkloadFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	WorkloadFactory eINSTANCE = edu.kit.ipd.descartes.mm.workload.impl.WorkloadFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Workload</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Workload</em>'.
-	 * @generated
-	 */
-	Workload createWorkload();
-
-	/**
-	 * Returns a new object of class '<em>Usage Scenario</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Usage Scenario</em>'.
-	 * @generated
-	 */
-	UsageScenario createUsageScenario();
-
-	/**
-	 * Returns a new object of class '<em>Scenario Behavior</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Scenario Behavior</em>'.
-	 * @generated
-	 */
-	ScenarioBehavior createScenarioBehavior();
-
-	/**
-	 * Returns a new object of class '<em>Open Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Open Workload Type</em>'.
-	 * @generated
-	 */
-	OpenWorkloadType createOpenWorkloadType();
-
-	/**
-	 * Returns a new object of class '<em>Closed Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Closed Workload Type</em>'.
-	 * @generated
-	 */
-	ClosedWorkloadType createClosedWorkloadType();
-
-	/**
-	 * Returns a new object of class '<em>Loop User Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Loop User Action</em>'.
-	 * @generated
-	 */
-	LoopUserAction createLoopUserAction();
-
-	/**
-	 * Returns a new object of class '<em>Delay User Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Delay User Action</em>'.
-	 * @generated
-	 */
-	DelayUserAction createDelayUserAction();
-
-	/**
-	 * Returns a new object of class '<em>Branch User Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Branch User Action</em>'.
-	 * @generated
-	 */
-	BranchUserAction createBranchUserAction();
-
-	/**
-	 * Returns a new object of class '<em>Entry Level System Call</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Entry Level System Call</em>'.
-	 * @generated
-	 */
-	EntryLevelSystemCall createEntryLevelSystemCall();
-
-	/**
-	 * Returns a new object of class '<em>Call Parameter Setting</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Call Parameter Setting</em>'.
-	 * @generated
-	 */
-	CallParameterSetting createCallParameterSetting();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	WorkloadPackage getWorkloadPackage();
-
-} //WorkloadFactory
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadPackage.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadPackage.java
deleted file mode 100644
index 84e4aac7247ed91a59fa8f3cba2c10f916a459f1..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadPackage.java
+++ /dev/null
@@ -1,1261 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import edu.kit.ipd.descartes.core.CorePackage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"
- * @generated
- */
-public interface WorkloadPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "workload";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.descartes-research.net/metamodel/workload/0.1";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "workload";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	WorkloadPackage eINSTANCE = edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.WorkloadImpl <em>Workload</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getWorkload()
-	 * @generated
-	 */
-	int WORKLOAD = 0;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKLOAD__ID = CorePackage.ENTITY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKLOAD__NAME = CorePackage.ENTITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>System</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKLOAD__SYSTEM = CorePackage.ENTITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Usage Scenarios</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKLOAD__USAGE_SCENARIOS = CorePackage.ENTITY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Workload</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKLOAD_FEATURE_COUNT = CorePackage.ENTITY_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.UsageScenarioImpl <em>Usage Scenario</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.UsageScenarioImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getUsageScenario()
-	 * @generated
-	 */
-	int USAGE_SCENARIO = 1;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USAGE_SCENARIO__ID = CorePackage.ENTITY__ID;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USAGE_SCENARIO__NAME = CorePackage.ENTITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Usage Model</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USAGE_SCENARIO__USAGE_MODEL = CorePackage.ENTITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Scenario Behavior</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USAGE_SCENARIO__SCENARIO_BEHAVIOR = CorePackage.ENTITY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Workload Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USAGE_SCENARIO__WORKLOAD_TYPE = CorePackage.ENTITY_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Usage Scenario</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USAGE_SCENARIO_FEATURE_COUNT = CorePackage.ENTITY_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.ScenarioBehaviorImpl <em>Scenario Behavior</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.ScenarioBehaviorImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getScenarioBehavior()
-	 * @generated
-	 */
-	int SCENARIO_BEHAVIOR = 2;
-
-	/**
-	 * The feature id for the '<em><b>Actions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCENARIO_BEHAVIOR__ACTIONS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Scenario Behavior</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCENARIO_BEHAVIOR_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.WorkloadTypeImpl <em>Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadTypeImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getWorkloadType()
-	 * @generated
-	 */
-	int WORKLOAD_TYPE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Usage Scenario</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKLOAD_TYPE__USAGE_SCENARIO = 0;
-
-	/**
-	 * The number of structural features of the '<em>Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WORKLOAD_TYPE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.OpenWorkloadTypeImpl <em>Open Workload Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.OpenWorkloadTypeImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getOpenWorkloadType()
-	 * @generated
-	 */
-	int OPEN_WORKLOAD_TYPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Usage Scenario</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPEN_WORKLOAD_TYPE__USAGE_SCENARIO = WORKLOAD_TYPE__USAGE_SCENARIO;
-
-	/**
-	 * The feature id for the '<em><b>Inter Arrival Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME = WORKLOAD_TYPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Open Workload Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OPEN_WORKLOAD_TYPE_FEATURE_COUNT = WORKLOAD_TYPE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.ClosedWorkloadTypeImpl <em>Closed Workload Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.ClosedWorkloadTypeImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getClosedWorkloadType()
-	 * @generated
-	 */
-	int CLOSED_WORKLOAD_TYPE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Usage Scenario</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLOSED_WORKLOAD_TYPE__USAGE_SCENARIO = WORKLOAD_TYPE__USAGE_SCENARIO;
-
-	/**
-	 * The feature id for the '<em><b>Population</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLOSED_WORKLOAD_TYPE__POPULATION = WORKLOAD_TYPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Think Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLOSED_WORKLOAD_TYPE__THINK_TIME = WORKLOAD_TYPE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Closed Workload Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLOSED_WORKLOAD_TYPE_FEATURE_COUNT = WORKLOAD_TYPE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.AbstractUserActionImpl <em>Abstract User Action</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.AbstractUserActionImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getAbstractUserAction()
-	 * @generated
-	 */
-	int ABSTRACT_USER_ACTION = 6;
-
-	/**
-	 * The feature id for the '<em><b>Parent Scenario Behavior</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR = 0;
-
-	/**
-	 * The number of structural features of the '<em>Abstract User Action</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_USER_ACTION_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.LoopUserActionImpl <em>Loop User Action</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.LoopUserActionImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getLoopUserAction()
-	 * @generated
-	 */
-	int LOOP_USER_ACTION = 7;
-
-	/**
-	 * The feature id for the '<em><b>Parent Scenario Behavior</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_USER_ACTION__PARENT_SCENARIO_BEHAVIOR = ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Loop Body Scenario Behavior</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR = ABSTRACT_USER_ACTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Loop Iteration Count</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_USER_ACTION__LOOP_ITERATION_COUNT = ABSTRACT_USER_ACTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Loop User Action</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_USER_ACTION_FEATURE_COUNT = ABSTRACT_USER_ACTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.DelayUserActionImpl <em>Delay User Action</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.DelayUserActionImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getDelayUserAction()
-	 * @generated
-	 */
-	int DELAY_USER_ACTION = 8;
-
-	/**
-	 * The feature id for the '<em><b>Parent Scenario Behavior</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELAY_USER_ACTION__PARENT_SCENARIO_BEHAVIOR = ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Time Specification</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELAY_USER_ACTION__TIME_SPECIFICATION = ABSTRACT_USER_ACTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Delay User Action</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DELAY_USER_ACTION_FEATURE_COUNT = ABSTRACT_USER_ACTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.BranchUserActionImpl <em>Branch User Action</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.BranchUserActionImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getBranchUserAction()
-	 * @generated
-	 */
-	int BRANCH_USER_ACTION = 9;
-
-	/**
-	 * The feature id for the '<em><b>Parent Scenario Behavior</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BRANCH_USER_ACTION__PARENT_SCENARIO_BEHAVIOR = ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Branches</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BRANCH_USER_ACTION__BRANCHES = ABSTRACT_USER_ACTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Branch User Probabilities</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES = ABSTRACT_USER_ACTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Branch User Action</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BRANCH_USER_ACTION_FEATURE_COUNT = ABSTRACT_USER_ACTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.EntryLevelSystemCallImpl <em>Entry Level System Call</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.EntryLevelSystemCallImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getEntryLevelSystemCall()
-	 * @generated
-	 */
-	int ENTRY_LEVEL_SYSTEM_CALL = 10;
-
-	/**
-	 * The feature id for the '<em><b>Parent Scenario Behavior</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTRY_LEVEL_SYSTEM_CALL__PARENT_SCENARIO_BEHAVIOR = ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Providing Role</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE = ABSTRACT_USER_ACTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Signature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE = ABSTRACT_USER_ACTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Input Parameter Settings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS = ABSTRACT_USER_ACTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Entry Level System Call</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTRY_LEVEL_SYSTEM_CALL_FEATURE_COUNT = ABSTRACT_USER_ACTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.workload.impl.CallParameterSettingImpl <em>Call Parameter Setting</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.CallParameterSettingImpl
-	 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getCallParameterSetting()
-	 * @generated
-	 */
-	int CALL_PARAMETER_SETTING = 11;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_PARAMETER_SETTING__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Characterization</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_PARAMETER_SETTING__CHARACTERIZATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_PARAMETER_SETTING__VALUE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Call Parameter Setting</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_PARAMETER_SETTING_FEATURE_COUNT = 3;
-
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.Workload <em>Workload</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Workload</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.Workload
-	 * @generated
-	 */
-	EClass getWorkload();
-
-	/**
-	 * Returns the meta object for the reference '{@link edu.kit.ipd.descartes.mm.workload.Workload#getSystem <em>System</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>System</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.Workload#getSystem()
-	 * @see #getWorkload()
-	 * @generated
-	 */
-	EReference getWorkload_System();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link edu.kit.ipd.descartes.mm.workload.Workload#getUsageScenarios <em>Usage Scenarios</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Usage Scenarios</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.Workload#getUsageScenarios()
-	 * @see #getWorkload()
-	 * @generated
-	 */
-	EReference getWorkload_UsageScenarios();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario <em>Usage Scenario</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Usage Scenario</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.UsageScenario
-	 * @generated
-	 */
-	EClass getUsageScenario();
-
-	/**
-	 * Returns the meta object for the container reference '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getUsageModel <em>Usage Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Usage Model</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.UsageScenario#getUsageModel()
-	 * @see #getUsageScenario()
-	 * @generated
-	 */
-	EReference getUsageScenario_UsageModel();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getScenarioBehavior <em>Scenario Behavior</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Scenario Behavior</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.UsageScenario#getScenarioBehavior()
-	 * @see #getUsageScenario()
-	 * @generated
-	 */
-	EReference getUsageScenario_ScenarioBehavior();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getWorkloadType <em>Workload Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Workload Type</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.UsageScenario#getWorkloadType()
-	 * @see #getUsageScenario()
-	 * @generated
-	 */
-	EReference getUsageScenario_WorkloadType();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior <em>Scenario Behavior</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Scenario Behavior</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.ScenarioBehavior
-	 * @generated
-	 */
-	EClass getScenarioBehavior();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior#getActions <em>Actions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Actions</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.ScenarioBehavior#getActions()
-	 * @see #getScenarioBehavior()
-	 * @generated
-	 */
-	EReference getScenarioBehavior_Actions();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.WorkloadType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Type</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadType
-	 * @generated
-	 */
-	EClass getWorkloadType();
-
-	/**
-	 * Returns the meta object for the container reference '{@link edu.kit.ipd.descartes.mm.workload.WorkloadType#getUsageScenario <em>Usage Scenario</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Usage Scenario</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadType#getUsageScenario()
-	 * @see #getWorkloadType()
-	 * @generated
-	 */
-	EReference getWorkloadType_UsageScenario();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.OpenWorkloadType <em>Open Workload Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Open Workload Type</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.OpenWorkloadType
-	 * @generated
-	 */
-	EClass getOpenWorkloadType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.OpenWorkloadType#getInterArrivalTime <em>Inter Arrival Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Inter Arrival Time</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.OpenWorkloadType#getInterArrivalTime()
-	 * @see #getOpenWorkloadType()
-	 * @generated
-	 */
-	EReference getOpenWorkloadType_InterArrivalTime();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType <em>Closed Workload Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Closed Workload Type</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType
-	 * @generated
-	 */
-	EClass getClosedWorkloadType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType#getPopulation <em>Population</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Population</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType#getPopulation()
-	 * @see #getClosedWorkloadType()
-	 * @generated
-	 */
-	EAttribute getClosedWorkloadType_Population();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType#getThinkTime <em>Think Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Think Time</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType#getThinkTime()
-	 * @see #getClosedWorkloadType()
-	 * @generated
-	 */
-	EReference getClosedWorkloadType_ThinkTime();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.AbstractUserAction <em>Abstract User Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract User Action</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.AbstractUserAction
-	 * @generated
-	 */
-	EClass getAbstractUserAction();
-
-	/**
-	 * Returns the meta object for the container reference '{@link edu.kit.ipd.descartes.mm.workload.AbstractUserAction#getParentScenarioBehavior <em>Parent Scenario Behavior</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Parent Scenario Behavior</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.AbstractUserAction#getParentScenarioBehavior()
-	 * @see #getAbstractUserAction()
-	 * @generated
-	 */
-	EReference getAbstractUserAction_ParentScenarioBehavior();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.LoopUserAction <em>Loop User Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Loop User Action</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.LoopUserAction
-	 * @generated
-	 */
-	EClass getLoopUserAction();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.LoopUserAction#getLoopBodyScenarioBehavior <em>Loop Body Scenario Behavior</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Loop Body Scenario Behavior</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.LoopUserAction#getLoopBodyScenarioBehavior()
-	 * @see #getLoopUserAction()
-	 * @generated
-	 */
-	EReference getLoopUserAction_LoopBodyScenarioBehavior();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.LoopUserAction#getLoopIterationCount <em>Loop Iteration Count</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Loop Iteration Count</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.LoopUserAction#getLoopIterationCount()
-	 * @see #getLoopUserAction()
-	 * @generated
-	 */
-	EReference getLoopUserAction_LoopIterationCount();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.DelayUserAction <em>Delay User Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Delay User Action</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.DelayUserAction
-	 * @generated
-	 */
-	EClass getDelayUserAction();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.DelayUserAction#getTimeSpecification <em>Time Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Time Specification</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.DelayUserAction#getTimeSpecification()
-	 * @see #getDelayUserAction()
-	 * @generated
-	 */
-	EReference getDelayUserAction_TimeSpecification();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.BranchUserAction <em>Branch User Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Branch User Action</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.BranchUserAction
-	 * @generated
-	 */
-	EClass getBranchUserAction();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link edu.kit.ipd.descartes.mm.workload.BranchUserAction#getBranches <em>Branches</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Branches</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.BranchUserAction#getBranches()
-	 * @see #getBranchUserAction()
-	 * @generated
-	 */
-	EReference getBranchUserAction_Branches();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.BranchUserAction#getBranchUserProbabilities <em>Branch User Probabilities</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Branch User Probabilities</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.BranchUserAction#getBranchUserProbabilities()
-	 * @see #getBranchUserAction()
-	 * @generated
-	 */
-	EReference getBranchUserAction_BranchUserProbabilities();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall <em>Entry Level System Call</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Entry Level System Call</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall
-	 * @generated
-	 */
-	EClass getEntryLevelSystemCall();
-
-	/**
-	 * Returns the meta object for the reference '{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getProvidingRole <em>Providing Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Providing Role</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getProvidingRole()
-	 * @see #getEntryLevelSystemCall()
-	 * @generated
-	 */
-	EReference getEntryLevelSystemCall_ProvidingRole();
-
-	/**
-	 * Returns the meta object for the reference '{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getSignature <em>Signature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Signature</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getSignature()
-	 * @see #getEntryLevelSystemCall()
-	 * @generated
-	 */
-	EReference getEntryLevelSystemCall_Signature();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getInputParameterSettings <em>Input Parameter Settings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Input Parameter Settings</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall#getInputParameterSettings()
-	 * @see #getEntryLevelSystemCall()
-	 * @generated
-	 */
-	EReference getEntryLevelSystemCall_InputParameterSettings();
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting <em>Call Parameter Setting</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Call Parameter Setting</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.CallParameterSetting
-	 * @generated
-	 */
-	EClass getCallParameterSetting();
-
-	/**
-	 * Returns the meta object for the attribute '{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getName()
-	 * @see #getCallParameterSetting()
-	 * @generated
-	 */
-	EAttribute getCallParameterSetting_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getCharacterization <em>Characterization</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Characterization</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getCharacterization()
-	 * @see #getCallParameterSetting()
-	 * @generated
-	 */
-	EAttribute getCallParameterSetting_Characterization();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see edu.kit.ipd.descartes.mm.workload.CallParameterSetting#getValue()
-	 * @see #getCallParameterSetting()
-	 * @generated
-	 */
-	EReference getCallParameterSetting_Value();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	WorkloadFactory getWorkloadFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.WorkloadImpl <em>Workload</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getWorkload()
-		 * @generated
-		 */
-		EClass WORKLOAD = eINSTANCE.getWorkload();
-
-		/**
-		 * The meta object literal for the '<em><b>System</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORKLOAD__SYSTEM = eINSTANCE.getWorkload_System();
-
-		/**
-		 * The meta object literal for the '<em><b>Usage Scenarios</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORKLOAD__USAGE_SCENARIOS = eINSTANCE.getWorkload_UsageScenarios();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.UsageScenarioImpl <em>Usage Scenario</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.UsageScenarioImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getUsageScenario()
-		 * @generated
-		 */
-		EClass USAGE_SCENARIO = eINSTANCE.getUsageScenario();
-
-		/**
-		 * The meta object literal for the '<em><b>Usage Model</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference USAGE_SCENARIO__USAGE_MODEL = eINSTANCE.getUsageScenario_UsageModel();
-
-		/**
-		 * The meta object literal for the '<em><b>Scenario Behavior</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference USAGE_SCENARIO__SCENARIO_BEHAVIOR = eINSTANCE.getUsageScenario_ScenarioBehavior();
-
-		/**
-		 * The meta object literal for the '<em><b>Workload Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference USAGE_SCENARIO__WORKLOAD_TYPE = eINSTANCE.getUsageScenario_WorkloadType();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.ScenarioBehaviorImpl <em>Scenario Behavior</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.ScenarioBehaviorImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getScenarioBehavior()
-		 * @generated
-		 */
-		EClass SCENARIO_BEHAVIOR = eINSTANCE.getScenarioBehavior();
-
-		/**
-		 * The meta object literal for the '<em><b>Actions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SCENARIO_BEHAVIOR__ACTIONS = eINSTANCE.getScenarioBehavior_Actions();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.WorkloadTypeImpl <em>Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadTypeImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getWorkloadType()
-		 * @generated
-		 */
-		EClass WORKLOAD_TYPE = eINSTANCE.getWorkloadType();
-
-		/**
-		 * The meta object literal for the '<em><b>Usage Scenario</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference WORKLOAD_TYPE__USAGE_SCENARIO = eINSTANCE.getWorkloadType_UsageScenario();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.OpenWorkloadTypeImpl <em>Open Workload Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.OpenWorkloadTypeImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getOpenWorkloadType()
-		 * @generated
-		 */
-		EClass OPEN_WORKLOAD_TYPE = eINSTANCE.getOpenWorkloadType();
-
-		/**
-		 * The meta object literal for the '<em><b>Inter Arrival Time</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME = eINSTANCE.getOpenWorkloadType_InterArrivalTime();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.ClosedWorkloadTypeImpl <em>Closed Workload Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.ClosedWorkloadTypeImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getClosedWorkloadType()
-		 * @generated
-		 */
-		EClass CLOSED_WORKLOAD_TYPE = eINSTANCE.getClosedWorkloadType();
-
-		/**
-		 * The meta object literal for the '<em><b>Population</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CLOSED_WORKLOAD_TYPE__POPULATION = eINSTANCE.getClosedWorkloadType_Population();
-
-		/**
-		 * The meta object literal for the '<em><b>Think Time</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CLOSED_WORKLOAD_TYPE__THINK_TIME = eINSTANCE.getClosedWorkloadType_ThinkTime();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.AbstractUserActionImpl <em>Abstract User Action</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.AbstractUserActionImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getAbstractUserAction()
-		 * @generated
-		 */
-		EClass ABSTRACT_USER_ACTION = eINSTANCE.getAbstractUserAction();
-
-		/**
-		 * The meta object literal for the '<em><b>Parent Scenario Behavior</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR = eINSTANCE.getAbstractUserAction_ParentScenarioBehavior();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.LoopUserActionImpl <em>Loop User Action</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.LoopUserActionImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getLoopUserAction()
-		 * @generated
-		 */
-		EClass LOOP_USER_ACTION = eINSTANCE.getLoopUserAction();
-
-		/**
-		 * The meta object literal for the '<em><b>Loop Body Scenario Behavior</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR = eINSTANCE.getLoopUserAction_LoopBodyScenarioBehavior();
-
-		/**
-		 * The meta object literal for the '<em><b>Loop Iteration Count</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference LOOP_USER_ACTION__LOOP_ITERATION_COUNT = eINSTANCE.getLoopUserAction_LoopIterationCount();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.DelayUserActionImpl <em>Delay User Action</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.DelayUserActionImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getDelayUserAction()
-		 * @generated
-		 */
-		EClass DELAY_USER_ACTION = eINSTANCE.getDelayUserAction();
-
-		/**
-		 * The meta object literal for the '<em><b>Time Specification</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DELAY_USER_ACTION__TIME_SPECIFICATION = eINSTANCE.getDelayUserAction_TimeSpecification();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.BranchUserActionImpl <em>Branch User Action</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.BranchUserActionImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getBranchUserAction()
-		 * @generated
-		 */
-		EClass BRANCH_USER_ACTION = eINSTANCE.getBranchUserAction();
-
-		/**
-		 * The meta object literal for the '<em><b>Branches</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BRANCH_USER_ACTION__BRANCHES = eINSTANCE.getBranchUserAction_Branches();
-
-		/**
-		 * The meta object literal for the '<em><b>Branch User Probabilities</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES = eINSTANCE.getBranchUserAction_BranchUserProbabilities();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.EntryLevelSystemCallImpl <em>Entry Level System Call</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.EntryLevelSystemCallImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getEntryLevelSystemCall()
-		 * @generated
-		 */
-		EClass ENTRY_LEVEL_SYSTEM_CALL = eINSTANCE.getEntryLevelSystemCall();
-
-		/**
-		 * The meta object literal for the '<em><b>Providing Role</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE = eINSTANCE.getEntryLevelSystemCall_ProvidingRole();
-
-		/**
-		 * The meta object literal for the '<em><b>Signature</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE = eINSTANCE.getEntryLevelSystemCall_Signature();
-
-		/**
-		 * The meta object literal for the '<em><b>Input Parameter Settings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS = eINSTANCE.getEntryLevelSystemCall_InputParameterSettings();
-
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.workload.impl.CallParameterSettingImpl <em>Call Parameter Setting</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.CallParameterSettingImpl
-		 * @see edu.kit.ipd.descartes.mm.workload.impl.WorkloadPackageImpl#getCallParameterSetting()
-		 * @generated
-		 */
-		EClass CALL_PARAMETER_SETTING = eINSTANCE.getCallParameterSetting();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CALL_PARAMETER_SETTING__NAME = eINSTANCE.getCallParameterSetting_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Characterization</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute CALL_PARAMETER_SETTING__CHARACTERIZATION = eINSTANCE.getCallParameterSetting_Characterization();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CALL_PARAMETER_SETTING__VALUE = eINSTANCE.getCallParameterSetting_Value();
-
-	}
-
-} //WorkloadPackage
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadType.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadType.java
deleted file mode 100644
index dc079410528724321ca74c3a6ceb25176e1e431b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/WorkloadType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.WorkloadType#getUsageScenario <em>Usage Scenario</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getWorkloadType()
- * @model abstract="true"
- * @generated
- */
-public interface WorkloadType extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Usage Scenario</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario#getWorkloadType <em>Workload Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Usage Scenario</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Usage Scenario</em>' container reference.
-	 * @see #setUsageScenario(UsageScenario)
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#getWorkloadType_UsageScenario()
-	 * @see edu.kit.ipd.descartes.mm.workload.UsageScenario#getWorkloadType
-	 * @model opposite="workloadType" required="true" transient="false" ordered="false"
-	 * @generated
-	 */
-	UsageScenario getUsageScenario();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.workload.WorkloadType#getUsageScenario <em>Usage Scenario</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usage Scenario</em>' container reference.
-	 * @see #getUsageScenario()
-	 * @generated
-	 */
-	void setUsageScenario(UsageScenario value);
-
-} // WorkloadType
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/AbstractUserActionImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/AbstractUserActionImpl.java
deleted file mode 100644
index 41de9af2fa7e573a19928bf5b1b58f1ac7b4913a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/AbstractUserActionImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.workload.AbstractUserAction;
-import edu.kit.ipd.descartes.mm.workload.ScenarioBehavior;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract User Action</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.AbstractUserActionImpl#getParentScenarioBehavior <em>Parent Scenario Behavior</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractUserActionImpl extends EObjectImpl implements AbstractUserAction {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractUserActionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.ABSTRACT_USER_ACTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ScenarioBehavior getParentScenarioBehavior() {
-		if (eContainerFeatureID() != WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR) return null;
-		return (ScenarioBehavior)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetParentScenarioBehavior(ScenarioBehavior newParentScenarioBehavior, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newParentScenarioBehavior, WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentScenarioBehavior(ScenarioBehavior newParentScenarioBehavior) {
-		if (newParentScenarioBehavior != eInternalContainer() || (eContainerFeatureID() != WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR && newParentScenarioBehavior != null)) {
-			if (EcoreUtil.isAncestor(this, newParentScenarioBehavior))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newParentScenarioBehavior != null)
-				msgs = ((InternalEObject)newParentScenarioBehavior).eInverseAdd(this, WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS, ScenarioBehavior.class, msgs);
-			msgs = basicSetParentScenarioBehavior(newParentScenarioBehavior, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR, newParentScenarioBehavior, newParentScenarioBehavior));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetParentScenarioBehavior((ScenarioBehavior)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR:
-				return basicSetParentScenarioBehavior(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR:
-				return eInternalContainer().eInverseRemove(this, WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS, ScenarioBehavior.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR:
-				return getParentScenarioBehavior();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR:
-				setParentScenarioBehavior((ScenarioBehavior)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR:
-				setParentScenarioBehavior((ScenarioBehavior)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR:
-				return getParentScenarioBehavior() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //AbstractUserActionImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/BranchUserActionImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/BranchUserActionImpl.java
deleted file mode 100644
index 15a82c6286677f81dffc4e02650371211331fd4c..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/BranchUserActionImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import edu.kit.ipd.descartes.mm.workload.BranchUserAction;
-import edu.kit.ipd.descartes.mm.workload.ScenarioBehavior;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Branch User Action</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.BranchUserActionImpl#getBranches <em>Branches</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.BranchUserActionImpl#getBranchUserProbabilities <em>Branch User Probabilities</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BranchUserActionImpl extends AbstractUserActionImpl implements BranchUserAction {
-	/**
-	 * The cached value of the '{@link #getBranches() <em>Branches</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBranches()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ScenarioBehavior> branches;
-
-	/**
-	 * The cached value of the '{@link #getBranchUserProbabilities() <em>Branch User Probabilities</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBranchUserProbabilities()
-	 * @generated
-	 * @ordered
-	 */
-	protected RandomVariable branchUserProbabilities;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BranchUserActionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.BRANCH_USER_ACTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ScenarioBehavior> getBranches() {
-		if (branches == null) {
-			branches = new EObjectContainmentEList<ScenarioBehavior>(ScenarioBehavior.class, this, WorkloadPackage.BRANCH_USER_ACTION__BRANCHES);
-		}
-		return branches;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RandomVariable getBranchUserProbabilities() {
-		return branchUserProbabilities;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBranchUserProbabilities(RandomVariable newBranchUserProbabilities, NotificationChain msgs) {
-		RandomVariable oldBranchUserProbabilities = branchUserProbabilities;
-		branchUserProbabilities = newBranchUserProbabilities;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES, oldBranchUserProbabilities, newBranchUserProbabilities);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBranchUserProbabilities(RandomVariable newBranchUserProbabilities) {
-		if (newBranchUserProbabilities != branchUserProbabilities) {
-			NotificationChain msgs = null;
-			if (branchUserProbabilities != null)
-				msgs = ((InternalEObject)branchUserProbabilities).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES, null, msgs);
-			if (newBranchUserProbabilities != null)
-				msgs = ((InternalEObject)newBranchUserProbabilities).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES, null, msgs);
-			msgs = basicSetBranchUserProbabilities(newBranchUserProbabilities, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES, newBranchUserProbabilities, newBranchUserProbabilities));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCHES:
-				return ((InternalEList<?>)getBranches()).basicRemove(otherEnd, msgs);
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES:
-				return basicSetBranchUserProbabilities(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCHES:
-				return getBranches();
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES:
-				return getBranchUserProbabilities();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCHES:
-				getBranches().clear();
-				getBranches().addAll((Collection<? extends ScenarioBehavior>)newValue);
-				return;
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES:
-				setBranchUserProbabilities((RandomVariable)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCHES:
-				getBranches().clear();
-				return;
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES:
-				setBranchUserProbabilities((RandomVariable)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCHES:
-				return branches != null && !branches.isEmpty();
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES:
-				return branchUserProbabilities != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //BranchUserActionImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/CallParameterSettingImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/CallParameterSettingImpl.java
deleted file mode 100644
index f71197cd23347f4edd63f06c8bde5e3888953f31..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/CallParameterSettingImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterCharacterizationType;
-
-import edu.kit.ipd.descartes.mm.workload.CallParameterSetting;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Call Parameter Setting</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.CallParameterSettingImpl#getName <em>Name</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.CallParameterSettingImpl#getCharacterization <em>Characterization</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.CallParameterSettingImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CallParameterSettingImpl extends EObjectImpl implements CallParameterSetting {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCharacterization() <em>Characterization</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCharacterization()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ParameterCharacterizationType CHARACTERIZATION_EDEFAULT = ParameterCharacterizationType.VALUE;
-
-	/**
-	 * The cached value of the '{@link #getCharacterization() <em>Characterization</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCharacterization()
-	 * @generated
-	 * @ordered
-	 */
-	protected ParameterCharacterizationType characterization = CHARACTERIZATION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected RandomVariable value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CallParameterSettingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.CALL_PARAMETER_SETTING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.CALL_PARAMETER_SETTING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParameterCharacterizationType getCharacterization() {
-		return characterization;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCharacterization(ParameterCharacterizationType newCharacterization) {
-		ParameterCharacterizationType oldCharacterization = characterization;
-		characterization = newCharacterization == null ? CHARACTERIZATION_EDEFAULT : newCharacterization;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.CALL_PARAMETER_SETTING__CHARACTERIZATION, oldCharacterization, characterization));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RandomVariable getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValue(RandomVariable newValue, NotificationChain msgs) {
-		RandomVariable oldValue = value;
-		value = newValue;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.CALL_PARAMETER_SETTING__VALUE, oldValue, newValue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(RandomVariable newValue) {
-		if (newValue != value) {
-			NotificationChain msgs = null;
-			if (value != null)
-				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.CALL_PARAMETER_SETTING__VALUE, null, msgs);
-			if (newValue != null)
-				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.CALL_PARAMETER_SETTING__VALUE, null, msgs);
-			msgs = basicSetValue(newValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.CALL_PARAMETER_SETTING__VALUE, newValue, newValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.CALL_PARAMETER_SETTING__VALUE:
-				return basicSetValue(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.CALL_PARAMETER_SETTING__NAME:
-				return getName();
-			case WorkloadPackage.CALL_PARAMETER_SETTING__CHARACTERIZATION:
-				return getCharacterization();
-			case WorkloadPackage.CALL_PARAMETER_SETTING__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.CALL_PARAMETER_SETTING__NAME:
-				setName((String)newValue);
-				return;
-			case WorkloadPackage.CALL_PARAMETER_SETTING__CHARACTERIZATION:
-				setCharacterization((ParameterCharacterizationType)newValue);
-				return;
-			case WorkloadPackage.CALL_PARAMETER_SETTING__VALUE:
-				setValue((RandomVariable)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.CALL_PARAMETER_SETTING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case WorkloadPackage.CALL_PARAMETER_SETTING__CHARACTERIZATION:
-				setCharacterization(CHARACTERIZATION_EDEFAULT);
-				return;
-			case WorkloadPackage.CALL_PARAMETER_SETTING__VALUE:
-				setValue((RandomVariable)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.CALL_PARAMETER_SETTING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case WorkloadPackage.CALL_PARAMETER_SETTING__CHARACTERIZATION:
-				return characterization != CHARACTERIZATION_EDEFAULT;
-			case WorkloadPackage.CALL_PARAMETER_SETTING__VALUE:
-				return value != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", characterization: ");
-		result.append(characterization);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CallParameterSettingImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/ClosedWorkloadTypeImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/ClosedWorkloadTypeImpl.java
deleted file mode 100644
index 725aaea78e98c7609e9f33136042adfc6686a5e3..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/ClosedWorkloadTypeImpl.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.math.BigInteger;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Closed Workload Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.ClosedWorkloadTypeImpl#getPopulation <em>Population</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.ClosedWorkloadTypeImpl#getThinkTime <em>Think Time</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ClosedWorkloadTypeImpl extends WorkloadTypeImpl implements ClosedWorkloadType {
-	/**
-	 * The default value of the '{@link #getPopulation() <em>Population</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPopulation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BigInteger POPULATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPopulation() <em>Population</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPopulation()
-	 * @generated
-	 * @ordered
-	 */
-	protected BigInteger population = POPULATION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getThinkTime() <em>Think Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getThinkTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected RandomVariable thinkTime;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ClosedWorkloadTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.CLOSED_WORKLOAD_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BigInteger getPopulation() {
-		return population;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPopulation(BigInteger newPopulation) {
-		BigInteger oldPopulation = population;
-		population = newPopulation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.CLOSED_WORKLOAD_TYPE__POPULATION, oldPopulation, population));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RandomVariable getThinkTime() {
-		return thinkTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetThinkTime(RandomVariable newThinkTime, NotificationChain msgs) {
-		RandomVariable oldThinkTime = thinkTime;
-		thinkTime = newThinkTime;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME, oldThinkTime, newThinkTime);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setThinkTime(RandomVariable newThinkTime) {
-		if (newThinkTime != thinkTime) {
-			NotificationChain msgs = null;
-			if (thinkTime != null)
-				msgs = ((InternalEObject)thinkTime).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME, null, msgs);
-			if (newThinkTime != null)
-				msgs = ((InternalEObject)newThinkTime).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME, null, msgs);
-			msgs = basicSetThinkTime(newThinkTime, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME, newThinkTime, newThinkTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME:
-				return basicSetThinkTime(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__POPULATION:
-				return getPopulation();
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME:
-				return getThinkTime();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__POPULATION:
-				setPopulation((BigInteger)newValue);
-				return;
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME:
-				setThinkTime((RandomVariable)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__POPULATION:
-				setPopulation(POPULATION_EDEFAULT);
-				return;
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME:
-				setThinkTime((RandomVariable)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__POPULATION:
-				return POPULATION_EDEFAULT == null ? population != null : !POPULATION_EDEFAULT.equals(population);
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__THINK_TIME:
-				return thinkTime != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (population: ");
-		result.append(population);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ClosedWorkloadTypeImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/DelayUserActionImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/DelayUserActionImpl.java
deleted file mode 100644
index d2128c64c1ccbdb858756b5fd5df93d220328508..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/DelayUserActionImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import edu.kit.ipd.descartes.mm.workload.DelayUserAction;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Delay User Action</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.DelayUserActionImpl#getTimeSpecification <em>Time Specification</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DelayUserActionImpl extends AbstractUserActionImpl implements DelayUserAction {
-	/**
-	 * The cached value of the '{@link #getTimeSpecification() <em>Time Specification</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTimeSpecification()
-	 * @generated
-	 * @ordered
-	 */
-	protected RandomVariable timeSpecification;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DelayUserActionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.DELAY_USER_ACTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RandomVariable getTimeSpecification() {
-		return timeSpecification;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTimeSpecification(RandomVariable newTimeSpecification, NotificationChain msgs) {
-		RandomVariable oldTimeSpecification = timeSpecification;
-		timeSpecification = newTimeSpecification;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION, oldTimeSpecification, newTimeSpecification);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTimeSpecification(RandomVariable newTimeSpecification) {
-		if (newTimeSpecification != timeSpecification) {
-			NotificationChain msgs = null;
-			if (timeSpecification != null)
-				msgs = ((InternalEObject)timeSpecification).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION, null, msgs);
-			if (newTimeSpecification != null)
-				msgs = ((InternalEObject)newTimeSpecification).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION, null, msgs);
-			msgs = basicSetTimeSpecification(newTimeSpecification, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION, newTimeSpecification, newTimeSpecification));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION:
-				return basicSetTimeSpecification(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION:
-				return getTimeSpecification();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION:
-				setTimeSpecification((RandomVariable)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION:
-				setTimeSpecification((RandomVariable)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.DELAY_USER_ACTION__TIME_SPECIFICATION:
-				return timeSpecification != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DelayUserActionImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/EntryLevelSystemCallImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/EntryLevelSystemCallImpl.java
deleted file mode 100644
index d31cf4003222b90dd212f06d758e06f088b20dbe..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/EntryLevelSystemCallImpl.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRole;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Signature;
-
-import edu.kit.ipd.descartes.mm.workload.CallParameterSetting;
-import edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Entry Level System Call</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.EntryLevelSystemCallImpl#getProvidingRole <em>Providing Role</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.EntryLevelSystemCallImpl#getSignature <em>Signature</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.EntryLevelSystemCallImpl#getInputParameterSettings <em>Input Parameter Settings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EntryLevelSystemCallImpl extends AbstractUserActionImpl implements EntryLevelSystemCall {
-	/**
-	 * The cached value of the '{@link #getProvidingRole() <em>Providing Role</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProvidingRole()
-	 * @generated
-	 * @ordered
-	 */
-	protected InterfaceProvidingRole providingRole;
-
-	/**
-	 * The cached value of the '{@link #getSignature() <em>Signature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSignature()
-	 * @generated
-	 * @ordered
-	 */
-	protected Signature signature;
-
-	/**
-	 * The cached value of the '{@link #getInputParameterSettings() <em>Input Parameter Settings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInputParameterSettings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<CallParameterSetting> inputParameterSettings;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EntryLevelSystemCallImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.ENTRY_LEVEL_SYSTEM_CALL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterfaceProvidingRole getProvidingRole() {
-		if (providingRole != null && providingRole.eIsProxy()) {
-			InternalEObject oldProvidingRole = (InternalEObject)providingRole;
-			providingRole = (InterfaceProvidingRole)eResolveProxy(oldProvidingRole);
-			if (providingRole != oldProvidingRole) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE, oldProvidingRole, providingRole));
-			}
-		}
-		return providingRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterfaceProvidingRole basicGetProvidingRole() {
-		return providingRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProvidingRole(InterfaceProvidingRole newProvidingRole) {
-		InterfaceProvidingRole oldProvidingRole = providingRole;
-		providingRole = newProvidingRole;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE, oldProvidingRole, providingRole));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Signature getSignature() {
-		if (signature != null && signature.eIsProxy()) {
-			InternalEObject oldSignature = (InternalEObject)signature;
-			signature = (Signature)eResolveProxy(oldSignature);
-			if (signature != oldSignature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE, oldSignature, signature));
-			}
-		}
-		return signature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Signature basicGetSignature() {
-		return signature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSignature(Signature newSignature) {
-		Signature oldSignature = signature;
-		signature = newSignature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE, oldSignature, signature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<CallParameterSetting> getInputParameterSettings() {
-		if (inputParameterSettings == null) {
-			inputParameterSettings = new EObjectContainmentEList<CallParameterSetting>(CallParameterSetting.class, this, WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS);
-		}
-		return inputParameterSettings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS:
-				return ((InternalEList<?>)getInputParameterSettings()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE:
-				if (resolve) return getProvidingRole();
-				return basicGetProvidingRole();
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE:
-				if (resolve) return getSignature();
-				return basicGetSignature();
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS:
-				return getInputParameterSettings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE:
-				setProvidingRole((InterfaceProvidingRole)newValue);
-				return;
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE:
-				setSignature((Signature)newValue);
-				return;
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS:
-				getInputParameterSettings().clear();
-				getInputParameterSettings().addAll((Collection<? extends CallParameterSetting>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE:
-				setProvidingRole((InterfaceProvidingRole)null);
-				return;
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE:
-				setSignature((Signature)null);
-				return;
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS:
-				getInputParameterSettings().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE:
-				return providingRole != null;
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE:
-				return signature != null;
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS:
-				return inputParameterSettings != null && !inputParameterSettings.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //EntryLevelSystemCallImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/LoopUserActionImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/LoopUserActionImpl.java
deleted file mode 100644
index 29c1b3c633f0026c8f9859a71de4dbaaba2d623a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/LoopUserActionImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import edu.kit.ipd.descartes.mm.workload.LoopUserAction;
-import edu.kit.ipd.descartes.mm.workload.ScenarioBehavior;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Loop User Action</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.LoopUserActionImpl#getLoopBodyScenarioBehavior <em>Loop Body Scenario Behavior</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.LoopUserActionImpl#getLoopIterationCount <em>Loop Iteration Count</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LoopUserActionImpl extends AbstractUserActionImpl implements LoopUserAction {
-	/**
-	 * The cached value of the '{@link #getLoopBodyScenarioBehavior() <em>Loop Body Scenario Behavior</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoopBodyScenarioBehavior()
-	 * @generated
-	 * @ordered
-	 */
-	protected ScenarioBehavior loopBodyScenarioBehavior;
-
-	/**
-	 * The cached value of the '{@link #getLoopIterationCount() <em>Loop Iteration Count</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoopIterationCount()
-	 * @generated
-	 * @ordered
-	 */
-	protected RandomVariable loopIterationCount;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LoopUserActionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.LOOP_USER_ACTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ScenarioBehavior getLoopBodyScenarioBehavior() {
-		return loopBodyScenarioBehavior;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLoopBodyScenarioBehavior(ScenarioBehavior newLoopBodyScenarioBehavior, NotificationChain msgs) {
-		ScenarioBehavior oldLoopBodyScenarioBehavior = loopBodyScenarioBehavior;
-		loopBodyScenarioBehavior = newLoopBodyScenarioBehavior;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR, oldLoopBodyScenarioBehavior, newLoopBodyScenarioBehavior);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLoopBodyScenarioBehavior(ScenarioBehavior newLoopBodyScenarioBehavior) {
-		if (newLoopBodyScenarioBehavior != loopBodyScenarioBehavior) {
-			NotificationChain msgs = null;
-			if (loopBodyScenarioBehavior != null)
-				msgs = ((InternalEObject)loopBodyScenarioBehavior).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR, null, msgs);
-			if (newLoopBodyScenarioBehavior != null)
-				msgs = ((InternalEObject)newLoopBodyScenarioBehavior).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR, null, msgs);
-			msgs = basicSetLoopBodyScenarioBehavior(newLoopBodyScenarioBehavior, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR, newLoopBodyScenarioBehavior, newLoopBodyScenarioBehavior));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RandomVariable getLoopIterationCount() {
-		return loopIterationCount;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLoopIterationCount(RandomVariable newLoopIterationCount, NotificationChain msgs) {
-		RandomVariable oldLoopIterationCount = loopIterationCount;
-		loopIterationCount = newLoopIterationCount;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT, oldLoopIterationCount, newLoopIterationCount);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLoopIterationCount(RandomVariable newLoopIterationCount) {
-		if (newLoopIterationCount != loopIterationCount) {
-			NotificationChain msgs = null;
-			if (loopIterationCount != null)
-				msgs = ((InternalEObject)loopIterationCount).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT, null, msgs);
-			if (newLoopIterationCount != null)
-				msgs = ((InternalEObject)newLoopIterationCount).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT, null, msgs);
-			msgs = basicSetLoopIterationCount(newLoopIterationCount, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT, newLoopIterationCount, newLoopIterationCount));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR:
-				return basicSetLoopBodyScenarioBehavior(null, msgs);
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT:
-				return basicSetLoopIterationCount(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR:
-				return getLoopBodyScenarioBehavior();
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT:
-				return getLoopIterationCount();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR:
-				setLoopBodyScenarioBehavior((ScenarioBehavior)newValue);
-				return;
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT:
-				setLoopIterationCount((RandomVariable)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR:
-				setLoopBodyScenarioBehavior((ScenarioBehavior)null);
-				return;
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT:
-				setLoopIterationCount((RandomVariable)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR:
-				return loopBodyScenarioBehavior != null;
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_ITERATION_COUNT:
-				return loopIterationCount != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //LoopUserActionImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/OpenWorkloadTypeImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/OpenWorkloadTypeImpl.java
deleted file mode 100644
index eac2f5100dd1887635fccac46c95931264282e59..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/OpenWorkloadTypeImpl.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import edu.kit.ipd.descartes.mm.workload.OpenWorkloadType;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Open Workload Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.OpenWorkloadTypeImpl#getInterArrivalTime <em>Inter Arrival Time</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OpenWorkloadTypeImpl extends WorkloadTypeImpl implements OpenWorkloadType {
-	/**
-	 * The cached value of the '{@link #getInterArrivalTime() <em>Inter Arrival Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInterArrivalTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected RandomVariable interArrivalTime;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OpenWorkloadTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.OPEN_WORKLOAD_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RandomVariable getInterArrivalTime() {
-		return interArrivalTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInterArrivalTime(RandomVariable newInterArrivalTime, NotificationChain msgs) {
-		RandomVariable oldInterArrivalTime = interArrivalTime;
-		interArrivalTime = newInterArrivalTime;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME, oldInterArrivalTime, newInterArrivalTime);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInterArrivalTime(RandomVariable newInterArrivalTime) {
-		if (newInterArrivalTime != interArrivalTime) {
-			NotificationChain msgs = null;
-			if (interArrivalTime != null)
-				msgs = ((InternalEObject)interArrivalTime).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME, null, msgs);
-			if (newInterArrivalTime != null)
-				msgs = ((InternalEObject)newInterArrivalTime).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME, null, msgs);
-			msgs = basicSetInterArrivalTime(newInterArrivalTime, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME, newInterArrivalTime, newInterArrivalTime));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME:
-				return basicSetInterArrivalTime(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME:
-				return getInterArrivalTime();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME:
-				setInterArrivalTime((RandomVariable)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME:
-				setInterArrivalTime((RandomVariable)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME:
-				return interArrivalTime != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //OpenWorkloadTypeImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/ScenarioBehaviorImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/ScenarioBehaviorImpl.java
deleted file mode 100644
index eba933367ffc7529249596944e4495749a0d00b2..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/ScenarioBehaviorImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.workload.AbstractUserAction;
-import edu.kit.ipd.descartes.mm.workload.ScenarioBehavior;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Scenario Behavior</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.ScenarioBehaviorImpl#getActions <em>Actions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ScenarioBehaviorImpl extends EObjectImpl implements ScenarioBehavior {
-	/**
-	 * The cached value of the '{@link #getActions() <em>Actions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<AbstractUserAction> actions;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ScenarioBehaviorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.SCENARIO_BEHAVIOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<AbstractUserAction> getActions() {
-		if (actions == null) {
-			actions = new EObjectContainmentWithInverseEList<AbstractUserAction>(AbstractUserAction.class, this, WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS, WorkloadPackage.ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR);
-		}
-		return actions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getActions()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS:
-				return ((InternalEList<?>)getActions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS:
-				return getActions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS:
-				getActions().clear();
-				getActions().addAll((Collection<? extends AbstractUserAction>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS:
-				getActions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS:
-				return actions != null && !actions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ScenarioBehaviorImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/UsageScenarioImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/UsageScenarioImpl.java
deleted file mode 100644
index 2b28100aa6a2a4f61dc1c296b5bb600fda09fc4b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/UsageScenarioImpl.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.core.impl.EntityImpl;
-
-import edu.kit.ipd.descartes.mm.workload.ScenarioBehavior;
-import edu.kit.ipd.descartes.mm.workload.UsageScenario;
-import edu.kit.ipd.descartes.mm.workload.Workload;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-import edu.kit.ipd.descartes.mm.workload.WorkloadType;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Usage Scenario</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.UsageScenarioImpl#getUsageModel <em>Usage Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.UsageScenarioImpl#getScenarioBehavior <em>Scenario Behavior</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.UsageScenarioImpl#getWorkloadType <em>Workload Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UsageScenarioImpl extends EntityImpl implements UsageScenario {
-	/**
-	 * The cached value of the '{@link #getScenarioBehavior() <em>Scenario Behavior</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScenarioBehavior()
-	 * @generated
-	 * @ordered
-	 */
-	protected ScenarioBehavior scenarioBehavior;
-
-	/**
-	 * The cached value of the '{@link #getWorkloadType() <em>Workload Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkloadType()
-	 * @generated
-	 * @ordered
-	 */
-	protected WorkloadType workloadType;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UsageScenarioImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.USAGE_SCENARIO;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Workload getUsageModel() {
-		if (eContainerFeatureID() != WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL) return null;
-		return (Workload)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUsageModel(Workload newUsageModel, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newUsageModel, WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsageModel(Workload newUsageModel) {
-		if (newUsageModel != eInternalContainer() || (eContainerFeatureID() != WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL && newUsageModel != null)) {
-			if (EcoreUtil.isAncestor(this, newUsageModel))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newUsageModel != null)
-				msgs = ((InternalEObject)newUsageModel).eInverseAdd(this, WorkloadPackage.WORKLOAD__USAGE_SCENARIOS, Workload.class, msgs);
-			msgs = basicSetUsageModel(newUsageModel, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL, newUsageModel, newUsageModel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ScenarioBehavior getScenarioBehavior() {
-		return scenarioBehavior;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetScenarioBehavior(ScenarioBehavior newScenarioBehavior, NotificationChain msgs) {
-		ScenarioBehavior oldScenarioBehavior = scenarioBehavior;
-		scenarioBehavior = newScenarioBehavior;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR, oldScenarioBehavior, newScenarioBehavior);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScenarioBehavior(ScenarioBehavior newScenarioBehavior) {
-		if (newScenarioBehavior != scenarioBehavior) {
-			NotificationChain msgs = null;
-			if (scenarioBehavior != null)
-				msgs = ((InternalEObject)scenarioBehavior).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR, null, msgs);
-			if (newScenarioBehavior != null)
-				msgs = ((InternalEObject)newScenarioBehavior).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR, null, msgs);
-			msgs = basicSetScenarioBehavior(newScenarioBehavior, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR, newScenarioBehavior, newScenarioBehavior));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadType getWorkloadType() {
-		return workloadType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWorkloadType(WorkloadType newWorkloadType, NotificationChain msgs) {
-		WorkloadType oldWorkloadType = workloadType;
-		workloadType = newWorkloadType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE, oldWorkloadType, newWorkloadType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWorkloadType(WorkloadType newWorkloadType) {
-		if (newWorkloadType != workloadType) {
-			NotificationChain msgs = null;
-			if (workloadType != null)
-				msgs = ((InternalEObject)workloadType).eInverseRemove(this, WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO, WorkloadType.class, msgs);
-			if (newWorkloadType != null)
-				msgs = ((InternalEObject)newWorkloadType).eInverseAdd(this, WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO, WorkloadType.class, msgs);
-			msgs = basicSetWorkloadType(newWorkloadType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE, newWorkloadType, newWorkloadType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetUsageModel((Workload)otherEnd, msgs);
-			case WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE:
-				if (workloadType != null)
-					msgs = ((InternalEObject)workloadType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE, null, msgs);
-				return basicSetWorkloadType((WorkloadType)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL:
-				return basicSetUsageModel(null, msgs);
-			case WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR:
-				return basicSetScenarioBehavior(null, msgs);
-			case WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE:
-				return basicSetWorkloadType(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL:
-				return eInternalContainer().eInverseRemove(this, WorkloadPackage.WORKLOAD__USAGE_SCENARIOS, Workload.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL:
-				return getUsageModel();
-			case WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR:
-				return getScenarioBehavior();
-			case WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE:
-				return getWorkloadType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL:
-				setUsageModel((Workload)newValue);
-				return;
-			case WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR:
-				setScenarioBehavior((ScenarioBehavior)newValue);
-				return;
-			case WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE:
-				setWorkloadType((WorkloadType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL:
-				setUsageModel((Workload)null);
-				return;
-			case WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR:
-				setScenarioBehavior((ScenarioBehavior)null);
-				return;
-			case WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE:
-				setWorkloadType((WorkloadType)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL:
-				return getUsageModel() != null;
-			case WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR:
-				return scenarioBehavior != null;
-			case WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE:
-				return workloadType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //UsageScenarioImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadFactoryImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadFactoryImpl.java
deleted file mode 100644
index 333e60bb1d0314b644688b87ab74c86dc02b1127..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadFactoryImpl.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.workload.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkloadFactoryImpl extends EFactoryImpl implements WorkloadFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static WorkloadFactory init() {
-		try {
-			WorkloadFactory theWorkloadFactory = (WorkloadFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.descartes-research.net/metamodel/workload/0.1"); 
-			if (theWorkloadFactory != null) {
-				return theWorkloadFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new WorkloadFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case WorkloadPackage.WORKLOAD: return createWorkload();
-			case WorkloadPackage.USAGE_SCENARIO: return createUsageScenario();
-			case WorkloadPackage.SCENARIO_BEHAVIOR: return createScenarioBehavior();
-			case WorkloadPackage.OPEN_WORKLOAD_TYPE: return createOpenWorkloadType();
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE: return createClosedWorkloadType();
-			case WorkloadPackage.LOOP_USER_ACTION: return createLoopUserAction();
-			case WorkloadPackage.DELAY_USER_ACTION: return createDelayUserAction();
-			case WorkloadPackage.BRANCH_USER_ACTION: return createBranchUserAction();
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL: return createEntryLevelSystemCall();
-			case WorkloadPackage.CALL_PARAMETER_SETTING: return createCallParameterSetting();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Workload createWorkload() {
-		WorkloadImpl workload = new WorkloadImpl();
-		return workload;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UsageScenario createUsageScenario() {
-		UsageScenarioImpl usageScenario = new UsageScenarioImpl();
-		return usageScenario;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ScenarioBehavior createScenarioBehavior() {
-		ScenarioBehaviorImpl scenarioBehavior = new ScenarioBehaviorImpl();
-		return scenarioBehavior;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OpenWorkloadType createOpenWorkloadType() {
-		OpenWorkloadTypeImpl openWorkloadType = new OpenWorkloadTypeImpl();
-		return openWorkloadType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ClosedWorkloadType createClosedWorkloadType() {
-		ClosedWorkloadTypeImpl closedWorkloadType = new ClosedWorkloadTypeImpl();
-		return closedWorkloadType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LoopUserAction createLoopUserAction() {
-		LoopUserActionImpl loopUserAction = new LoopUserActionImpl();
-		return loopUserAction;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DelayUserAction createDelayUserAction() {
-		DelayUserActionImpl delayUserAction = new DelayUserActionImpl();
-		return delayUserAction;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BranchUserAction createBranchUserAction() {
-		BranchUserActionImpl branchUserAction = new BranchUserActionImpl();
-		return branchUserAction;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntryLevelSystemCall createEntryLevelSystemCall() {
-		EntryLevelSystemCallImpl entryLevelSystemCall = new EntryLevelSystemCallImpl();
-		return entryLevelSystemCall;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CallParameterSetting createCallParameterSetting() {
-		CallParameterSettingImpl callParameterSetting = new CallParameterSettingImpl();
-		return callParameterSetting;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadPackage getWorkloadPackage() {
-		return (WorkloadPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static WorkloadPackage getPackage() {
-		return WorkloadPackage.eINSTANCE;
-	}
-
-} //WorkloadFactoryImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadImpl.java
deleted file mode 100644
index 8cce115940acde6dd7f96279ab48b10953b9a8b3..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadImpl.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.core.impl.EntityImpl;
-
-import edu.kit.ipd.descartes.mm.workload.UsageScenario;
-import edu.kit.ipd.descartes.mm.workload.Workload;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Workload</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.WorkloadImpl#getSystem <em>System</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.WorkloadImpl#getUsageScenarios <em>Usage Scenarios</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WorkloadImpl extends EntityImpl implements Workload {
-	/**
-	 * The cached value of the '{@link #getSystem() <em>System</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSystem()
-	 * @generated
-	 * @ordered
-	 */
-	protected edu.kit.ipd.descartes.mm.applicationlevel.system.System system;
-
-	/**
-	 * The cached value of the '{@link #getUsageScenarios() <em>Usage Scenarios</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageScenarios()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<UsageScenario> usageScenarios;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkloadImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.WORKLOAD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public edu.kit.ipd.descartes.mm.applicationlevel.system.System getSystem() {
-		if (system != null && system.eIsProxy()) {
-			InternalEObject oldSystem = (InternalEObject)system;
-			system = (edu.kit.ipd.descartes.mm.applicationlevel.system.System)eResolveProxy(oldSystem);
-			if (system != oldSystem) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WorkloadPackage.WORKLOAD__SYSTEM, oldSystem, system));
-			}
-		}
-		return system;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public edu.kit.ipd.descartes.mm.applicationlevel.system.System basicGetSystem() {
-		return system;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSystem(edu.kit.ipd.descartes.mm.applicationlevel.system.System newSystem) {
-		edu.kit.ipd.descartes.mm.applicationlevel.system.System oldSystem = system;
-		system = newSystem;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.WORKLOAD__SYSTEM, oldSystem, system));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<UsageScenario> getUsageScenarios() {
-		if (usageScenarios == null) {
-			usageScenarios = new EObjectContainmentWithInverseEList<UsageScenario>(UsageScenario.class, this, WorkloadPackage.WORKLOAD__USAGE_SCENARIOS, WorkloadPackage.USAGE_SCENARIO__USAGE_MODEL);
-		}
-		return usageScenarios;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD__USAGE_SCENARIOS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getUsageScenarios()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD__USAGE_SCENARIOS:
-				return ((InternalEList<?>)getUsageScenarios()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD__SYSTEM:
-				if (resolve) return getSystem();
-				return basicGetSystem();
-			case WorkloadPackage.WORKLOAD__USAGE_SCENARIOS:
-				return getUsageScenarios();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD__SYSTEM:
-				setSystem((edu.kit.ipd.descartes.mm.applicationlevel.system.System)newValue);
-				return;
-			case WorkloadPackage.WORKLOAD__USAGE_SCENARIOS:
-				getUsageScenarios().clear();
-				getUsageScenarios().addAll((Collection<? extends UsageScenario>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD__SYSTEM:
-				setSystem((edu.kit.ipd.descartes.mm.applicationlevel.system.System)null);
-				return;
-			case WorkloadPackage.WORKLOAD__USAGE_SCENARIOS:
-				getUsageScenarios().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD__SYSTEM:
-				return system != null;
-			case WorkloadPackage.WORKLOAD__USAGE_SCENARIOS:
-				return usageScenarios != null && !usageScenarios.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //WorkloadImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadPackageImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadPackageImpl.java
deleted file mode 100644
index 838253892d6149a23783b9378b49aed8ad50d089..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadPackageImpl.java
+++ /dev/null
@@ -1,746 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.core.CorePackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.system.SystemPackage;
-
-import edu.kit.ipd.descartes.mm.workload.AbstractUserAction;
-import edu.kit.ipd.descartes.mm.workload.BranchUserAction;
-import edu.kit.ipd.descartes.mm.workload.CallParameterSetting;
-import edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType;
-import edu.kit.ipd.descartes.mm.workload.DelayUserAction;
-import edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall;
-import edu.kit.ipd.descartes.mm.workload.LoopUserAction;
-import edu.kit.ipd.descartes.mm.workload.OpenWorkloadType;
-import edu.kit.ipd.descartes.mm.workload.ScenarioBehavior;
-import edu.kit.ipd.descartes.mm.workload.UsageScenario;
-import edu.kit.ipd.descartes.mm.workload.Workload;
-import edu.kit.ipd.descartes.mm.workload.WorkloadFactory;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-import edu.kit.ipd.descartes.mm.workload.WorkloadType;
-
-import edu.kit.ipd.descartes.mm.workload.util.WorkloadValidator;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkloadPackageImpl extends EPackageImpl implements WorkloadPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workloadEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass usageScenarioEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass scenarioBehaviorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass workloadTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass openWorkloadTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass closedWorkloadTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractUserActionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass loopUserActionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass delayUserActionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass branchUserActionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass entryLevelSystemCallEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass callParameterSettingEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private WorkloadPackageImpl() {
-		super(eNS_URI, WorkloadFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link WorkloadPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static WorkloadPackage init() {
-		if (isInited) return (WorkloadPackage)EPackage.Registry.INSTANCE.getEPackage(WorkloadPackage.eNS_URI);
-
-		// Obtain or create and register package
-		WorkloadPackageImpl theWorkloadPackage = (WorkloadPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof WorkloadPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new WorkloadPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		FunctionsPackage.eINSTANCE.eClass();
-		ParameterdependenciesPackage.eINSTANCE.eClass();
-		RepositoryPackage.eINSTANCE.eClass();
-		ServicebehaviorPackage.eINSTANCE.eClass();
-		SystemPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theWorkloadPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theWorkloadPackage.initializePackageContents();
-
-		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theWorkloadPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return WorkloadValidator.INSTANCE;
-				 }
-			 });
-
-		// Mark meta-data to indicate it can't be changed
-		theWorkloadPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(WorkloadPackage.eNS_URI, theWorkloadPackage);
-		return theWorkloadPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkload() {
-		return workloadEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkload_System() {
-		return (EReference)workloadEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkload_UsageScenarios() {
-		return (EReference)workloadEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUsageScenario() {
-		return usageScenarioEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUsageScenario_UsageModel() {
-		return (EReference)usageScenarioEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUsageScenario_ScenarioBehavior() {
-		return (EReference)usageScenarioEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUsageScenario_WorkloadType() {
-		return (EReference)usageScenarioEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getScenarioBehavior() {
-		return scenarioBehaviorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getScenarioBehavior_Actions() {
-		return (EReference)scenarioBehaviorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getWorkloadType() {
-		return workloadTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWorkloadType_UsageScenario() {
-		return (EReference)workloadTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOpenWorkloadType() {
-		return openWorkloadTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOpenWorkloadType_InterArrivalTime() {
-		return (EReference)openWorkloadTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getClosedWorkloadType() {
-		return closedWorkloadTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getClosedWorkloadType_Population() {
-		return (EAttribute)closedWorkloadTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getClosedWorkloadType_ThinkTime() {
-		return (EReference)closedWorkloadTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractUserAction() {
-		return abstractUserActionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractUserAction_ParentScenarioBehavior() {
-		return (EReference)abstractUserActionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLoopUserAction() {
-		return loopUserActionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLoopUserAction_LoopBodyScenarioBehavior() {
-		return (EReference)loopUserActionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLoopUserAction_LoopIterationCount() {
-		return (EReference)loopUserActionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDelayUserAction() {
-		return delayUserActionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDelayUserAction_TimeSpecification() {
-		return (EReference)delayUserActionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBranchUserAction() {
-		return branchUserActionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBranchUserAction_Branches() {
-		return (EReference)branchUserActionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBranchUserAction_BranchUserProbabilities() {
-		return (EReference)branchUserActionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEntryLevelSystemCall() {
-		return entryLevelSystemCallEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntryLevelSystemCall_ProvidingRole() {
-		return (EReference)entryLevelSystemCallEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntryLevelSystemCall_Signature() {
-		return (EReference)entryLevelSystemCallEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEntryLevelSystemCall_InputParameterSettings() {
-		return (EReference)entryLevelSystemCallEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCallParameterSetting() {
-		return callParameterSettingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCallParameterSetting_Name() {
-		return (EAttribute)callParameterSettingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCallParameterSetting_Characterization() {
-		return (EAttribute)callParameterSettingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCallParameterSetting_Value() {
-		return (EReference)callParameterSettingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadFactory getWorkloadFactory() {
-		return (WorkloadFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		workloadEClass = createEClass(WORKLOAD);
-		createEReference(workloadEClass, WORKLOAD__SYSTEM);
-		createEReference(workloadEClass, WORKLOAD__USAGE_SCENARIOS);
-
-		usageScenarioEClass = createEClass(USAGE_SCENARIO);
-		createEReference(usageScenarioEClass, USAGE_SCENARIO__USAGE_MODEL);
-		createEReference(usageScenarioEClass, USAGE_SCENARIO__SCENARIO_BEHAVIOR);
-		createEReference(usageScenarioEClass, USAGE_SCENARIO__WORKLOAD_TYPE);
-
-		scenarioBehaviorEClass = createEClass(SCENARIO_BEHAVIOR);
-		createEReference(scenarioBehaviorEClass, SCENARIO_BEHAVIOR__ACTIONS);
-
-		workloadTypeEClass = createEClass(WORKLOAD_TYPE);
-		createEReference(workloadTypeEClass, WORKLOAD_TYPE__USAGE_SCENARIO);
-
-		openWorkloadTypeEClass = createEClass(OPEN_WORKLOAD_TYPE);
-		createEReference(openWorkloadTypeEClass, OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME);
-
-		closedWorkloadTypeEClass = createEClass(CLOSED_WORKLOAD_TYPE);
-		createEAttribute(closedWorkloadTypeEClass, CLOSED_WORKLOAD_TYPE__POPULATION);
-		createEReference(closedWorkloadTypeEClass, CLOSED_WORKLOAD_TYPE__THINK_TIME);
-
-		abstractUserActionEClass = createEClass(ABSTRACT_USER_ACTION);
-		createEReference(abstractUserActionEClass, ABSTRACT_USER_ACTION__PARENT_SCENARIO_BEHAVIOR);
-
-		loopUserActionEClass = createEClass(LOOP_USER_ACTION);
-		createEReference(loopUserActionEClass, LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR);
-		createEReference(loopUserActionEClass, LOOP_USER_ACTION__LOOP_ITERATION_COUNT);
-
-		delayUserActionEClass = createEClass(DELAY_USER_ACTION);
-		createEReference(delayUserActionEClass, DELAY_USER_ACTION__TIME_SPECIFICATION);
-
-		branchUserActionEClass = createEClass(BRANCH_USER_ACTION);
-		createEReference(branchUserActionEClass, BRANCH_USER_ACTION__BRANCHES);
-		createEReference(branchUserActionEClass, BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES);
-
-		entryLevelSystemCallEClass = createEClass(ENTRY_LEVEL_SYSTEM_CALL);
-		createEReference(entryLevelSystemCallEClass, ENTRY_LEVEL_SYSTEM_CALL__PROVIDING_ROLE);
-		createEReference(entryLevelSystemCallEClass, ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE);
-		createEReference(entryLevelSystemCallEClass, ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS);
-
-		callParameterSettingEClass = createEClass(CALL_PARAMETER_SETTING);
-		createEAttribute(callParameterSettingEClass, CALL_PARAMETER_SETTING__NAME);
-		createEAttribute(callParameterSettingEClass, CALL_PARAMETER_SETTING__CHARACTERIZATION);
-		createEReference(callParameterSettingEClass, CALL_PARAMETER_SETTING__VALUE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
-		SystemPackage theSystemPackage = (SystemPackage)EPackage.Registry.INSTANCE.getEPackage(SystemPackage.eNS_URI);
-		FunctionsPackage theFunctionsPackage = (FunctionsPackage)EPackage.Registry.INSTANCE.getEPackage(FunctionsPackage.eNS_URI);
-		RepositoryPackage theRepositoryPackage = (RepositoryPackage)EPackage.Registry.INSTANCE.getEPackage(RepositoryPackage.eNS_URI);
-		ParameterdependenciesPackage theParameterdependenciesPackage = (ParameterdependenciesPackage)EPackage.Registry.INSTANCE.getEPackage(ParameterdependenciesPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		workloadEClass.getESuperTypes().add(theCorePackage.getEntity());
-		usageScenarioEClass.getESuperTypes().add(theCorePackage.getEntity());
-		openWorkloadTypeEClass.getESuperTypes().add(this.getWorkloadType());
-		closedWorkloadTypeEClass.getESuperTypes().add(this.getWorkloadType());
-		loopUserActionEClass.getESuperTypes().add(this.getAbstractUserAction());
-		delayUserActionEClass.getESuperTypes().add(this.getAbstractUserAction());
-		branchUserActionEClass.getESuperTypes().add(this.getAbstractUserAction());
-		entryLevelSystemCallEClass.getESuperTypes().add(this.getAbstractUserAction());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(workloadEClass, Workload.class, "Workload", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWorkload_System(), theSystemPackage.getSystem(), null, "system", null, 0, 1, Workload.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getWorkload_UsageScenarios(), this.getUsageScenario(), this.getUsageScenario_UsageModel(), "usageScenarios", null, 0, -1, Workload.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(usageScenarioEClass, UsageScenario.class, "UsageScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getUsageScenario_UsageModel(), this.getWorkload(), this.getWorkload_UsageScenarios(), "usageModel", null, 1, 1, UsageScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getUsageScenario_ScenarioBehavior(), this.getScenarioBehavior(), null, "scenarioBehavior", null, 1, 1, UsageScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getUsageScenario_WorkloadType(), this.getWorkloadType(), this.getWorkloadType_UsageScenario(), "workloadType", null, 1, 1, UsageScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(scenarioBehaviorEClass, ScenarioBehavior.class, "ScenarioBehavior", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getScenarioBehavior_Actions(), this.getAbstractUserAction(), this.getAbstractUserAction_ParentScenarioBehavior(), "actions", null, 0, -1, ScenarioBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(workloadTypeEClass, WorkloadType.class, "WorkloadType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWorkloadType_UsageScenario(), this.getUsageScenario(), this.getUsageScenario_WorkloadType(), "usageScenario", null, 1, 1, WorkloadType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(openWorkloadTypeEClass, OpenWorkloadType.class, "OpenWorkloadType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getOpenWorkloadType_InterArrivalTime(), theFunctionsPackage.getRandomVariable(), null, "interArrivalTime", null, 1, 1, OpenWorkloadType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(closedWorkloadTypeEClass, ClosedWorkloadType.class, "ClosedWorkloadType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getClosedWorkloadType_Population(), ecorePackage.getEBigInteger(), "population", null, 1, 1, ClosedWorkloadType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getClosedWorkloadType_ThinkTime(), theFunctionsPackage.getRandomVariable(), null, "thinkTime", null, 1, 1, ClosedWorkloadType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(abstractUserActionEClass, AbstractUserAction.class, "AbstractUserAction", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAbstractUserAction_ParentScenarioBehavior(), this.getScenarioBehavior(), this.getScenarioBehavior_Actions(), "parentScenarioBehavior", null, 1, 1, AbstractUserAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(loopUserActionEClass, LoopUserAction.class, "LoopUserAction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLoopUserAction_LoopBodyScenarioBehavior(), this.getScenarioBehavior(), null, "loopBodyScenarioBehavior", null, 1, 1, LoopUserAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getLoopUserAction_LoopIterationCount(), theFunctionsPackage.getRandomVariable(), null, "loopIterationCount", null, 1, 1, LoopUserAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(delayUserActionEClass, DelayUserAction.class, "DelayUserAction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDelayUserAction_TimeSpecification(), theFunctionsPackage.getRandomVariable(), null, "timeSpecification", null, 1, 1, DelayUserAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(branchUserActionEClass, BranchUserAction.class, "BranchUserAction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBranchUserAction_Branches(), this.getScenarioBehavior(), null, "branches", null, 0, -1, BranchUserAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBranchUserAction_BranchUserProbabilities(), theFunctionsPackage.getRandomVariable(), null, "branchUserProbabilities", null, 1, 1, BranchUserAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(entryLevelSystemCallEClass, EntryLevelSystemCall.class, "EntryLevelSystemCall", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEntryLevelSystemCall_ProvidingRole(), theRepositoryPackage.getInterfaceProvidingRole(), null, "providingRole", null, 1, 1, EntryLevelSystemCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getEntryLevelSystemCall_Signature(), theRepositoryPackage.getSignature(), null, "signature", null, 1, 1, EntryLevelSystemCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getEntryLevelSystemCall_InputParameterSettings(), this.getCallParameterSetting(), null, "inputParameterSettings", null, 0, -1, EntryLevelSystemCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(callParameterSettingEClass, CallParameterSetting.class, "CallParameterSetting", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCallParameterSetting_Name(), ecorePackage.getEString(), "name", null, 1, 1, CallParameterSetting.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getCallParameterSetting_Characterization(), theParameterdependenciesPackage.getParameterCharacterizationType(), "characterization", "VALUE", 1, 1, CallParameterSetting.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getCallParameterSetting_Value(), theFunctionsPackage.getRandomVariable(), null, "value", null, 1, 1, CallParameterSetting.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/emf/2002/Ecore
-		createEcoreAnnotations();
-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot
-		createPivotAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";		
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
-			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"
-		   });		
-		addAnnotation
-		  (openWorkloadTypeEClass, 
-		   source, 
-		   new String[] {
-			 "constraints", "interArrivalTimeInOpenWorkloadNeedsToBeSpecified"
-		   });			
-		addAnnotation
-		  (closedWorkloadTypeEClass, 
-		   source, 
-		   new String[] {
-			 "constraints", "thinkTimeInClosedWorkloadNeedsToBeSpecified populationInClosedWorkloadNeedsToBeGreaterThanZero"
-		   });	
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createPivotAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot";				
-		addAnnotation
-		  (openWorkloadTypeEClass, 
-		   source, 
-		   new String[] {
-			 "interArrivalTimeInOpenWorkloadNeedsToBeSpecified", "not self.interArrivalTime.oclIsUndefined() and not self.interArrivalTime.probFunction.oclIsUndefined()"
-		   });			
-		addAnnotation
-		  (closedWorkloadTypeEClass, 
-		   source, 
-		   new String[] {
-			 "thinkTimeInClosedWorkloadNeedsToBeSpecified", "not self.thinkTime.oclIsUndefined() and not self.thinkTime.probFunction.oclIsUndefined()",
-			 "populationInClosedWorkloadNeedsToBeGreaterThanZero", "self.population > 0"
-		   });
-	}
-
-} //WorkloadPackageImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadTypeImpl.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadTypeImpl.java
deleted file mode 100644
index f365db43730bba0d10fcbdf8e385405fb3b8d44b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/impl/WorkloadTypeImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.impl;
-
-import edu.kit.ipd.descartes.mm.workload.UsageScenario;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-import edu.kit.ipd.descartes.mm.workload.WorkloadType;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.workload.impl.WorkloadTypeImpl#getUsageScenario <em>Usage Scenario</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class WorkloadTypeImpl extends EObjectImpl implements WorkloadType {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkloadTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return WorkloadPackage.Literals.WORKLOAD_TYPE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UsageScenario getUsageScenario() {
-		if (eContainerFeatureID() != WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO) return null;
-		return (UsageScenario)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUsageScenario(UsageScenario newUsageScenario, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newUsageScenario, WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsageScenario(UsageScenario newUsageScenario) {
-		if (newUsageScenario != eInternalContainer() || (eContainerFeatureID() != WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO && newUsageScenario != null)) {
-			if (EcoreUtil.isAncestor(this, newUsageScenario))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newUsageScenario != null)
-				msgs = ((InternalEObject)newUsageScenario).eInverseAdd(this, WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE, UsageScenario.class, msgs);
-			msgs = basicSetUsageScenario(newUsageScenario, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO, newUsageScenario, newUsageScenario));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetUsageScenario((UsageScenario)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO:
-				return basicSetUsageScenario(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO:
-				return eInternalContainer().eInverseRemove(this, WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE, UsageScenario.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO:
-				return getUsageScenario();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO:
-				setUsageScenario((UsageScenario)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO:
-				setUsageScenario((UsageScenario)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case WorkloadPackage.WORKLOAD_TYPE__USAGE_SCENARIO:
-				return getUsageScenario() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //WorkloadTypeImpl
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadAdapterFactory.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadAdapterFactory.java
deleted file mode 100644
index bcc9376a9fed2aed771b5a1a68398ed802300f30..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadAdapterFactory.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.util;
-
-import edu.kit.ipd.descartes.core.Entity;
-import edu.kit.ipd.descartes.core.NamedElement;
-
-import edu.kit.ipd.descartes.identifier.Identifier;
-
-import edu.kit.ipd.descartes.mm.workload.*;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage
- * @generated
- */
-public class WorkloadAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static WorkloadPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = WorkloadPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkloadSwitch<Adapter> modelSwitch =
-		new WorkloadSwitch<Adapter>() {
-			@Override
-			public Adapter caseWorkload(Workload object) {
-				return createWorkloadAdapter();
-			}
-			@Override
-			public Adapter caseUsageScenario(UsageScenario object) {
-				return createUsageScenarioAdapter();
-			}
-			@Override
-			public Adapter caseScenarioBehavior(ScenarioBehavior object) {
-				return createScenarioBehaviorAdapter();
-			}
-			@Override
-			public Adapter caseWorkloadType(WorkloadType object) {
-				return createWorkloadTypeAdapter();
-			}
-			@Override
-			public Adapter caseOpenWorkloadType(OpenWorkloadType object) {
-				return createOpenWorkloadTypeAdapter();
-			}
-			@Override
-			public Adapter caseClosedWorkloadType(ClosedWorkloadType object) {
-				return createClosedWorkloadTypeAdapter();
-			}
-			@Override
-			public Adapter caseAbstractUserAction(AbstractUserAction object) {
-				return createAbstractUserActionAdapter();
-			}
-			@Override
-			public Adapter caseLoopUserAction(LoopUserAction object) {
-				return createLoopUserActionAdapter();
-			}
-			@Override
-			public Adapter caseDelayUserAction(DelayUserAction object) {
-				return createDelayUserActionAdapter();
-			}
-			@Override
-			public Adapter caseBranchUserAction(BranchUserAction object) {
-				return createBranchUserActionAdapter();
-			}
-			@Override
-			public Adapter caseEntryLevelSystemCall(EntryLevelSystemCall object) {
-				return createEntryLevelSystemCallAdapter();
-			}
-			@Override
-			public Adapter caseCallParameterSetting(CallParameterSetting object) {
-				return createCallParameterSettingAdapter();
-			}
-			@Override
-			public Adapter caseIdentifier(Identifier object) {
-				return createIdentifierAdapter();
-			}
-			@Override
-			public Adapter caseNamedElement(NamedElement object) {
-				return createNamedElementAdapter();
-			}
-			@Override
-			public Adapter caseEntity(Entity object) {
-				return createEntityAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.Workload <em>Workload</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.Workload
-	 * @generated
-	 */
-	public Adapter createWorkloadAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.UsageScenario <em>Usage Scenario</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.UsageScenario
-	 * @generated
-	 */
-	public Adapter createUsageScenarioAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior <em>Scenario Behavior</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.ScenarioBehavior
-	 * @generated
-	 */
-	public Adapter createScenarioBehaviorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.WorkloadType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.WorkloadType
-	 * @generated
-	 */
-	public Adapter createWorkloadTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.OpenWorkloadType <em>Open Workload Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.OpenWorkloadType
-	 * @generated
-	 */
-	public Adapter createOpenWorkloadTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType <em>Closed Workload Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType
-	 * @generated
-	 */
-	public Adapter createClosedWorkloadTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.AbstractUserAction <em>Abstract User Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.AbstractUserAction
-	 * @generated
-	 */
-	public Adapter createAbstractUserActionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.LoopUserAction <em>Loop User Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.LoopUserAction
-	 * @generated
-	 */
-	public Adapter createLoopUserActionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.DelayUserAction <em>Delay User Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.DelayUserAction
-	 * @generated
-	 */
-	public Adapter createDelayUserActionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.BranchUserAction <em>Branch User Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.BranchUserAction
-	 * @generated
-	 */
-	public Adapter createBranchUserActionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall <em>Entry Level System Call</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall
-	 * @generated
-	 */
-	public Adapter createEntryLevelSystemCallAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting <em>Call Parameter Setting</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.workload.CallParameterSetting
-	 * @generated
-	 */
-	public Adapter createCallParameterSettingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.identifier.Identifier <em>Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.identifier.Identifier
-	 * @generated
-	 */
-	public Adapter createIdentifierAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.core.NamedElement <em>Named Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.core.NamedElement
-	 * @generated
-	 */
-	public Adapter createNamedElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.core.Entity <em>Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.core.Entity
-	 * @generated
-	 */
-	public Adapter createEntityAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //WorkloadAdapterFactory
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadSwitch.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadSwitch.java
deleted file mode 100644
index a0eb662d5abd26cf5e2f50967f1326df4d610ae0..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadSwitch.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.util;
-
-import edu.kit.ipd.descartes.core.Entity;
-import edu.kit.ipd.descartes.core.NamedElement;
-
-import edu.kit.ipd.descartes.identifier.Identifier;
-
-import edu.kit.ipd.descartes.mm.workload.*;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage
- * @generated
- */
-public class WorkloadSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static WorkloadPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadSwitch() {
-		if (modelPackage == null) {
-			modelPackage = WorkloadPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case WorkloadPackage.WORKLOAD: {
-				Workload workload = (Workload)theEObject;
-				T result = caseWorkload(workload);
-				if (result == null) result = caseEntity(workload);
-				if (result == null) result = caseIdentifier(workload);
-				if (result == null) result = caseNamedElement(workload);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.USAGE_SCENARIO: {
-				UsageScenario usageScenario = (UsageScenario)theEObject;
-				T result = caseUsageScenario(usageScenario);
-				if (result == null) result = caseEntity(usageScenario);
-				if (result == null) result = caseIdentifier(usageScenario);
-				if (result == null) result = caseNamedElement(usageScenario);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.SCENARIO_BEHAVIOR: {
-				ScenarioBehavior scenarioBehavior = (ScenarioBehavior)theEObject;
-				T result = caseScenarioBehavior(scenarioBehavior);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.WORKLOAD_TYPE: {
-				WorkloadType workloadType = (WorkloadType)theEObject;
-				T result = caseWorkloadType(workloadType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.OPEN_WORKLOAD_TYPE: {
-				OpenWorkloadType openWorkloadType = (OpenWorkloadType)theEObject;
-				T result = caseOpenWorkloadType(openWorkloadType);
-				if (result == null) result = caseWorkloadType(openWorkloadType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE: {
-				ClosedWorkloadType closedWorkloadType = (ClosedWorkloadType)theEObject;
-				T result = caseClosedWorkloadType(closedWorkloadType);
-				if (result == null) result = caseWorkloadType(closedWorkloadType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.ABSTRACT_USER_ACTION: {
-				AbstractUserAction abstractUserAction = (AbstractUserAction)theEObject;
-				T result = caseAbstractUserAction(abstractUserAction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.LOOP_USER_ACTION: {
-				LoopUserAction loopUserAction = (LoopUserAction)theEObject;
-				T result = caseLoopUserAction(loopUserAction);
-				if (result == null) result = caseAbstractUserAction(loopUserAction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.DELAY_USER_ACTION: {
-				DelayUserAction delayUserAction = (DelayUserAction)theEObject;
-				T result = caseDelayUserAction(delayUserAction);
-				if (result == null) result = caseAbstractUserAction(delayUserAction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.BRANCH_USER_ACTION: {
-				BranchUserAction branchUserAction = (BranchUserAction)theEObject;
-				T result = caseBranchUserAction(branchUserAction);
-				if (result == null) result = caseAbstractUserAction(branchUserAction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL: {
-				EntryLevelSystemCall entryLevelSystemCall = (EntryLevelSystemCall)theEObject;
-				T result = caseEntryLevelSystemCall(entryLevelSystemCall);
-				if (result == null) result = caseAbstractUserAction(entryLevelSystemCall);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case WorkloadPackage.CALL_PARAMETER_SETTING: {
-				CallParameterSetting callParameterSetting = (CallParameterSetting)theEObject;
-				T result = caseCallParameterSetting(callParameterSetting);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Workload</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Workload</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseWorkload(Workload object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Usage Scenario</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Usage Scenario</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseUsageScenario(UsageScenario object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Scenario Behavior</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Scenario Behavior</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseScenarioBehavior(ScenarioBehavior object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseWorkloadType(WorkloadType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Open Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Open Workload Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOpenWorkloadType(OpenWorkloadType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Closed Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Closed Workload Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseClosedWorkloadType(ClosedWorkloadType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract User Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract User Action</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractUserAction(AbstractUserAction object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Loop User Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Loop User Action</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLoopUserAction(LoopUserAction object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Delay User Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Delay User Action</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDelayUserAction(DelayUserAction object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Branch User Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Branch User Action</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBranchUserAction(BranchUserAction object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Entry Level System Call</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Entry Level System Call</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEntryLevelSystemCall(EntryLevelSystemCall object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Call Parameter Setting</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Call Parameter Setting</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCallParameterSetting(CallParameterSetting object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Identifier</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Identifier</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIdentifier(Identifier object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Named Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Named Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseNamedElement(NamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Entity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Entity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEntity(Entity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //WorkloadSwitch
diff --git a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadValidator.java b/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadValidator.java
deleted file mode 100644
index 241f63737530cc3be871e0853cb92ab93ed989dc..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload/src/edu/kit/ipd/descartes/mm/workload/util/WorkloadValidator.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.util;
-
-import edu.kit.ipd.descartes.identifier.util.IdentifierValidator;
-
-import edu.kit.ipd.descartes.mm.workload.*;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.EObjectValidator;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Validator</b> for the model.
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.workload.WorkloadPackage
- * @generated
- */
-public class WorkloadValidator extends EObjectValidator {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final WorkloadValidator INSTANCE = new WorkloadValidator();
-
-	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
-	 * @generated
-	 */
-	public static final String DIAGNOSTIC_SOURCE = "edu.kit.ipd.descartes.mm.workload";
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
-
-	/**
-	 * The cached base package validator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IdentifierValidator identifierValidator;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadValidator() {
-		super();
-		identifierValidator = IdentifierValidator.INSTANCE;
-	}
-
-	/**
-	 * Returns the package of this validator switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EPackage getEPackage() {
-	  return WorkloadPackage.eINSTANCE;
-	}
-
-	/**
-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		switch (classifierID) {
-			case WorkloadPackage.WORKLOAD:
-				return validateWorkload((Workload)value, diagnostics, context);
-			case WorkloadPackage.USAGE_SCENARIO:
-				return validateUsageScenario((UsageScenario)value, diagnostics, context);
-			case WorkloadPackage.SCENARIO_BEHAVIOR:
-				return validateScenarioBehavior((ScenarioBehavior)value, diagnostics, context);
-			case WorkloadPackage.WORKLOAD_TYPE:
-				return validateWorkloadType((WorkloadType)value, diagnostics, context);
-			case WorkloadPackage.OPEN_WORKLOAD_TYPE:
-				return validateOpenWorkloadType((OpenWorkloadType)value, diagnostics, context);
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE:
-				return validateClosedWorkloadType((ClosedWorkloadType)value, diagnostics, context);
-			case WorkloadPackage.ABSTRACT_USER_ACTION:
-				return validateAbstractUserAction((AbstractUserAction)value, diagnostics, context);
-			case WorkloadPackage.LOOP_USER_ACTION:
-				return validateLoopUserAction((LoopUserAction)value, diagnostics, context);
-			case WorkloadPackage.DELAY_USER_ACTION:
-				return validateDelayUserAction((DelayUserAction)value, diagnostics, context);
-			case WorkloadPackage.BRANCH_USER_ACTION:
-				return validateBranchUserAction((BranchUserAction)value, diagnostics, context);
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL:
-				return validateEntryLevelSystemCall((EntryLevelSystemCall)value, diagnostics, context);
-			case WorkloadPackage.CALL_PARAMETER_SETTING:
-				return validateCallParameterSetting((CallParameterSetting)value, diagnostics, context);
-			default:
-				return true;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkload(Workload workload, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(workload, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(workload, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(workload, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(workload, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(workload, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(workload, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(workload, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(workload, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(workload, diagnostics, context);
-		if (result || diagnostics != null) result &= identifierValidator.validateIdentifier_idHasToBeUnique(workload, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateUsageScenario(UsageScenario usageScenario, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(usageScenario, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(usageScenario, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(usageScenario, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(usageScenario, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(usageScenario, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(usageScenario, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(usageScenario, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(usageScenario, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(usageScenario, diagnostics, context);
-		if (result || diagnostics != null) result &= identifierValidator.validateIdentifier_idHasToBeUnique(usageScenario, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateScenarioBehavior(ScenarioBehavior scenarioBehavior, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(scenarioBehavior, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateWorkloadType(WorkloadType workloadType, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(workloadType, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOpenWorkloadType(OpenWorkloadType openWorkloadType, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(openWorkloadType, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(openWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(openWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(openWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(openWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(openWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(openWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(openWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(openWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validateOpenWorkloadType_interArrivalTimeInOpenWorkloadNeedsToBeSpecified(openWorkloadType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * The cached validation expression for the interArrivalTimeInOpenWorkloadNeedsToBeSpecified constraint of '<em>Open Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final String OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME_IN_OPEN_WORKLOAD_NEEDS_TO_BE_SPECIFIED__EEXPRESSION = "not self.interArrivalTime.oclIsUndefined() and not self.interArrivalTime.probFunction.oclIsUndefined()";
-
-	/**
-	 * Validates the interArrivalTimeInOpenWorkloadNeedsToBeSpecified constraint of '<em>Open Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateOpenWorkloadType_interArrivalTimeInOpenWorkloadNeedsToBeSpecified(OpenWorkloadType openWorkloadType, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			validate
-				(WorkloadPackage.Literals.OPEN_WORKLOAD_TYPE,
-				 openWorkloadType,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
-				 "interArrivalTimeInOpenWorkloadNeedsToBeSpecified",
-				 OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME_IN_OPEN_WORKLOAD_NEEDS_TO_BE_SPECIFIED__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DIAGNOSTIC_SOURCE,
-				 0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateClosedWorkloadType(ClosedWorkloadType closedWorkloadType, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(closedWorkloadType, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validateClosedWorkloadType_thinkTimeInClosedWorkloadNeedsToBeSpecified(closedWorkloadType, diagnostics, context);
-		if (result || diagnostics != null) result &= validateClosedWorkloadType_populationInClosedWorkloadNeedsToBeGreaterThanZero(closedWorkloadType, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * The cached validation expression for the thinkTimeInClosedWorkloadNeedsToBeSpecified constraint of '<em>Closed Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final String CLOSED_WORKLOAD_TYPE__THINK_TIME_IN_CLOSED_WORKLOAD_NEEDS_TO_BE_SPECIFIED__EEXPRESSION = "not self.thinkTime.oclIsUndefined() and not self.thinkTime.probFunction.oclIsUndefined()";
-
-	/**
-	 * Validates the thinkTimeInClosedWorkloadNeedsToBeSpecified constraint of '<em>Closed Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateClosedWorkloadType_thinkTimeInClosedWorkloadNeedsToBeSpecified(ClosedWorkloadType closedWorkloadType, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			validate
-				(WorkloadPackage.Literals.CLOSED_WORKLOAD_TYPE,
-				 closedWorkloadType,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
-				 "thinkTimeInClosedWorkloadNeedsToBeSpecified",
-				 CLOSED_WORKLOAD_TYPE__THINK_TIME_IN_CLOSED_WORKLOAD_NEEDS_TO_BE_SPECIFIED__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DIAGNOSTIC_SOURCE,
-				 0);
-	}
-
-	/**
-	 * The cached validation expression for the populationInClosedWorkloadNeedsToBeGreaterThanZero constraint of '<em>Closed Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final String CLOSED_WORKLOAD_TYPE__POPULATION_IN_CLOSED_WORKLOAD_NEEDS_TO_BE_GREATER_THAN_ZERO__EEXPRESSION = "self.population > 0";
-
-	/**
-	 * Validates the populationInClosedWorkloadNeedsToBeGreaterThanZero constraint of '<em>Closed Workload Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateClosedWorkloadType_populationInClosedWorkloadNeedsToBeGreaterThanZero(ClosedWorkloadType closedWorkloadType, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			validate
-				(WorkloadPackage.Literals.CLOSED_WORKLOAD_TYPE,
-				 closedWorkloadType,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
-				 "populationInClosedWorkloadNeedsToBeGreaterThanZero",
-				 CLOSED_WORKLOAD_TYPE__POPULATION_IN_CLOSED_WORKLOAD_NEEDS_TO_BE_GREATER_THAN_ZERO__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DIAGNOSTIC_SOURCE,
-				 0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateAbstractUserAction(AbstractUserAction abstractUserAction, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(abstractUserAction, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateLoopUserAction(LoopUserAction loopUserAction, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(loopUserAction, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDelayUserAction(DelayUserAction delayUserAction, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(delayUserAction, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateBranchUserAction(BranchUserAction branchUserAction, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(branchUserAction, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateEntryLevelSystemCall(EntryLevelSystemCall entryLevelSystemCall, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(entryLevelSystemCall, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateCallParameterSetting(CallParameterSetting callParameterSetting, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(callParameterSetting, diagnostics, context);
-	}
-
-	/**
-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		// TODO
-		// Specialize this to return a resource locator for messages specific to this validator.
-		// Ensure that you remove @generated or mark it @generated NOT
-		return super.getResourceLocator();
-	}
-
-} //WorkloadValidator