diff --git a/edu.kit.ipd.descartes.mm.feature/feature.xml b/edu.kit.ipd.descartes.mm.feature/feature.xml
index 36d66b6425d71f830297b98a53795ee024dbe029..7467f7fe41022fe3a9f3f21aa052cdd9a8f9b486 100644
--- a/edu.kit.ipd.descartes.mm.feature/feature.xml
+++ b/edu.kit.ipd.descartes.mm.feature/feature.xml
@@ -144,13 +144,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="edu.kit.ipd.descartes.mm.predictionset"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="edu.kit.ipd.descartes.mm.resourcelandscape"
          download-size="0"
diff --git a/edu.kit.ipd.descartes.mm.predictionset/.classpath b/edu.kit.ipd.descartes.mm.predictionset/.classpath
deleted file mode 100644
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/edu.kit.ipd.descartes.mm.predictionset/.project b/edu.kit.ipd.descartes.mm.predictionset/.project
deleted file mode 100644
index 608e64d187327c47a635e41386bc7041bd2ce3e6..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>edu.kit.ipd.descartes.mm.predictionset</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/edu.kit.ipd.descartes.mm.predictionset/.settings/org.eclipse.jdt.core.prefs b/edu.kit.ipd.descartes.mm.predictionset/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b63063ce6052bdc49c5fd0745b078f162c90..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/edu.kit.ipd.descartes.mm.predictionset/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.predictionset/META-INF/MANIFEST.MF
deleted file mode 100644
index 90a54e609d8b35d1414fd678b20bb3bce35a76bf..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: edu.kit.ipd.descartes.mm.predictionset;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: edu.kit.ipd.descartes.mm.predictionset,
- edu.kit.ipd.descartes.mm.predictionset.impl,
- edu.kit.ipd.descartes.mm.predictionset.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- edu.kit.ipd.descartes.mm.applicationlevel;visibility:=reexport,
- edu.kit.ipd.descartes.core;visibility:=reexport,
- edu.kit.ipd.descartes.mm.deployment;visibility:=reexport,
- edu.kit.ipd.descartes.identifier;visibility:=reexport,
- edu.kit.ipd.descartes.mm.resourcelandscape;visibility:=reexport,
- edu.kit.ipd.descartes.mm.usageprofile;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/edu.kit.ipd.descartes.mm.predictionset/build.properties b/edu.kit.ipd.descartes.mm.predictionset/build.properties
deleted file mode 100644
index 9c36b4543433d302c3e41714c5fb8f62ddfb2cfa..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.ecore b/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.ecore
deleted file mode 100644
index ac62e60081d26fa357cfae600c3c6a34c3834d0d..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.ecore
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="predictionset" nsURI="http://www.descartes-research.net/metamodel/predictionset/0.1"
-    nsPrefix="predictionset">
-  <eAnnotations source="http://www.eclipse.org/OCL/Import">
-    <details key="deployment_0" value="../../edu.kit.ipd.descartes.mm.deployment/model/deployment.ecore#/"/>
-    <details key="ecore_0" value="http://www.eclipse.org/emf/2002/Ecore"/>
-    <details key="probes_0" value="../../edu.kit.ipd.descartes.solving.probes/model/probes.ecore#/"/>
-    <details key="repository_0" value="../../edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore#/"/>
-    <details key="resourcelandscape_0" value="../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore#/"/>
-    <details key="system_0" value="../../edu.kit.ipd.descartes.mm.applicationlevel/model/system.ecore#/"/>
-    <details key="usageprofile_0" value="../../edu.kit.ipd.descartes.mm.usageprofile/model/usageprofile.ecore#/"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
-    <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
-    <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="PredictionSet">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-      <details key="constraints" value="SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-      <details key="SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame"
-          value="&#xA;&#x9;&#x9;&#x9;systemModel = deploymentModel.system"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="usageprofileModel" lowerBound="1"
-        eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.usageprofile/model/usageprofile.ecore#//UsageProfile"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deploymentModel" lowerBound="1"
-        eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.deployment/model/deployment.ecore#//Deployment"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="systemModel" ordered="false"
-        upperBound="-1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/system.ecore#//System"
-        derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-        <details key="derivation" value="usageprofileModel.system"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="repositoryModel" ordered="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore#//Repository"
-        derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-        <details key="derivation" value="systemModel->collect(r | system_0::System::assemblyContexts.encapsulatedComponent.repository)->asSet()"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resourcelandscapeModel"
-        lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore#//DistributedDataCenter"
-        derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-        <details key="derivation" value="deploymentModel.targetResourceLandscape"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.ecore.oclinecore b/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.ecore.oclinecore
deleted file mode 100644
index c9b078e92bb414f973c22e5de06b8337a55c0ed0..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.ecore.oclinecore
+++ /dev/null
@@ -1,33 +0,0 @@
-module _'predictionset.ecore'
-
-import ecore_0 : 'http://www.eclipse.org/emf/2002/Ecore#/';
-import usageprofile_0 : '../../edu.kit.ipd.descartes.mm.usageprofile/model/usageprofile.ecore#/';
-import deployment_0 : '../../edu.kit.ipd.descartes.mm.deployment/model/deployment.ecore#/';
-import probes_0 : '../../edu.kit.ipd.descartes.solving.probes/model/probes.ecore#/';
-import system_0 : '../../edu.kit.ipd.descartes.mm.applicationlevel/model/system.ecore#/';
-import repository_0 : '../../edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore#/';
-import resourcelandscape_0 : '../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore#/';
-
-package predictionset : predictionset = 'http://www.descartes-research.net/metamodel/predictionset/0.1'
-{
-	class PredictionSet {
-		invariant SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame : 
-			systemModel = deploymentModel.system;
-
-		property usageprofileModel : usageprofile_0::UsageProfile[1];
-		property deploymentModel : deployment_0::Deployment[1];
-				
-		property systemModel : system_0::System[*] {derived}
-		{
-			derivation: usageprofileModel.system;	
-		}
-		property repositoryModel : repository_0::Repository[1..*] {derived}
-		{
-			derivation: systemModel->collect(r | system_0::System::assemblyContexts.encapsulatedComponent.repository)->asSet();
-		}
-		property resourcelandscapeModel : resourcelandscape_0::DistributedDataCenter[1] {derived}
-		{
-			derivation: deploymentModel.targetResourceLandscape;		
-		}
-	}
-}
\ No newline at end of file
diff --git a/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.genmodel b/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.genmodel
deleted file mode 100644
index c0c62e004c739e2d0c3b890d04ca2144a55f9d2b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/model/predictionset.genmodel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT"
-    modelDirectory="/edu.kit.ipd.descartes.mm.predictionset/src" modelPluginID="edu.kit.ipd.descartes.mm.predictionset"
-    modelName="PredictionSet" editPluginClass="edu.kit.ipd.descartes.mm.predictionset.provider.PredictionSetEditPlugin"
-    editorPluginClass="edu.kit.ipd.descartes.mm.predictionset.presentation.PredictionSetEditorPlugin"
-    testSuiteClass="edu.kit.ipd.descartes.mm.predictionset.tests.PredictionSetAllTests"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    usedGenPackages="../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//functions ../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//parameterdependencies ../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//repository ../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//servicebehavior ../../edu.kit.ipd.descartes.mm.applicationlevel/model/applicationlevel.genmodel#//system ../../edu.kit.ipd.descartes.core/model/core.genmodel#//core ../../edu.kit.ipd.descartes.mm.deployment/model/deployment.genmodel#//deployment ../../edu.kit.ipd.descartes.identifier/model/identifier.genmodel#//identifier ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.genmodel#//resourcelandscape ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.genmodel#//resourceconfiguration ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.genmodel#//containerrepository ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.genmodel#//runtimeenvironmentclasses ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.genmodel#//resourcetype ../../edu.kit.ipd.descartes.mm.usageprofile/model/usageprofile.genmodel#//usageprofile">
-  <foreignModel>predictionset.ecore</foreignModel>
-  <genPackages prefix="PredictionSet" basePackage="edu.kit.ipd.descartes.mm" disposableProviderFactory="true"
-      ecorePackage="predictionset.ecore#/">
-    <genClasses ecoreClass="predictionset.ecore#//PredictionSet">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference predictionset.ecore#//PredictionSet/usageprofileModel"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference predictionset.ecore#//PredictionSet/deploymentModel"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference predictionset.ecore#//PredictionSet/systemModel"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference predictionset.ecore#//PredictionSet/repositoryModel"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference predictionset.ecore#//PredictionSet/resourcelandscapeModel"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/edu.kit.ipd.descartes.mm.predictionset/plugin.properties b/edu.kit.ipd.descartes.mm.predictionset/plugin.properties
deleted file mode 100644
index 96d7314acb5bae364a44108356b5103e99897980..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
-
-pluginName = dmmpredictionset Model
-providerName = www.example.org
diff --git a/edu.kit.ipd.descartes.mm.predictionset/plugin.xml b/edu.kit.ipd.descartes.mm.predictionset/plugin.xml
deleted file mode 100644
index db0cc8348d08417380ea55cedda5079b0c4ed536..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.descartes-research.net/metamodel/predictionset/0.1"
-            class="edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage"
-            genModel="model/predictionset.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/edu.kit.ipd.descartes.mm.predictionset/pom.xml b/edu.kit.ipd.descartes.mm.predictionset/pom.xml
deleted file mode 100644
index 22af0e6720b85e6e48e695e0122e1aa1492dedc4..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>edu.kit.ipd.descartes.mm.predictionset</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  
-  <parent>
-  	<groupId>edu.kit.ipd.descartes.dml.mm</groupId>
-  	<artifactId>dml-mm</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSet.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSet.java
deleted file mode 100644
index 4fac9d7def24575dc010ff413bdf9030eaba2435..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSet.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
-
-import edu.kit.ipd.descartes.mm.deployment.Deployment;
-
-import edu.kit.ipd.descartes.mm.resourcelandscape.DistributedDataCenter;
-
-import edu.kit.ipd.descartes.mm.usageprofile.UsageProfile;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prediction Set</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getUsageprofileModel <em>Usageprofile Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getDeploymentModel <em>Deployment Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getSystemModel <em>System Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getRepositoryModel <em>Repository Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getResourcelandscapeModel <em>Resourcelandscape Model</em>}</li>
- * </ul>
- * </p>
- *
- * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage#getPredictionSet()
- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame'"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame='\n\t\t\tsystemModel = deploymentModel.system'"
- * @generated
- */
-public interface PredictionSet extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Usageprofile Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Usageprofile Model</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Usageprofile Model</em>' reference.
-	 * @see #setUsageprofileModel(UsageProfile)
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage#getPredictionSet_UsageprofileModel()
-	 * @model required="true"
-	 * @generated
-	 */
-	UsageProfile getUsageprofileModel();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getUsageprofileModel <em>Usageprofile Model</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usageprofile Model</em>' reference.
-	 * @see #getUsageprofileModel()
-	 * @generated
-	 */
-	void setUsageprofileModel(UsageProfile value);
-
-	/**
-	 * Returns the value of the '<em><b>Deployment Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Deployment Model</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Deployment Model</em>' reference.
-	 * @see #setDeploymentModel(Deployment)
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage#getPredictionSet_DeploymentModel()
-	 * @model required="true"
-	 * @generated
-	 */
-	Deployment getDeploymentModel();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getDeploymentModel <em>Deployment Model</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Deployment Model</em>' reference.
-	 * @see #getDeploymentModel()
-	 * @generated
-	 */
-	void setDeploymentModel(Deployment value);
-
-	/**
-	 * Returns the value of the '<em><b>System Model</b></em>' reference list.
-	 * The list contents are of type {@link edu.kit.ipd.descartes.mm.applicationlevel.system.System}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>System Model</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>System Model</em>' reference list.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage#getPredictionSet_SystemModel()
-	 * @model derived="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='usageprofileModel.system'"
-	 * @generated
-	 */
-	EList<edu.kit.ipd.descartes.mm.applicationlevel.system.System> getSystemModel();
-
-	/**
-	 * Returns the value of the '<em><b>Repository Model</b></em>' reference list.
-	 * The list contents are of type {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Repository Model</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Repository Model</em>' reference list.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage#getPredictionSet_RepositoryModel()
-	 * @model required="true" derived="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='systemModel->collect(r | system_0::System::assemblyContexts.encapsulatedComponent.repository)->asSet()'"
-	 * @generated
-	 */
-	EList<Repository> getRepositoryModel();
-
-	/**
-	 * Returns the value of the '<em><b>Resourcelandscape Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resourcelandscape Model</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resourcelandscape Model</em>' reference.
-	 * @see #setResourcelandscapeModel(DistributedDataCenter)
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage#getPredictionSet_ResourcelandscapeModel()
-	 * @model required="true" derived="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='deploymentModel.targetResourceLandscape'"
-	 * @generated
-	 */
-	DistributedDataCenter getResourcelandscapeModel();
-
-	/**
-	 * Sets the value of the '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getResourcelandscapeModel <em>Resourcelandscape Model</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resourcelandscape Model</em>' reference.
-	 * @see #getResourcelandscapeModel()
-	 * @generated
-	 */
-	void setResourcelandscapeModel(DistributedDataCenter value);
-
-} // PredictionSet
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSetFactory.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSetFactory.java
deleted file mode 100644
index bbccf1739b0e1f9de4d4144bfa3e558a9e6979b0..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSetFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage
- * @generated
- */
-public interface PredictionSetFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PredictionSetFactory eINSTANCE = edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Prediction Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Prediction Set</em>'.
-	 * @generated
-	 */
-	PredictionSet createPredictionSet();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	PredictionSetPackage getPredictionSetPackage();
-
-} //PredictionSetFactory
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSetPackage.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSetPackage.java
deleted file mode 100644
index 74c46d868f28ebf9de828c3db54f810b33482881..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/PredictionSetPackage.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/OCL/Import deployment_0='../../edu.kit.ipd.descartes.mm.deployment/model/deployment.ecore#/' ecore_0='http://www.eclipse.org/emf/2002/Ecore' probes_0='../../edu.kit.ipd.descartes.solving.probes/model/probes.ecore#/' repository_0='../../edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore#/' resourcelandscape_0='../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore#/' system_0='../../edu.kit.ipd.descartes.mm.applicationlevel/model/system.ecore#/' usageprofile_0='../../edu.kit.ipd.descartes.mm.usageprofile/model/usageprofile.ecore#/'"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"
- * @generated
- */
-public interface PredictionSetPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "predictionset";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.descartes-research.net/metamodel/predictionset/0.1";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "predictionset";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PredictionSetPackage eINSTANCE = edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl <em>Prediction Set</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl
-	 * @see edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetPackageImpl#getPredictionSet()
-	 * @generated
-	 */
-	int PREDICTION_SET = 0;
-
-	/**
-	 * The feature id for the '<em><b>Usageprofile Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION_SET__USAGEPROFILE_MODEL = 0;
-
-	/**
-	 * The feature id for the '<em><b>Deployment Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION_SET__DEPLOYMENT_MODEL = 1;
-
-	/**
-	 * The feature id for the '<em><b>System Model</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION_SET__SYSTEM_MODEL = 2;
-
-	/**
-	 * The feature id for the '<em><b>Repository Model</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION_SET__REPOSITORY_MODEL = 3;
-
-	/**
-	 * The feature id for the '<em><b>Resourcelandscape Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION_SET__RESOURCELANDSCAPE_MODEL = 4;
-
-	/**
-	 * The number of structural features of the '<em>Prediction Set</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION_SET_FEATURE_COUNT = 5;
-
-
-	/**
-	 * Returns the meta object for class '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet <em>Prediction Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Prediction Set</em>'.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSet
-	 * @generated
-	 */
-	EClass getPredictionSet();
-
-	/**
-	 * Returns the meta object for the reference '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getUsageprofileModel <em>Usageprofile Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Usageprofile Model</em>'.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getUsageprofileModel()
-	 * @see #getPredictionSet()
-	 * @generated
-	 */
-	EReference getPredictionSet_UsageprofileModel();
-
-	/**
-	 * Returns the meta object for the reference '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getDeploymentModel <em>Deployment Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Deployment Model</em>'.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getDeploymentModel()
-	 * @see #getPredictionSet()
-	 * @generated
-	 */
-	EReference getPredictionSet_DeploymentModel();
-
-	/**
-	 * Returns the meta object for the reference list '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getSystemModel <em>System Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>System Model</em>'.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getSystemModel()
-	 * @see #getPredictionSet()
-	 * @generated
-	 */
-	EReference getPredictionSet_SystemModel();
-
-	/**
-	 * Returns the meta object for the reference list '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getRepositoryModel <em>Repository Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Repository Model</em>'.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getRepositoryModel()
-	 * @see #getPredictionSet()
-	 * @generated
-	 */
-	EReference getPredictionSet_RepositoryModel();
-
-	/**
-	 * Returns the meta object for the reference '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getResourcelandscapeModel <em>Resourcelandscape Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Resourcelandscape Model</em>'.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSet#getResourcelandscapeModel()
-	 * @see #getPredictionSet()
-	 * @generated
-	 */
-	EReference getPredictionSet_ResourcelandscapeModel();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	PredictionSetFactory getPredictionSetFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl <em>Prediction Set</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl
-		 * @see edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetPackageImpl#getPredictionSet()
-		 * @generated
-		 */
-		EClass PREDICTION_SET = eINSTANCE.getPredictionSet();
-
-		/**
-		 * The meta object literal for the '<em><b>Usageprofile Model</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION_SET__USAGEPROFILE_MODEL = eINSTANCE.getPredictionSet_UsageprofileModel();
-
-		/**
-		 * The meta object literal for the '<em><b>Deployment Model</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION_SET__DEPLOYMENT_MODEL = eINSTANCE.getPredictionSet_DeploymentModel();
-
-		/**
-		 * The meta object literal for the '<em><b>System Model</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION_SET__SYSTEM_MODEL = eINSTANCE.getPredictionSet_SystemModel();
-
-		/**
-		 * The meta object literal for the '<em><b>Repository Model</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION_SET__REPOSITORY_MODEL = eINSTANCE.getPredictionSet_RepositoryModel();
-
-		/**
-		 * The meta object literal for the '<em><b>Resourcelandscape Model</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION_SET__RESOURCELANDSCAPE_MODEL = eINSTANCE.getPredictionSet_ResourcelandscapeModel();
-
-	}
-
-} //PredictionSetPackage
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetFactoryImpl.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetFactoryImpl.java
deleted file mode 100644
index 26c84af4a926cad4c8aad8dc75295b1b281082f1..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetFactoryImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset.impl;
-
-import edu.kit.ipd.descartes.mm.predictionset.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PredictionSetFactoryImpl extends EFactoryImpl implements PredictionSetFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PredictionSetFactory init() {
-		try {
-			PredictionSetFactory thePredictionSetFactory = (PredictionSetFactory)EPackage.Registry.INSTANCE.getEFactory(PredictionSetPackage.eNS_URI);
-			if (thePredictionSetFactory != null) {
-				return thePredictionSetFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new PredictionSetFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredictionSetFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case PredictionSetPackage.PREDICTION_SET: return createPredictionSet();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredictionSet createPredictionSet() {
-		PredictionSetImpl predictionSet = new PredictionSetImpl();
-		return predictionSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredictionSetPackage getPredictionSetPackage() {
-		return (PredictionSetPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static PredictionSetPackage getPackage() {
-		return PredictionSetPackage.eINSTANCE;
-	}
-
-} //PredictionSetFactoryImpl
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetImpl.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetImpl.java
deleted file mode 100644
index 676d03bf0a78856433d949585f3323c7f0e0d666..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetImpl.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
-
-import edu.kit.ipd.descartes.mm.deployment.Deployment;
-
-import edu.kit.ipd.descartes.mm.predictionset.PredictionSet;
-import edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage;
-
-import edu.kit.ipd.descartes.mm.resourcelandscape.DistributedDataCenter;
-
-import edu.kit.ipd.descartes.mm.usageprofile.UsageProfile;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Prediction Set</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl#getUsageprofileModel <em>Usageprofile Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl#getDeploymentModel <em>Deployment Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl#getSystemModel <em>System Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl#getRepositoryModel <em>Repository Model</em>}</li>
- *   <li>{@link edu.kit.ipd.descartes.mm.predictionset.impl.PredictionSetImpl#getResourcelandscapeModel <em>Resourcelandscape Model</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PredictionSetImpl extends EObjectImpl implements PredictionSet {
-	/**
-	 * The cached value of the '{@link #getUsageprofileModel() <em>Usageprofile Model</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsageprofileModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected UsageProfile usageprofileModel;
-
-	/**
-	 * The cached value of the '{@link #getDeploymentModel() <em>Deployment Model</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeploymentModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected Deployment deploymentModel;
-
-	/**
-	 * The cached setting delegate for the '{@link #getSystemModel() <em>System Model</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSystemModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature.Internal.SettingDelegate SYSTEM_MODEL__ESETTING_DELEGATE = ((EStructuralFeature.Internal)PredictionSetPackage.Literals.PREDICTION_SET__SYSTEM_MODEL).getSettingDelegate();
-
-	/**
-	 * The cached setting delegate for the '{@link #getRepositoryModel() <em>Repository Model</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepositoryModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature.Internal.SettingDelegate REPOSITORY_MODEL__ESETTING_DELEGATE = ((EStructuralFeature.Internal)PredictionSetPackage.Literals.PREDICTION_SET__REPOSITORY_MODEL).getSettingDelegate();
-
-	/**
-	 * The cached setting delegate for the '{@link #getResourcelandscapeModel() <em>Resourcelandscape Model</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourcelandscapeModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature.Internal.SettingDelegate RESOURCELANDSCAPE_MODEL__ESETTING_DELEGATE = ((EStructuralFeature.Internal)PredictionSetPackage.Literals.PREDICTION_SET__RESOURCELANDSCAPE_MODEL).getSettingDelegate();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredictionSetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PredictionSetPackage.Literals.PREDICTION_SET;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UsageProfile getUsageprofileModel() {
-		if (usageprofileModel != null && usageprofileModel.eIsProxy()) {
-			InternalEObject oldUsageprofileModel = (InternalEObject)usageprofileModel;
-			usageprofileModel = (UsageProfile)eResolveProxy(oldUsageprofileModel);
-			if (usageprofileModel != oldUsageprofileModel) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PredictionSetPackage.PREDICTION_SET__USAGEPROFILE_MODEL, oldUsageprofileModel, usageprofileModel));
-			}
-		}
-		return usageprofileModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UsageProfile basicGetUsageprofileModel() {
-		return usageprofileModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsageprofileModel(UsageProfile newUsageprofileModel) {
-		UsageProfile oldUsageprofileModel = usageprofileModel;
-		usageprofileModel = newUsageprofileModel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredictionSetPackage.PREDICTION_SET__USAGEPROFILE_MODEL, oldUsageprofileModel, usageprofileModel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Deployment getDeploymentModel() {
-		if (deploymentModel != null && deploymentModel.eIsProxy()) {
-			InternalEObject oldDeploymentModel = (InternalEObject)deploymentModel;
-			deploymentModel = (Deployment)eResolveProxy(oldDeploymentModel);
-			if (deploymentModel != oldDeploymentModel) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PredictionSetPackage.PREDICTION_SET__DEPLOYMENT_MODEL, oldDeploymentModel, deploymentModel));
-			}
-		}
-		return deploymentModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Deployment basicGetDeploymentModel() {
-		return deploymentModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDeploymentModel(Deployment newDeploymentModel) {
-		Deployment oldDeploymentModel = deploymentModel;
-		deploymentModel = newDeploymentModel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PredictionSetPackage.PREDICTION_SET__DEPLOYMENT_MODEL, oldDeploymentModel, deploymentModel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public EList<edu.kit.ipd.descartes.mm.applicationlevel.system.System> getSystemModel() {
-		return (EList<edu.kit.ipd.descartes.mm.applicationlevel.system.System>)SYSTEM_MODEL__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public EList<Repository> getRepositoryModel() {
-		return (EList<Repository>)REPOSITORY_MODEL__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DistributedDataCenter getResourcelandscapeModel() {
-		return (DistributedDataCenter)RESOURCELANDSCAPE_MODEL__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DistributedDataCenter basicGetResourcelandscapeModel() {
-		return (DistributedDataCenter)RESOURCELANDSCAPE_MODEL__ESETTING_DELEGATE.dynamicGet(this, null, 0, false, false);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResourcelandscapeModel(DistributedDataCenter newResourcelandscapeModel) {
-		RESOURCELANDSCAPE_MODEL__ESETTING_DELEGATE.dynamicSet(this, null, 0, newResourcelandscapeModel);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PredictionSetPackage.PREDICTION_SET__USAGEPROFILE_MODEL:
-				if (resolve) return getUsageprofileModel();
-				return basicGetUsageprofileModel();
-			case PredictionSetPackage.PREDICTION_SET__DEPLOYMENT_MODEL:
-				if (resolve) return getDeploymentModel();
-				return basicGetDeploymentModel();
-			case PredictionSetPackage.PREDICTION_SET__SYSTEM_MODEL:
-				return getSystemModel();
-			case PredictionSetPackage.PREDICTION_SET__REPOSITORY_MODEL:
-				return getRepositoryModel();
-			case PredictionSetPackage.PREDICTION_SET__RESOURCELANDSCAPE_MODEL:
-				if (resolve) return getResourcelandscapeModel();
-				return basicGetResourcelandscapeModel();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PredictionSetPackage.PREDICTION_SET__USAGEPROFILE_MODEL:
-				setUsageprofileModel((UsageProfile)newValue);
-				return;
-			case PredictionSetPackage.PREDICTION_SET__DEPLOYMENT_MODEL:
-				setDeploymentModel((Deployment)newValue);
-				return;
-			case PredictionSetPackage.PREDICTION_SET__SYSTEM_MODEL:
-				getSystemModel().clear();
-				getSystemModel().addAll((Collection<? extends edu.kit.ipd.descartes.mm.applicationlevel.system.System>)newValue);
-				return;
-			case PredictionSetPackage.PREDICTION_SET__REPOSITORY_MODEL:
-				getRepositoryModel().clear();
-				getRepositoryModel().addAll((Collection<? extends Repository>)newValue);
-				return;
-			case PredictionSetPackage.PREDICTION_SET__RESOURCELANDSCAPE_MODEL:
-				setResourcelandscapeModel((DistributedDataCenter)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PredictionSetPackage.PREDICTION_SET__USAGEPROFILE_MODEL:
-				setUsageprofileModel((UsageProfile)null);
-				return;
-			case PredictionSetPackage.PREDICTION_SET__DEPLOYMENT_MODEL:
-				setDeploymentModel((Deployment)null);
-				return;
-			case PredictionSetPackage.PREDICTION_SET__SYSTEM_MODEL:
-				getSystemModel().clear();
-				return;
-			case PredictionSetPackage.PREDICTION_SET__REPOSITORY_MODEL:
-				getRepositoryModel().clear();
-				return;
-			case PredictionSetPackage.PREDICTION_SET__RESOURCELANDSCAPE_MODEL:
-				setResourcelandscapeModel((DistributedDataCenter)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PredictionSetPackage.PREDICTION_SET__USAGEPROFILE_MODEL:
-				return usageprofileModel != null;
-			case PredictionSetPackage.PREDICTION_SET__DEPLOYMENT_MODEL:
-				return deploymentModel != null;
-			case PredictionSetPackage.PREDICTION_SET__SYSTEM_MODEL:
-				return SYSTEM_MODEL__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
-			case PredictionSetPackage.PREDICTION_SET__REPOSITORY_MODEL:
-				return REPOSITORY_MODEL__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
-			case PredictionSetPackage.PREDICTION_SET__RESOURCELANDSCAPE_MODEL:
-				return RESOURCELANDSCAPE_MODEL__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PredictionSetImpl
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetPackageImpl.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetPackageImpl.java
deleted file mode 100644
index 9763c2b6e33ca4e7ce71743d37f5da4fef14674b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/impl/PredictionSetPackageImpl.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset.impl;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.system.SystemPackage;
-
-import edu.kit.ipd.descartes.mm.deployment.DeploymentPackage;
-
-import edu.kit.ipd.descartes.mm.predictionset.PredictionSet;
-import edu.kit.ipd.descartes.mm.predictionset.PredictionSetFactory;
-import edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage;
-
-import edu.kit.ipd.descartes.mm.predictionset.util.PredictionSetValidator;
-
-import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapePackage;
-
-import edu.kit.ipd.descartes.mm.usageprofile.UsageProfilePackage;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PredictionSetPackageImpl extends EPackageImpl implements PredictionSetPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass predictionSetEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private PredictionSetPackageImpl() {
-		super(eNS_URI, PredictionSetFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link PredictionSetPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static PredictionSetPackage init() {
-		if (isInited) return (PredictionSetPackage)EPackage.Registry.INSTANCE.getEPackage(PredictionSetPackage.eNS_URI);
-
-		// Obtain or create and register package
-		PredictionSetPackageImpl thePredictionSetPackage = (PredictionSetPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PredictionSetPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PredictionSetPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		DeploymentPackage.eINSTANCE.eClass();
-		UsageProfilePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		thePredictionSetPackage.createPackageContents();
-
-		// Initialize created meta-data
-		thePredictionSetPackage.initializePackageContents();
-
-		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(thePredictionSetPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return PredictionSetValidator.INSTANCE;
-				 }
-			 });
-
-		// Mark meta-data to indicate it can't be changed
-		thePredictionSetPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(PredictionSetPackage.eNS_URI, thePredictionSetPackage);
-		return thePredictionSetPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPredictionSet() {
-		return predictionSetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPredictionSet_UsageprofileModel() {
-		return (EReference)predictionSetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPredictionSet_DeploymentModel() {
-		return (EReference)predictionSetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPredictionSet_SystemModel() {
-		return (EReference)predictionSetEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPredictionSet_RepositoryModel() {
-		return (EReference)predictionSetEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPredictionSet_ResourcelandscapeModel() {
-		return (EReference)predictionSetEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredictionSetFactory getPredictionSetFactory() {
-		return (PredictionSetFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		predictionSetEClass = createEClass(PREDICTION_SET);
-		createEReference(predictionSetEClass, PREDICTION_SET__USAGEPROFILE_MODEL);
-		createEReference(predictionSetEClass, PREDICTION_SET__DEPLOYMENT_MODEL);
-		createEReference(predictionSetEClass, PREDICTION_SET__SYSTEM_MODEL);
-		createEReference(predictionSetEClass, PREDICTION_SET__REPOSITORY_MODEL);
-		createEReference(predictionSetEClass, PREDICTION_SET__RESOURCELANDSCAPE_MODEL);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		UsageProfilePackage theUsageProfilePackage = (UsageProfilePackage)EPackage.Registry.INSTANCE.getEPackage(UsageProfilePackage.eNS_URI);
-		DeploymentPackage theDeploymentPackage = (DeploymentPackage)EPackage.Registry.INSTANCE.getEPackage(DeploymentPackage.eNS_URI);
-		SystemPackage theSystemPackage = (SystemPackage)EPackage.Registry.INSTANCE.getEPackage(SystemPackage.eNS_URI);
-		RepositoryPackage theRepositoryPackage = (RepositoryPackage)EPackage.Registry.INSTANCE.getEPackage(RepositoryPackage.eNS_URI);
-		ResourcelandscapePackage theResourcelandscapePackage = (ResourcelandscapePackage)EPackage.Registry.INSTANCE.getEPackage(ResourcelandscapePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(predictionSetEClass, PredictionSet.class, "PredictionSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPredictionSet_UsageprofileModel(), theUsageProfilePackage.getUsageProfile(), null, "usageprofileModel", null, 1, 1, PredictionSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPredictionSet_DeploymentModel(), theDeploymentPackage.getDeployment(), null, "deploymentModel", null, 1, 1, PredictionSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPredictionSet_SystemModel(), theSystemPackage.getSystem(), null, "systemModel", null, 0, -1, PredictionSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getPredictionSet_RepositoryModel(), theRepositoryPackage.getRepository(), null, "repositoryModel", null, 1, -1, PredictionSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getPredictionSet_ResourcelandscapeModel(), theResourcelandscapePackage.getDistributedDataCenter(), null, "resourcelandscapeModel", null, 1, 1, PredictionSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/OCL/Import
-		createImportAnnotations();
-		// http://www.eclipse.org/emf/2002/Ecore
-		createEcoreAnnotations();
-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot
-		createPivotAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/OCL/Import</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createImportAnnotations() {
-		String source = "http://www.eclipse.org/OCL/Import";	
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "deployment_0", "../../edu.kit.ipd.descartes.mm.deployment/model/deployment.ecore#/",
-			 "ecore_0", "http://www.eclipse.org/emf/2002/Ecore",
-			 "probes_0", "../../edu.kit.ipd.descartes.solving.probes/model/probes.ecore#/",
-			 "repository_0", "../../edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore#/",
-			 "resourcelandscape_0", "../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore#/",
-			 "system_0", "../../edu.kit.ipd.descartes.mm.applicationlevel/model/system.ecore#/",
-			 "usageprofile_0", "../../edu.kit.ipd.descartes.mm.usageprofile/model/usageprofile.ecore#/"
-		   });
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";	
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
-			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"
-		   });	
-		addAnnotation
-		  (predictionSetEClass, 
-		   source, 
-		   new String[] {
-			 "constraints", "SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame"
-		   });
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createPivotAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot";	
-		addAnnotation
-		  (predictionSetEClass, 
-		   source, 
-		   new String[] {
-			 "SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame", "\n\t\t\tsystemModel = deploymentModel.system"
-		   });	
-		addAnnotation
-		  (getPredictionSet_SystemModel(), 
-		   source, 
-		   new String[] {
-			 "derivation", "usageprofileModel.system"
-		   });	
-		addAnnotation
-		  (getPredictionSet_RepositoryModel(), 
-		   source, 
-		   new String[] {
-			 "derivation", "systemModel->collect(r | system_0::System::assemblyContexts.encapsulatedComponent.repository)->asSet()"
-		   });	
-		addAnnotation
-		  (getPredictionSet_ResourcelandscapeModel(), 
-		   source, 
-		   new String[] {
-			 "derivation", "deploymentModel.targetResourceLandscape"
-		   });
-	}
-
-} //PredictionSetPackageImpl
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetAdapterFactory.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetAdapterFactory.java
deleted file mode 100644
index 0847efa442bcd97b722b0cc0df46314f56264d53..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetAdapterFactory.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset.util;
-
-import edu.kit.ipd.descartes.mm.predictionset.*;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage
- * @generated
- */
-public class PredictionSetAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static PredictionSetPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredictionSetAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = PredictionSetPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredictionSetSwitch<Adapter> modelSwitch =
-		new PredictionSetSwitch<Adapter>() {
-			@Override
-			public Adapter casePredictionSet(PredictionSet object) {
-				return createPredictionSetAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link edu.kit.ipd.descartes.mm.predictionset.PredictionSet <em>Prediction Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSet
-	 * @generated
-	 */
-	public Adapter createPredictionSetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //PredictionSetAdapterFactory
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetSwitch.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetSwitch.java
deleted file mode 100644
index cbc4f775b440ca779b42507baf45197cb3037bf8..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetSwitch.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset.util;
-
-import edu.kit.ipd.descartes.mm.predictionset.*;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage
- * @generated
- */
-public class PredictionSetSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static PredictionSetPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredictionSetSwitch() {
-		if (modelPackage == null) {
-			modelPackage = PredictionSetPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case PredictionSetPackage.PREDICTION_SET: {
-				PredictionSet predictionSet = (PredictionSet)theEObject;
-				T result = casePredictionSet(predictionSet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Prediction Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Prediction Set</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePredictionSet(PredictionSet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //PredictionSetSwitch
diff --git a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetValidator.java b/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetValidator.java
deleted file mode 100644
index ebded7df1eb06f10da741518cac2960c8aeb0623..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.predictionset/src/edu/kit/ipd/descartes/mm/predictionset/util/PredictionSetValidator.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.predictionset.util;
-
-import edu.kit.ipd.descartes.mm.predictionset.*;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.EObjectValidator;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Validator</b> for the model.
- * <!-- end-user-doc -->
- * @see edu.kit.ipd.descartes.mm.predictionset.PredictionSetPackage
- * @generated
- */
-public class PredictionSetValidator extends EObjectValidator {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final PredictionSetValidator INSTANCE = new PredictionSetValidator();
-
-	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
-	 * @generated
-	 */
-	public static final String DIAGNOSTIC_SOURCE = "edu.kit.ipd.descartes.mm.predictionset";
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
-
-	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredictionSetValidator() {
-		super();
-	}
-
-	/**
-	 * Returns the package of this validator switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EPackage getEPackage() {
-	  return PredictionSetPackage.eINSTANCE;
-	}
-
-	/**
-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		switch (classifierID) {
-			case PredictionSetPackage.PREDICTION_SET:
-				return validatePredictionSet((PredictionSet)value, diagnostics, context);
-			default:
-				return true;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePredictionSet(PredictionSet predictionSet, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(predictionSet, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(predictionSet, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(predictionSet, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(predictionSet, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(predictionSet, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(predictionSet, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(predictionSet, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(predictionSet, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(predictionSet, diagnostics, context);
-		if (result || diagnostics != null) result &= validatePredictionSet_SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame(predictionSet, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * The cached validation expression for the SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame constraint of '<em>Prediction Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final String PREDICTION_SET__SYSTEM_MODEL_REFERENCED_BY_DEPLOYMENT_MODEL_AND_USAGE_PROFILE_MODEL_MUST_BE_THE_SAME__EEXPRESSION = "\n" +
-		"\t\t\tsystemModel = deploymentModel.system";
-
-	/**
-	 * Validates the SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame constraint of '<em>Prediction Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validatePredictionSet_SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame(PredictionSet predictionSet, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			validate
-				(PredictionSetPackage.Literals.PREDICTION_SET,
-				 predictionSet,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
-				 "SystemModelReferencedByDeploymentModelAndUsageProfileModelMustBeTheSame",
-				 PREDICTION_SET__SYSTEM_MODEL_REFERENCED_BY_DEPLOYMENT_MODEL_AND_USAGE_PROFILE_MODEL_MUST_BE_THE_SAME__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DIAGNOSTIC_SOURCE,
-				 0);
-	}
-
-	/**
-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		// TODO
-		// Specialize this to return a resource locator for messages specific to this validator.
-		// Ensure that you remove @generated or mark it @generated NOT
-		return super.getResourceLocator();
-	}
-
-} //PredictionSetValidator