diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/DmmModelManagerTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/DmmModelManagerTest.java
index 6e38a6bc415f92aa2ff6efd4c3b6bf2f5bf8dabf..dd146f4e19a1da730d0ce81ff64b622f239d9aca 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/DmmModelManagerTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/DmmModelManagerTest.java
@@ -7,6 +7,7 @@ import org.junit.Test;
 
 import edu.kit.ipd.descartes.adaptation.AbstractTest;
 import edu.kit.ipd.descartes.adaptation.AdaptationControl;
+import edu.kit.ipd.descartes.adaptation.model.dmm.AdaptationProcessModelManager;
 import edu.kit.ipd.descartes.mm.resourcelandscape.DistributedDataCenter;
 
 public class DmmModelManagerTest extends AbstractTest {
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelperTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelperTest.java
index 3c9d6c468e611fa9805f96ca97541f1d2bf05089..c17764f6a57cf239059e7ab9afc7f91f961b6c9e 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelperTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelperTest.java
@@ -6,7 +6,7 @@ import org.eclipse.emf.common.util.URI;
 import org.junit.Before;
 import org.junit.Test;
 
-import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryModelManager;
+import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.perfdatarepo.Impact;
 import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository;
 
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelperTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelperTest.java
index d2223151af213a8d05850ca367d1b2d70a97e202..0c6cb6f1838ad4094534fc1a0f5ca43903ce66ad 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelperTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelperTest.java
@@ -7,7 +7,7 @@ import org.eclipse.emf.common.util.URI;
 import org.junit.Before;
 import org.junit.Test;
 
-import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryModelManager;
+import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedMetric;
 import edu.kit.ipd.descartes.mm.adaptation.WeightingFunction;
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java
index 740a557ace902d9a89df9d9be656cbfb2da73ec5..e50c3315c4ff99b8fcddb820214b3a0ca9f43d6b 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java
@@ -9,7 +9,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import edu.kit.ipd.descartes.adaptation.AbstractTest;
-import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryModelManager;
+import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedMetric;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;