diff --git a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
index 0e8a2d887219fdb378f577f1dbad3d5db464eb8e..a684d990ffc76215edda76313da520da788833c9 100644
--- a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF
@@ -11,10 +11,10 @@ Require-Bundle: edu.kit.ipd.descartes.mm.resourcelandscape;bundle-version="1.0.0
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: edu.kit.ipd.descartes.adaptation.evaluation.performance,
- edu.kit.ipd.descartes.adaptation.modeladaptor,
- edu.kit.ipd.descartes.adaptation.modeladaptor.dmm,
- edu.kit.ipd.descartes.adaptation.modeladaptor.dmm.util,
- edu.kit.ipd.descartes.adaptation.modelrepository,
+ 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.repository,
  edu.kit.ipd.descartes.ql.core.engine.query,
  edu.kit.ipd.descartes.ql.lang.descartesQL,
  edu.kit.ipd.descartes.ql.models.mapping.domain,
@@ -23,4 +23,5 @@ Import-Package: edu.kit.ipd.descartes.adaptation.evaluation.performance,
  org.apache.log4j;version="1.2.15",
  org.eclipse.emf.ecore.xmi,
  org.eclipse.emf.ecore.xmi.impl
-Export-Package: edu.kit.ipd.descartes.adaptation
+Export-Package: edu.kit.ipd.descartes.adaptation,
+ edu.kit.ipd.descartes.adaptation.exceptions
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 2022075a85891ed8c66c5133f48ea5035542b7c4..cd2c35a893baf05a3425736f411662be73af93eb 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,13 +14,13 @@ import org.eclipse.emf.ecore.xmi.DanglingHREFException;
 import edu.kit.ipd.descartes.adaptation.evaluation.performance.IEvaluator;
 import edu.kit.ipd.descartes.adaptation.evaluation.performance.WeightingFunctionEvaluator;
 import edu.kit.ipd.descartes.adaptation.event.EventTypeEnum;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.DmmModelActionHandler;
+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.modelrepository.AdaptationProcessModelLoader;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.dmm.DmmModelActionHandler;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.dmm.util.ObjectivesHelper;
 import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.IPerformanceDataRepositoryHandler;
 import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryHandlerFactory;
+import edu.kit.ipd.descartes.adaptation.model.repository.AdaptationProcessModelLoader;
 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 1e96a1f2cd671e1ee4b1f64bb39aa2defbd4b2de..461deffadc7588fbdad91286de078bb0117a03c0 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
@@ -10,10 +10,10 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.change.ChangeDescription;
 
 import edu.kit.ipd.descartes.adaptation.exceptions.InvalidAdaptationPlan;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.dmm.util.OclEvaluationHelper;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.IActionHandler;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.modelrepository.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.IActionHandler;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.OperationNotPerformedException;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper;
+import edu.kit.ipd.descartes.adaptation.model.repository.AdaptationProcessModelLoader;
 import edu.kit.ipd.descartes.adaptation.util.BlueYonderExperimentTracker;
 import edu.kit.ipd.descartes.adaptation.util.IObserver;
 import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java
index 02e85323bcf024eb6701e94269380af0937203dc..a3a8824a3776ea6df2887c1d6d7c9e8f61a81ef6 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java
@@ -6,8 +6,8 @@ import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.URI;
 
 import edu.kit.ipd.descartes.adaptation.TacticsHistory;
-import edu.kit.ipd.descartes.adaptation.modelrepository.AbstractEcoreModelLoader;
-import edu.kit.ipd.descartes.adaptation.modelrepository.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.AbstractEcoreModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.AdaptationProcessModelLoader;
 import edu.kit.ipd.descartes.adaptation.util.BlueYonderExperimentTracker;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
 import edu.kit.ipd.descartes.perfdatarepo.Impact;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryModelLoader.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryModelLoader.java
index 48986fc0cc3d1845c67587569a45e8a851dcc9fb..7f711f7a076642f779ac846a9360d32df9bd4115 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryModelLoader.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryModelLoader.java
@@ -6,7 +6,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
-import edu.kit.ipd.descartes.adaptation.modelrepository.AbstractEcoreModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.AbstractEcoreModelLoader;
 import edu.kit.ipd.descartes.ql.models.repository.RepositoryPackage;
 
 public class ObservationRepositoryModelLoader extends AbstractEcoreModelLoader {
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryModelLoader.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryModelLoader.java
index 0a14f7050054dd7c315c23737c0b75b2c7ac89b2..eff23365487f70b6e2690c29a88daf0dcbf44bc1 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryModelLoader.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryModelLoader.java
@@ -7,7 +7,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
-import edu.kit.ipd.descartes.adaptation.modelrepository.AbstractEcoreModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.AbstractEcoreModelLoader;
 import edu.kit.ipd.descartes.perfdatarepo.PerfdatarepoPackage;
 import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository;