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 3820262303a296679dc2b391a292acaaa21511d9..949aef098b5273c52adf8841e6d8d0ffb2e41085 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,7 +14,7 @@ import edu.kit.ipd.descartes.adaptation.model.analysis.pcm.PcmModelAnalyzer;
 import edu.kit.ipd.descartes.adaptation.model.dmm.AdaptationProcessModelManager;
 import edu.kit.ipd.descartes.adaptation.model.dmm.DmmModelActionHandler;
 import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
-import edu.kit.ipd.descartes.adaptation.util.PerfDataRepoHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.PerfDataRepoHelper;
 import edu.kit.ipd.descartes.adaptation.weightingfunction.IWeightingFunctionCalculator;
 import edu.kit.ipd.descartes.adaptation.weightingfunction.WeightedSumCalculator;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
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 1384163da50eb8173fcee506f9a8686a48fca4e8..e8ba1bb7d72b10e5ad233c713075045b00422a5f 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
@@ -7,7 +7,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import edu.kit.ipd.descartes.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.util.OclEvaluationHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.OclEvaluationHelper;
 import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement;
 import edu.kit.ipd.descartes.mm.adaptation.Action;
 import edu.kit.ipd.descartes.mm.adaptation.ActionReference;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
index 8d1c4c25d72131e8c8ae8d500a5c13bb61a574ab..de49a91c617ba288a290ebc63799cec7318de3c1 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
@@ -10,9 +10,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 
 import edu.kit.ipd.descartes.adaptation.IActionHandler;
 import edu.kit.ipd.descartes.adaptation.exceptions.OperationNotPerformedException;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.DmmModelActionHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.OclEvaluationHelper;
 import edu.kit.ipd.descartes.adaptation.model.util.DmmModelChanger;
-import edu.kit.ipd.descartes.adaptation.util.DmmModelActionHelper;
-import edu.kit.ipd.descartes.adaptation.util.OclEvaluationHelper;
 import edu.kit.ipd.descartes.core.AdaptableEntity;
 import edu.kit.ipd.descartes.core.Entity;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationActionOperation;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/DmmModelActionHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelActionHelper.java
similarity index 99%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/DmmModelActionHelper.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelActionHelper.java
index 028162fe83cf2457dd447d0c27bed70fe9c8f3e2..279a88f90f0b6f793f433e38bbfa8f4d4955241c 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/DmmModelActionHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelActionHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.util;
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/OclEvaluationHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/OclEvaluationHelper.java
similarity index 97%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/OclEvaluationHelper.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/OclEvaluationHelper.java
index c008b26e655456a1432ca000bb59940d56d824cc..2a12b5912d1b4beef934581ad3340de7a4784c4b 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/OclEvaluationHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/OclEvaluationHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.util;
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
 
 import java.util.Set;
 
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/PerfDataRepoHelper.java
similarity index 96%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelper.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/PerfDataRepoHelper.java
index beced5ec0010a2ddd9cb7b4f0ffae4aee0fc4b1b..518caeb239a85e7f56666a196bc02eb7032ecb33 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/PerfDataRepoHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.util;
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
 
 import org.eclipse.emf.common.util.EList;
 
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java
similarity index 96%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelper.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java
index f4f95a9060f8867c56ff0424b4734a914f40e0b5..4e92239ffacf2e685994414344f284b87323b3ce 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.util;
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChanger.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChanger.java
index 00d1336cd5751a9c85d65403c23685389fcdaf33..61ec4c7bf6d8c29c5c16c8b5dccef8682d6d8d65 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChanger.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChanger.java
@@ -10,7 +10,7 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
 import edu.kit.ipd.descartes.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.util.DmmModelActionHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.DmmModelActionHelper;
 import edu.kit.ipd.descartes.core.AdaptableEntity;
 import edu.kit.ipd.descartes.core.Entity;
 import edu.kit.ipd.descartes.core.NamedElement;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
index 563af7fc9a475e8e2b636df3db47049cc1201df7..67c304e35187c43fa71a630159354eac5689f6dd 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
@@ -3,7 +3,7 @@ package edu.kit.ipd.descartes.adaptation.weightingfunction;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
 
-import edu.kit.ipd.descartes.adaptation.util.WeightingFunctionHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.WeightingFunctionHelper;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
 import edu.kit.ipd.descartes.mm.adaptation.WeightingFunction;
 import edu.kit.ipd.descartes.perfdatarepo.Impact;