diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/IPerformanceDataRepositoryHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/IPerformanceDataRepositoryHandler.java
index 0732aef2288fb1ffbb80b7cfec79e4ebf9040599..41a9ab12643b07c0228734ca810fe3a87f5e8be3 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/IPerformanceDataRepositoryHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/IPerformanceDataRepositoryHandler.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+package edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo;
 
 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/repository/perfdatarepo/ObservationRepositoryHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryHandler.java
index 02e85323bcf024eb6701e94269380af0937203dc..e3b2426fde28c03dcefebec46510bdc216b408f0 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryHandler.java
@@ -1,13 +1,13 @@
-package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+package edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo;
 
-import static edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerfDataRepoConverter.convertObservableImpact;
+import static edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerfDataRepoConverter.convertObservableImpact;
 
 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.dmm.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/repository/perfdatarepo/ObservationRepositoryHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryHelper.java
index f81f7def7969228fa928be298fe99fbeded7eb10..578508a298159d2e881a8485c9c23d45d922e151 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+package edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo;
 
 import java.util.List;
 
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryModelLoader.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryModelLoader.java
index 48986fc0cc3d1845c67587569a45e8a851dcc9fb..56eb8cfa5405a9e3d87d7a11c40ec777e1568a2b 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryModelLoader.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/ObservationRepositoryModelLoader.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+package edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo;
 
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -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/repository/perfdatarepo/PerfDataRepoConverter.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerfDataRepoConverter.java
index a348d5d7306764ea3c0072bbc1ddd13f3c294ed7..5aacbad2ddbd6afcb5f8359c6373e6dc459a720d 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerfDataRepoConverter.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerfDataRepoConverter.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+package edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryHandler.java
index 4e6d972d95782a09da1be44386d0ec701df7c93b..b36b2ceddac5de2af3bf0e8b405d984bd2493fc6 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryHandler.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+package edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryHandlerFactory.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryHandlerFactory.java
index 2bbcd7dcc5ff0be33d56b8bd96b064aeab693891..d44e6f4bad91fc4baf68f9fcf202b261b1b6ef32 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryHandlerFactory.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryHandlerFactory.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+package edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo;
 
 import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository;
 import edu.kit.ipd.descartes.ql.models.repository.ObservationRepository;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryModelLoader.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryModelLoader.java
index 0a14f7050054dd7c315c23737c0b75b2c7ac89b2..5e2eeb6bb3388d46b8c42a529fa5e1998b541fef 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryModelLoader.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/repository/perfdatarepo/PerformanceDataRepositoryModelLoader.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
+package edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EPackage;
@@ -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;