diff --git a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
index a0241b71548bfc246b34966ae0e95ce1de2de4c9..32edd6113999c925752f1b2466d39db827bef7c4 100644
--- a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
@@ -13,13 +13,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: edu.kit.ipd.descartes.adaptation.analysis,
  edu.kit.ipd.descartes.adaptation.analysis.pcm,
  edu.kit.ipd.descartes.adaptation.evaluation.performance,
+ edu.kit.ipd.descartes.adaptation.evaluation.performance.repository,
+ edu.kit.ipd.descartes.adaptation.model,
  edu.kit.ipd.descartes.adaptation.model.adaptation,
  edu.kit.ipd.descartes.adaptation.model.adaptation.dmm,
  edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util,
  edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions,
- edu.kit.ipd.descartes.adaptation.model.repository,
- edu.kit.ipd.descartes.adaptation.model.repository.dmm,
- edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo,
+ edu.kit.ipd.descartes.adaptation.model.dmm,
  edu.kit.ipd.descartes.ql.core.engine.query,
  edu.kit.ipd.descartes.ql.lang.descartesQL,
  edu.kit.ipd.descartes.ql.models.mapping.domain,
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 56cc247935853d42f2ef76bae9b8b51eb96ff262..3413623d69cb8fa393f7bd84bb15fd2c89aabaef 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
@@ -14,18 +14,18 @@ import org.eclipse.emf.ecore.xmi.DanglingHREFException;
 import edu.kit.ipd.descartes.adaptation.analysis.IModelAnalyzer;
 import edu.kit.ipd.descartes.adaptation.evaluation.performance.IEvaluator;
 import edu.kit.ipd.descartes.adaptation.evaluation.performance.WeightingFunctionEvaluator;
+import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.IPerformanceDataRepositoryHandler;
+import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.ObservationRepositoryHelper;
+import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.PerfDataRepoConverter;
+import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.PerformanceDataRepositoryHandler;
+import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.PerformanceDataRepositoryHandlerFactory;
 import edu.kit.ipd.descartes.adaptation.event.EventTypeEnum;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.BlueYonderExperimentTracker;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.DmmModelActionHandler;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.TacticsHistory;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.ObjectivesHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader;
 import edu.kit.ipd.descartes.adaptation.analysis.pcm.PcmModelAnalyzer;
-import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader;
-import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.IPerformanceDataRepositoryHandler;
-import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.ObservationRepositoryHelper;
-import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerfDataRepoConverter;
-import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerformanceDataRepositoryHandler;
-import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerformanceDataRepositoryHandlerFactory;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationProcess;
 import edu.kit.ipd.descartes.mm.adaptation.Event;
 import edu.kit.ipd.descartes.mm.adaptation.Strategy;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
index 1324943605af504ed2e79416e253f9b9b4e90fac..1d9451c463442c45620fa701791b2114d6b9b100 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
@@ -16,7 +16,7 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.TacticsHistory;
 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;