diff --git a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
index 32edd6113999c925752f1b2466d39db827bef7c4..95612fd718346190adf1faac4135f51ceae0b59e 100644
--- a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
@@ -10,15 +10,15 @@ Require-Bundle: edu.kit.ipd.descartes.mm.resourcelandscape;bundle-version="1.0.0
  org.eclipse.core.runtime;bundle-version="3.8.0"
 Bundle-ActivationPolicy: lazy
 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,
+Import-Package: 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.analysis,
+ edu.kit.ipd.descartes.adaptation.model.analysis.pcm,
  edu.kit.ipd.descartes.adaptation.model.dmm,
  edu.kit.ipd.descartes.ql.core.engine.query,
  edu.kit.ipd.descartes.ql.lang.descartesQL,
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 3413623d69cb8fa393f7bd84bb15fd2c89aabaef..8cf8f52fb20e059d9ae5cc8575443b0256baca8d 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
@@ -11,7 +11,6 @@ import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.URI;
 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;
@@ -24,8 +23,9 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.BlueYonderExperimen
 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.analysis.IModelAnalyzer;
+import edu.kit.ipd.descartes.adaptation.model.analysis.pcm.PcmModelAnalyzer;
 import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader;
-import edu.kit.ipd.descartes.adaptation.analysis.pcm.PcmModelAnalyzer;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationProcess;
 import edu.kit.ipd.descartes.mm.adaptation.Event;
 import edu.kit.ipd.descartes.mm.adaptation.Strategy;