diff --git a/edu.kit.ipd.descartes.adaptation.model.adaptation/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation.model.adaptation/META-INF/MANIFEST.MF
index 1aba5778529a427f6ce526131b20b8cd11e295f8..b0259a642250126ebca8f2500a6ccca0ffc01b6e 100644
--- a/edu.kit.ipd.descartes.adaptation.model.adaptation/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.adaptation.model.adaptation/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Activator: edu.kit.ipd.descartes.adaptation.model.adaptation.Activator
 Bundle-Vendor: Descartes Research Group
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: 
- edu.kit.ipd.descartes.adaptation.model.repository,
- edu.kit.ipd.descartes.adaptation.model.repository.dmm,
+ edu.kit.ipd.descartes.adaptation.model,
+ edu.kit.ipd.descartes.adaptation.model.dmm,
  edu.kit.ipd.descartes.core,
  edu.kit.ipd.descartes.identifier,
  edu.kit.ipd.descartes.mm.adaptation,
diff --git a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/DmmModelActionHandler.java b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/DmmModelActionHandler.java
index 01bef265e339ad291c6199cd0b55d14a972cc70b..b3835bf95d5e7e24cabf36009665d5d97b09e5d3 100644
--- a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/DmmModelActionHandler.java
+++ b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/DmmModelActionHandler.java
@@ -14,7 +14,7 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.DmmModelAction
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.DmmModelChanger;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader;
 import edu.kit.ipd.descartes.core.AdaptableEntity;
 import edu.kit.ipd.descartes.core.Entity;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationActionOperation;
diff --git a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/TacticExecutor.java b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/TacticExecutor.java
index b2e62f7e71e1b57c694ec891a6b9d1dc1c37c0b9..36d023544dd5b39ddb0ea37c5d4bdb574cdcc203 100644
--- a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/TacticExecutor.java
+++ b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/TacticExecutor.java
@@ -13,7 +13,7 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.IActionHandler;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.InvalidAdaptationPlan;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader;
 import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement;
 import edu.kit.ipd.descartes.mm.adaptation.Action;
 import edu.kit.ipd.descartes.mm.adaptation.ActionReference;