diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
index 5dc0abed24b6d17b30d95dde81349ecc7b4d5d7f..3820262303a296679dc2b391a292acaaa21511d9 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
@@ -9,11 +9,11 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.URI;
 
-import edu.kit.ipd.descartes.adaptation.model.DmmModelActionHandler;
-import edu.kit.ipd.descartes.adaptation.model.AdaptationProcessModelManager;
-import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.adaptation.model.analysis.IModelAnalyzer;
 import edu.kit.ipd.descartes.adaptation.model.analysis.pcm.PcmModelAnalyzer;
+import edu.kit.ipd.descartes.adaptation.model.dmm.AdaptationProcessModelManager;
+import edu.kit.ipd.descartes.adaptation.model.dmm.DmmModelActionHandler;
+import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.adaptation.util.PerfDataRepoHelper;
 import edu.kit.ipd.descartes.adaptation.weightingfunction.IWeightingFunctionCalculator;
 import edu.kit.ipd.descartes.adaptation.weightingfunction.WeightedSumCalculator;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManager.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelManager.java
similarity index 96%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManager.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelManager.java
index 4a4747dd99e4313d6975b2f3629e9e4f60b89501..9e30607cbc8579ca6132c715d06caf66e52735c4 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManager.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelManager.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model;
+package edu.kit.ipd.descartes.adaptation.model.dmm;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.XMIResource;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
+import edu.kit.ipd.descartes.adaptation.model.AbstractEcoreModelManager;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationPackage;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationProcess;
 import edu.kit.ipd.descartes.mm.adaptationpoints.AdaptationpointsPackage;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/DmmModelActionHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
similarity index 99%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/DmmModelActionHandler.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
index d1a33915e0312902c437358832c63bbe98a21eea..8d1c4c25d72131e8c8ae8d500a5c13bb61a574ab 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/DmmModelActionHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model;
+package edu.kit.ipd.descartes.adaptation.model.dmm;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/PerformanceDataRepositoryModelManager.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/PerformanceDataRepositoryModelManager.java
similarity index 93%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/PerformanceDataRepositoryModelManager.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/PerformanceDataRepositoryModelManager.java
index eaef030723adb1ce094294a53a2d5407d6d9c4bf..080f44b26d47dd0565b611bd40ce41ea8d138d2b 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/PerformanceDataRepositoryModelManager.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/PerformanceDataRepositoryModelManager.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model;
+package edu.kit.ipd.descartes.adaptation.model.dmm;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EPackage;
@@ -7,6 +7,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
+import edu.kit.ipd.descartes.adaptation.model.AbstractEcoreModelManager;
 import edu.kit.ipd.descartes.perfdatarepo.PerfdatarepoPackage;
 import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository;