diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.applicationlevel.editor/META-INF/MANIFEST.MF
index 3776644d79210e49f0ea4c376deb5d9c8a70c83f..ac986e31d79ba3aea7b13337fafad8a4c76d4cfb 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.emf.edit.ui;visibility:=reexport,
  org.eclipse.ui.ide;visibility:=reexport,
- edu.kit.ipd.descartes.mm.core.edit;visibility:=reexport,
+ edu.kit.ipd.descartes.core.edit;visibility:=reexport,
  edu.kit.ipd.descartes.identifier.edit;visibility:=reexport,
  edu.kit.ipd.descartes.mm.resourcelandscape.edit;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/applicationlevel/presentation/ApplicationlevelEditorPlugin.java b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/applicationlevel/presentation/ApplicationlevelEditorPlugin.java
index a73b318f335df59ce50864cdb00b4a0b9edbb1f9..e274a04ee039a072ffb2f75f31a3e72ad02de1cf 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/applicationlevel/presentation/ApplicationlevelEditorPlugin.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/applicationlevel/presentation/ApplicationlevelEditorPlugin.java
@@ -3,9 +3,9 @@
  */
 package edu.kit.ipd.descartes.mm.applicationlevel.presentation;
 
-import edu.kit.ipd.descartes.identifier.provider.IdentifierEditPlugin;
+import edu.kit.ipd.descartes.core.provider.CoreEditPlugin;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreEditPlugin;
+import edu.kit.ipd.descartes.identifier.provider.IdentifierEditPlugin;
 
 import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeEditPlugin;
 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/functions/presentation/FunctionsEditor.java b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/functions/presentation/FunctionsEditor.java
index 0f5215b67a083613192047ea2007c88bef97bb01..f2c84abf2219d7f424377176a994ebee1fa20b31 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/functions/presentation/FunctionsEditor.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/functions/presentation/FunctionsEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.functions.provider.FunctionsItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.presentation.ApplicationlevelEditorPlugin;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.parameterdependencies.provider.ParameterdependenciesItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.repository.provider.RepositoryItemProviderAdapterFactory;
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/parameterdependencies/presentation/ParameterdependenciesEditor.java b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/parameterdependencies/presentation/ParameterdependenciesEditor.java
index 78e7f6b410b8294fea4002edf7811086aee9fde6..ee51d930e00376837909e86d8cd08a55ea392a2a 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/parameterdependencies/presentation/ParameterdependenciesEditor.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/parameterdependencies/presentation/ParameterdependenciesEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.parameterdependencies.provider.ParameterdependenciesItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.presentation.ApplicationlevelEditorPlugin;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.functions.provider.FunctionsItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.repository.provider.RepositoryItemProviderAdapterFactory;
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/repository/presentation/RepositoryEditor.java b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/repository/presentation/RepositoryEditor.java
index 9e75c445bb8379df54b0d27020f5385d2abe2ba1..5985b0c599add99a9765ee478107d5c2d723cb68 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/repository/presentation/RepositoryEditor.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/repository/presentation/RepositoryEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.repository.provider.RepositoryItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.presentation.ApplicationlevelEditorPlugin;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.functions.provider.FunctionsItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.parameterdependencies.provider.ParameterdependenciesItemProviderAdapterFactory;
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/repository_composites/presentation/RepositoryCompositesEditor.java b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/repository_composites/presentation/RepositoryCompositesEditor.java
index 0a697fd823d0f7bc89deb1e6b9e8e92c44e21ccc..1d9c2a2557f57fbc68a86890c2557aaf5d1ffa8f 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/repository_composites/presentation/RepositoryCompositesEditor.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/repository_composites/presentation/RepositoryCompositesEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.repository_composites.provider.RepositoryCompositesItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.presentation.ApplicationlevelEditorPlugin;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.functions.provider.FunctionsItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.parameterdependencies.provider.ParameterdependenciesItemProviderAdapterFactory;
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/servicebehavior/presentation/ServicebehaviorEditor.java b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/servicebehavior/presentation/ServicebehaviorEditor.java
index 68b202468b390f5453b9d1b0a157ebe7afd1eab5..f6b6e4f85b41e582bd2638ed1bb6d487b3c55f89 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/servicebehavior/presentation/ServicebehaviorEditor.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/servicebehavior/presentation/ServicebehaviorEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.servicebehavior.provider.ServicebehaviorItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.presentation.ApplicationlevelEditorPlugin;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.functions.provider.FunctionsItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.parameterdependencies.provider.ParameterdependenciesItemProviderAdapterFactory;
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/system/presentation/SystemEditor.java b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/system/presentation/SystemEditor.java
index cdc9a99de480679e5c050a9366e756e92bcce89e..ccbdd0c21fda1b0862e4155d0179416c3ecf1e51 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/system/presentation/SystemEditor.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/src/edu/kit/ipd/descartes/mm/system/presentation/SystemEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.system.provider.SystemItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.applicationlevel.presentation.ApplicationlevelEditorPlugin;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.functions.provider.FunctionsItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.parameterdependencies.provider.ParameterdependenciesItemProviderAdapterFactory;