diff --git a/edu.kit.ipd.descartes.adaptation.analysis/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation.analysis/META-INF/MANIFEST.MF
index 479e4b9825bf58f6c2d3a461e99a455fdfe2bab2..8487857df983be5d69975e405cedc9d79103955f 100644
--- a/edu.kit.ipd.descartes.adaptation.analysis/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.adaptation.analysis/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: edu.kit.ipd.descartes.adaptation.analysis.Activator
 Bundle-Vendor: Descartes Research Group
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: edu.kit.ipd.descartes.adaptation.model.adaptation.dmm,
- edu.kit.ipd.descartes.adaptation.model.repository,
- edu.kit.ipd.descartes.adaptation.model.repository.dmm,
- edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo,
+Import-Package: edu.kit.ipd.descartes.adaptation.evaluation.performance.repository,
+ edu.kit.ipd.descartes.adaptation.model,
+ edu.kit.ipd.descartes.adaptation.model.adaptation.dmm,
+ edu.kit.ipd.descartes.adaptation.model.dmm,
  edu.kit.ipd.descartes.mm.resourcelandscape,
  edu.kit.ipd.descartes.perfdatarepo,
  edu.kit.ipd.descartes.ql.models.repository,
diff --git a/edu.kit.ipd.descartes.adaptation.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java b/edu.kit.ipd.descartes.adaptation.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java
index 86235db524665ebbdea4cd72361ee826393d74bb..9667d9df73be8027cbdfa694d8f6297acb48225d 100644
--- a/edu.kit.ipd.descartes.adaptation.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java
+++ b/edu.kit.ipd.descartes.adaptation.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java
@@ -3,12 +3,12 @@ package edu.kit.ipd.descartes.adaptation.analysis.pcm;
 import org.apache.log4j.Logger;
 
 import edu.kit.ipd.descartes.adaptation.analysis.IModelAnalyzer;
+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.model.adaptation.dmm.BlueYonderExperimentTracker;
-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.dmm.DmlModelLoader;
 import edu.kit.ipd.descartes.perfdatarepo.Impact;
 import edu.kit.ipd.descartes.ql.models.repository.ObservationRepository;