diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateBranchUserAction_branchUserProbabilities_RandomVariable.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateBranchUserAction_branchUserProbabilities_RandomVariable.gif
deleted file mode 100644
index 12d45aab7d83c0303e1a239db655e80d4a3872e2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateBranchUserAction_branchUserProbabilities_RandomVariable.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateBranchUserAction_branches_ScenarioBehavior.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateBranchUserAction_branches_ScenarioBehavior.gif
deleted file mode 100644
index 7adf9acc6d9973159ba8eb5c0162949cc73e05b4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateBranchUserAction_branches_ScenarioBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateEntryLevelSystemCall_inputParameterSettings_CallParameterSetting.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateEntryLevelSystemCall_inputParameterSettings_CallParameterSetting.gif
deleted file mode 100644
index c461d5746b920863218203fc45d6567271d14bcd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateEntryLevelSystemCall_inputParameterSettings_CallParameterSetting.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateLoopUserAction_loopBodyScenarioBehavior_ScenarioBehavior.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateLoopUserAction_loopBodyScenarioBehavior_ScenarioBehavior.gif
deleted file mode 100644
index f768689d3de81bb2be5fbe5aab1d1e727a97bffc..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateLoopUserAction_loopBodyScenarioBehavior_ScenarioBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_BranchUserAction.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_BranchUserAction.gif
deleted file mode 100644
index 1611c0c15443b0532e4233aa9f1fa6498ba9ab85..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_BranchUserAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_DelayUserAction.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_DelayUserAction.gif
deleted file mode 100644
index 98c2fa25c69c9e1016861b40e26b271e1edc4a95..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_DelayUserAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_EntryLevelSystemCall.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_EntryLevelSystemCall.gif
deleted file mode 100644
index e564f3f06e4e8b1614b63da4600b26598e84ec0d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_EntryLevelSystemCall.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_LoopUserAction.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_LoopUserAction.gif
deleted file mode 100644
index 4fc15c12ddf119e4ba484ae71c3f64d25b640526..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateScenarioBehavior_actions_LoopUserAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_scenarioBehavior_ScenarioBehavior.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_scenarioBehavior_ScenarioBehavior.gif
deleted file mode 100644
index c2326eff67c36937694a28717e53021d52f9fc72..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_scenarioBehavior_ScenarioBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_workloadType_ClosedWorkloadType.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_workloadType_ClosedWorkloadType.gif
deleted file mode 100644
index a674b69c27110f2fc17ff3f0cd277c7e415d8506..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_workloadType_ClosedWorkloadType.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_workloadType_OpenWorkloadType.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_workloadType_OpenWorkloadType.gif
deleted file mode 100644
index f4bffd128967482a53a248a94b8ae51da10ef745..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateUsageScenario_workloadType_OpenWorkloadType.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateWorkload_usageScenarios_UsageScenario.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateWorkload_usageScenarios_UsageScenario.gif
deleted file mode 100644
index e6a569287fbcd9c39e58303551fa064c4b09915c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/ctool16/CreateWorkload_usageScenarios_UsageScenario.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/BranchUserAction.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/BranchUserAction.gif
deleted file mode 100644
index 83afb9b3c9a3c3e261dd043d2232d39254ac8e4a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/BranchUserAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/CallParameterSetting.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/CallParameterSetting.gif
deleted file mode 100644
index 9250fecbffd185d174d53f6b7ea979f63ce222d2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/CallParameterSetting.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/ClosedWorkloadType.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/ClosedWorkloadType.gif
deleted file mode 100644
index 30f0c48da8d4450f7e94a696c4de0a7cc41aa728..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/ClosedWorkloadType.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/DelayUserAction.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/DelayUserAction.gif
deleted file mode 100644
index 90d10f9470787d1465c462197b85d1d3621f84e4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/DelayUserAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/EntryLevelSystemCall.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/EntryLevelSystemCall.gif
deleted file mode 100644
index 98b351f1c441775dfbe390577f2e534a4dcf07f9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/EntryLevelSystemCall.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/LoopUserAction.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/LoopUserAction.gif
deleted file mode 100644
index c673a5200a53ebd68c78c5cdb9d1bd4eaa855afb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/LoopUserAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/OpenWorkloadType.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/OpenWorkloadType.gif
deleted file mode 100644
index 10d222998af0a3a571390bae7e117c9964ec1562..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/OpenWorkloadType.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/ScenarioBehavior.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/ScenarioBehavior.gif
deleted file mode 100644
index 89ad5da38ab3060f14ba925b1251bd5cb8454012..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/ScenarioBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/UsageScenario.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/UsageScenario.gif
deleted file mode 100644
index 134551bff7eb3f0beb14a6c4a270a2a94f782ec5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/UsageScenario.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/Workload.gif b/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/Workload.gif
deleted file mode 100644
index be22463d2919f13a6345bad3166fc216c3f0942a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.workload.edit/icons/full/obj16/Workload.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/AbstractUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/AbstractUserActionItemProvider.java
deleted file mode 100644
index e58518336ba6f4b3cac316acebaa03bf13a0b18d..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/AbstractUserActionItemProvider.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.AbstractUserAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AbstractUserActionItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractUserActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_AbstractUserAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return WorkloadEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/BranchUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/BranchUserActionItemProvider.java
deleted file mode 100644
index c8d2de648aa5c1938c241f4531553fc1c5ab5611..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/BranchUserActionItemProvider.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-
-import edu.kit.ipd.descartes.mm.workload.BranchUserAction;
-import edu.kit.ipd.descartes.mm.workload.WorkloadFactory;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.BranchUserAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BranchUserActionItemProvider
-	extends AbstractUserActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BranchUserActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(WorkloadPackage.Literals.BRANCH_USER_ACTION__BRANCHES);
-			childrenFeatures.add(WorkloadPackage.Literals.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns BranchUserAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BranchUserAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_BranchUserAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BranchUserAction.class)) {
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCHES:
-			case WorkloadPackage.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.BRANCH_USER_ACTION__BRANCHES,
-				 WorkloadFactory.eINSTANCE.createScenarioBehavior()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.BRANCH_USER_ACTION__BRANCH_USER_PROBABILITIES,
-				 FunctionsFactory.eINSTANCE.createRandomVariable()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/CallParameterSettingItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/CallParameterSettingItemProvider.java
deleted file mode 100644
index b965304a9497c4c5048745d6d488d0389c2d902b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/CallParameterSettingItemProvider.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.mm.workload.CallParameterSetting;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CallParameterSettingItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CallParameterSettingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addCharacterizationPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CallParameterSetting_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CallParameterSetting_name_feature", "_UI_CallParameterSetting_type"),
-				 WorkloadPackage.Literals.CALL_PARAMETER_SETTING__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Characterization feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCharacterizationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CallParameterSetting_characterization_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CallParameterSetting_characterization_feature", "_UI_CallParameterSetting_type"),
-				 WorkloadPackage.Literals.CALL_PARAMETER_SETTING__CHARACTERIZATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CallParameterSetting_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CallParameterSetting_value_feature", "_UI_CallParameterSetting_type"),
-				 WorkloadPackage.Literals.CALL_PARAMETER_SETTING__VALUE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns CallParameterSetting.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CallParameterSetting"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CallParameterSetting)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CallParameterSetting_type") :
-			getString("_UI_CallParameterSetting_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CallParameterSetting.class)) {
-			case WorkloadPackage.CALL_PARAMETER_SETTING__NAME:
-			case WorkloadPackage.CALL_PARAMETER_SETTING__CHARACTERIZATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return WorkloadEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/ClosedWorkloadTypeItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/ClosedWorkloadTypeItemProvider.java
deleted file mode 100644
index 1b1dc59778355ac1105ca026650dc0eb7be4a336..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/ClosedWorkloadTypeItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.math.BigInteger;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ClosedWorkloadTypeItemProvider
-	extends WorkloadTypeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ClosedWorkloadTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPopulationPropertyDescriptor(object);
-			addThinkTimePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Population feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPopulationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ClosedWorkloadType_population_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ClosedWorkloadType_population_feature", "_UI_ClosedWorkloadType_type"),
-				 WorkloadPackage.Literals.CLOSED_WORKLOAD_TYPE__POPULATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Think Time feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addThinkTimePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ClosedWorkloadType_thinkTime_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ClosedWorkloadType_thinkTime_feature", "_UI_ClosedWorkloadType_type"),
-				 WorkloadPackage.Literals.CLOSED_WORKLOAD_TYPE__THINK_TIME,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ClosedWorkloadType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ClosedWorkloadType"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigInteger labelValue = ((ClosedWorkloadType)object).getPopulation();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ClosedWorkloadType_type") :
-			getString("_UI_ClosedWorkloadType_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ClosedWorkloadType.class)) {
-			case WorkloadPackage.CLOSED_WORKLOAD_TYPE__POPULATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/DelayUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/DelayUserActionItemProvider.java
deleted file mode 100644
index bf706f8faa5af8bb39a08783befa787010d53fa1..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/DelayUserActionItemProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.DelayUserAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DelayUserActionItemProvider
-	extends AbstractUserActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DelayUserActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTimeSpecificationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Time Specification feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTimeSpecificationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DelayUserAction_timeSpecification_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DelayUserAction_timeSpecification_feature", "_UI_DelayUserAction_type"),
-				 WorkloadPackage.Literals.DELAY_USER_ACTION__TIME_SPECIFICATION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns DelayUserAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DelayUserAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_DelayUserAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/EntryLevelSystemCallItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/EntryLevelSystemCallItemProvider.java
deleted file mode 100644
index 5ac78836e02860b79dea9a06afea5b9f31fb41a3..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/EntryLevelSystemCallItemProvider.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall;
-import edu.kit.ipd.descartes.mm.workload.WorkloadFactory;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EntryLevelSystemCallItemProvider
-	extends AbstractUserActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntryLevelSystemCallItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addProvidedRolePropertyDescriptor(object);
-			addSignaturePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Provided Role feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProvidedRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EntryLevelSystemCall_providedRole_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EntryLevelSystemCall_providedRole_feature", "_UI_EntryLevelSystemCall_type"),
-				 WorkloadPackage.Literals.ENTRY_LEVEL_SYSTEM_CALL__PROVIDED_ROLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Signature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSignaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EntryLevelSystemCall_signature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EntryLevelSystemCall_signature_feature", "_UI_EntryLevelSystemCall_type"),
-				 WorkloadPackage.Literals.ENTRY_LEVEL_SYSTEM_CALL__SIGNATURE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(WorkloadPackage.Literals.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns EntryLevelSystemCall.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EntryLevelSystemCall"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_EntryLevelSystemCall_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(EntryLevelSystemCall.class)) {
-			case WorkloadPackage.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.ENTRY_LEVEL_SYSTEM_CALL__INPUT_PARAMETER_SETTINGS,
-				 WorkloadFactory.eINSTANCE.createCallParameterSetting()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/LoopUserActionItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/LoopUserActionItemProvider.java
deleted file mode 100644
index 33da517b5d4051d827ae617aa1c6ddcbe327a8ac..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/LoopUserActionItemProvider.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.mm.workload.LoopUserAction;
-import edu.kit.ipd.descartes.mm.workload.WorkloadFactory;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.LoopUserAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LoopUserActionItemProvider
-	extends AbstractUserActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LoopUserActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLoopIterationCountDistributionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Loop Iteration Count Distribution feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLoopIterationCountDistributionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LoopUserAction_loopIterationCountDistribution_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LoopUserAction_loopIterationCountDistribution_feature", "_UI_LoopUserAction_type"),
-				 WorkloadPackage.Literals.LOOP_USER_ACTION__LOOP_ITERATION_COUNT_DISTRIBUTION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(WorkloadPackage.Literals.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns LoopUserAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LoopUserAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_LoopUserAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(LoopUserAction.class)) {
-			case WorkloadPackage.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.LOOP_USER_ACTION__LOOP_BODY_SCENARIO_BEHAVIOR,
-				 WorkloadFactory.eINSTANCE.createScenarioBehavior()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/OpenWorkloadTypeItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/OpenWorkloadTypeItemProvider.java
deleted file mode 100644
index e6e809a4a7ff6ddc926390b7125317f501a4c498..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/OpenWorkloadTypeItemProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.OpenWorkloadType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class OpenWorkloadTypeItemProvider
-	extends WorkloadTypeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OpenWorkloadTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addInterArrivalTimePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Inter Arrival Time feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addInterArrivalTimePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_OpenWorkloadType_interArrivalTime_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_OpenWorkloadType_interArrivalTime_feature", "_UI_OpenWorkloadType_type"),
-				 WorkloadPackage.Literals.OPEN_WORKLOAD_TYPE__INTER_ARRIVAL_TIME,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns OpenWorkloadType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OpenWorkloadType"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_OpenWorkloadType_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/ScenarioBehaviorItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/ScenarioBehaviorItemProvider.java
deleted file mode 100644
index c0f2c2609825e63394a498beaced0e07eba30255..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/ScenarioBehaviorItemProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.mm.workload.ScenarioBehavior;
-import edu.kit.ipd.descartes.mm.workload.WorkloadFactory;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ScenarioBehaviorItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ScenarioBehaviorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(WorkloadPackage.Literals.SCENARIO_BEHAVIOR__ACTIONS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ScenarioBehavior.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ScenarioBehavior"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ScenarioBehavior_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ScenarioBehavior.class)) {
-			case WorkloadPackage.SCENARIO_BEHAVIOR__ACTIONS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.SCENARIO_BEHAVIOR__ACTIONS,
-				 WorkloadFactory.eINSTANCE.createStartUserAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.SCENARIO_BEHAVIOR__ACTIONS,
-				 WorkloadFactory.eINSTANCE.createStopUserAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.SCENARIO_BEHAVIOR__ACTIONS,
-				 WorkloadFactory.eINSTANCE.createLoopUserAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.SCENARIO_BEHAVIOR__ACTIONS,
-				 WorkloadFactory.eINSTANCE.createDelayUserAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.SCENARIO_BEHAVIOR__ACTIONS,
-				 WorkloadFactory.eINSTANCE.createBranchUserAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.SCENARIO_BEHAVIOR__ACTIONS,
-				 WorkloadFactory.eINSTANCE.createEntryLevelSystemCall()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return WorkloadEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/UsageScenarioItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/UsageScenarioItemProvider.java
deleted file mode 100644
index 1b47d741ed5a52283fa0c13c205a9a019a1c7c5b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/UsageScenarioItemProvider.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.workload.UsageScenario;
-import edu.kit.ipd.descartes.mm.workload.WorkloadFactory;
-import edu.kit.ipd.descartes.mm.workload.WorkloadPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.UsageScenario} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class UsageScenarioItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UsageScenarioItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(WorkloadPackage.Literals.USAGE_SCENARIO__SCENARIO_BEHAVIOR);
-			childrenFeatures.add(WorkloadPackage.Literals.USAGE_SCENARIO__WORKLOAD_TYPE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns UsageScenario.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/UsageScenario"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((UsageScenario)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_UsageScenario_type") :
-			getString("_UI_UsageScenario_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(UsageScenario.class)) {
-			case WorkloadPackage.USAGE_SCENARIO__SCENARIO_BEHAVIOR:
-			case WorkloadPackage.USAGE_SCENARIO__WORKLOAD_TYPE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.USAGE_SCENARIO__SCENARIO_BEHAVIOR,
-				 WorkloadFactory.eINSTANCE.createScenarioBehavior()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.USAGE_SCENARIO__WORKLOAD_TYPE,
-				 WorkloadFactory.eINSTANCE.createOpenWorkloadType()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.USAGE_SCENARIO__WORKLOAD_TYPE,
-				 WorkloadFactory.eINSTANCE.createClosedWorkloadType()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return WorkloadEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadEditPlugin.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadEditPlugin.java
deleted file mode 100644
index e84907e375aa239897e78fc96876611c6ccd2016..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadEditPlugin.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-import edu.kit.ipd.descartes.core.provider.CoreEditPlugin;
-
-import edu.kit.ipd.descartes.identifier.provider.IdentifierEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Workload edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class WorkloadEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final WorkloadEditPlugin INSTANCE = new WorkloadEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadEditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		     ApplicationlevelEditPlugin.INSTANCE,
-		     CoreEditPlugin.INSTANCE,
-		     IdentifierEditPlugin.INSTANCE,
-		   });
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadItemProvider.java
deleted file mode 100644
index 4856f10248917e2519eca08779dbf6c4e913e7a9..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadItemProvider.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-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 java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.Workload} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkloadItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSystemPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the System feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSystemPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Workload_system_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Workload_system_feature", "_UI_Workload_type"),
-				 WorkloadPackage.Literals.WORKLOAD__SYSTEM,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(WorkloadPackage.Literals.WORKLOAD__USAGE_SCENARIOS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Workload.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Workload"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Workload)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Workload_type") :
-			getString("_UI_Workload_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Workload.class)) {
-			case WorkloadPackage.WORKLOAD__USAGE_SCENARIOS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(WorkloadPackage.Literals.WORKLOAD__USAGE_SCENARIOS,
-				 WorkloadFactory.eINSTANCE.createUsageScenario()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return WorkloadEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadItemProviderAdapterFactory.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadItemProviderAdapterFactory.java
deleted file mode 100644
index b858bc71cbb26cd6b4b205c43f7c12e1384348de..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-import edu.kit.ipd.descartes.mm.workload.util.WorkloadAdapterFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkloadItemProviderAdapterFactory extends WorkloadAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.Workload} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WorkloadItemProvider workloadItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.Workload}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createWorkloadAdapter() {
-		if (workloadItemProvider == null) {
-			workloadItemProvider = new WorkloadItemProvider(this);
-		}
-
-		return workloadItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.UsageScenario} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UsageScenarioItemProvider usageScenarioItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.UsageScenario}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createUsageScenarioAdapter() {
-		if (usageScenarioItemProvider == null) {
-			usageScenarioItemProvider = new UsageScenarioItemProvider(this);
-		}
-
-		return usageScenarioItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ScenarioBehaviorItemProvider scenarioBehaviorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.ScenarioBehavior}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createScenarioBehaviorAdapter() {
-		if (scenarioBehaviorItemProvider == null) {
-			scenarioBehaviorItemProvider = new ScenarioBehaviorItemProvider(this);
-		}
-
-		return scenarioBehaviorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.OpenWorkloadType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OpenWorkloadTypeItemProvider openWorkloadTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.OpenWorkloadType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createOpenWorkloadTypeAdapter() {
-		if (openWorkloadTypeItemProvider == null) {
-			openWorkloadTypeItemProvider = new OpenWorkloadTypeItemProvider(this);
-		}
-
-		return openWorkloadTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ClosedWorkloadTypeItemProvider closedWorkloadTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.ClosedWorkloadType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createClosedWorkloadTypeAdapter() {
-		if (closedWorkloadTypeItemProvider == null) {
-			closedWorkloadTypeItemProvider = new ClosedWorkloadTypeItemProvider(this);
-		}
-
-		return closedWorkloadTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.StartUserAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StartUserActionItemProvider startUserActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.StartUserAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createStartUserActionAdapter() {
-		if (startUserActionItemProvider == null) {
-			startUserActionItemProvider = new StartUserActionItemProvider(this);
-		}
-
-		return startUserActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.StopUserAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StopUserActionItemProvider stopUserActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.StopUserAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createStopUserActionAdapter() {
-		if (stopUserActionItemProvider == null) {
-			stopUserActionItemProvider = new StopUserActionItemProvider(this);
-		}
-
-		return stopUserActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.LoopUserAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LoopUserActionItemProvider loopUserActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.LoopUserAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLoopUserActionAdapter() {
-		if (loopUserActionItemProvider == null) {
-			loopUserActionItemProvider = new LoopUserActionItemProvider(this);
-		}
-
-		return loopUserActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.DelayUserAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DelayUserActionItemProvider delayUserActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.DelayUserAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDelayUserActionAdapter() {
-		if (delayUserActionItemProvider == null) {
-			delayUserActionItemProvider = new DelayUserActionItemProvider(this);
-		}
-
-		return delayUserActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.BranchUserAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BranchUserActionItemProvider branchUserActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.BranchUserAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBranchUserActionAdapter() {
-		if (branchUserActionItemProvider == null) {
-			branchUserActionItemProvider = new BranchUserActionItemProvider(this);
-		}
-
-		return branchUserActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EntryLevelSystemCallItemProvider entryLevelSystemCallItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.EntryLevelSystemCall}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createEntryLevelSystemCallAdapter() {
-		if (entryLevelSystemCallItemProvider == null) {
-			entryLevelSystemCallItemProvider = new EntryLevelSystemCallItemProvider(this);
-		}
-
-		return entryLevelSystemCallItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CallParameterSettingItemProvider callParameterSettingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.workload.CallParameterSetting}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCallParameterSettingAdapter() {
-		if (callParameterSettingItemProvider == null) {
-			callParameterSettingItemProvider = new CallParameterSettingItemProvider(this);
-		}
-
-		return callParameterSettingItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (workloadItemProvider != null) workloadItemProvider.dispose();
-		if (usageScenarioItemProvider != null) usageScenarioItemProvider.dispose();
-		if (scenarioBehaviorItemProvider != null) scenarioBehaviorItemProvider.dispose();
-		if (openWorkloadTypeItemProvider != null) openWorkloadTypeItemProvider.dispose();
-		if (closedWorkloadTypeItemProvider != null) closedWorkloadTypeItemProvider.dispose();
-		if (startUserActionItemProvider != null) startUserActionItemProvider.dispose();
-		if (stopUserActionItemProvider != null) stopUserActionItemProvider.dispose();
-		if (loopUserActionItemProvider != null) loopUserActionItemProvider.dispose();
-		if (delayUserActionItemProvider != null) delayUserActionItemProvider.dispose();
-		if (branchUserActionItemProvider != null) branchUserActionItemProvider.dispose();
-		if (entryLevelSystemCallItemProvider != null) entryLevelSystemCallItemProvider.dispose();
-		if (callParameterSettingItemProvider != null) callParameterSettingItemProvider.dispose();
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadTypeItemProvider.java b/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadTypeItemProvider.java
deleted file mode 100644
index b5b5d519f684b619f773ec8e29730e068980ff96..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.workload.edit/src/edu/kit/ipd/descartes/mm/workload/provider/WorkloadTypeItemProvider.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.workload.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.workload.WorkloadType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class WorkloadTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_WorkloadType_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return WorkloadEditPlugin.INSTANCE;
-	}
-
-}