diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF
index 07e961232ab192cdc85b4d76fcb66960f1585ef1..1d7843db4195d6a9b089a0b6bec25e0be5a36f8a 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF
@@ -92,7 +92,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.identifier.edit;visibility:=reexport,
- edu.kit.ipd.descartes.mm.resourcelandscape.edit;bundle-version="1.0.0"
+ edu.kit.ipd.descartes.mm.resourcelandscape.edit;bundle-version="1.0.0",
+ edu.kit.ipd.descartes.core.edit;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java
index 4da591d21717c3d98ce111907314a32f99e3dd97..96ef3590b0d12bca5ca79058c859f13193fa9f89 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/containerrepository/presentation/ContainerrepositoryEditor.java
@@ -156,9 +156,9 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.containerrepository.provider.ContainerrepositoryItemProviderAdapterFactory;
 
-import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
+import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.resourceconfiguration.provider.ResourceconfigurationItemProviderAdapterFactory;
 
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java
index 23c299e1b151207cce894ad2f0f0eac8d71c2001..b7180df5a65f3268c9382bca5f4590c01779c326 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourceconfiguration/presentation/ResourceconfigurationEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.resourceconfiguration.provider.ResourceconfigurationItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.containerrepository.provider.ContainerrepositoryItemProviderAdapterFactory;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.resourcelandscape.presentation.ResourcelandscapeEditorPlugin;
 
 import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeItemProviderAdapterFactory;
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java
index 8134278f059ea591827e3c11a6bd45ae6d476560..6d21340f47402b325f6a9f6ccec67141522dd01f 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.resourcelandscape.provider.ResourcelandscapeItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.containerrepository.provider.ContainerrepositoryItemProviderAdapterFactory;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.resourceconfiguration.provider.ResourceconfigurationItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.resourcetype.provider.ResourcetypeItemProviderAdapterFactory;
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java
index 0b52126fe9cde3cc16645ac31933d2b94dad2839..687687d5af2061c7452461901692b70547eda524 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcelandscape/presentation/ResourcelandscapeEditorPlugin.java
@@ -3,9 +3,9 @@
  */
 package edu.kit.ipd.descartes.mm.resourcelandscape.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 org.eclipse.emf.common.EMFPlugin;
 
diff --git a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java
index ab77b32095b6b224ee3f8eb3a545c06b23e9ab11..79b59259c88af9728cef0b674ffa7dcd2623d0d8 100644
--- a/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java
+++ b/edu.kit.ipd.descartes.mm.resourcelandscape.editor/src/edu/kit/ipd/descartes/mm/resourcetype/presentation/ResourcetypeEditor.java
@@ -156,12 +156,12 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
 
 import edu.kit.ipd.descartes.mm.resourcetype.provider.ResourcetypeItemProviderAdapterFactory;
 
+import edu.kit.ipd.descartes.core.provider.CoreItemProviderAdapterFactory;
+
 import edu.kit.ipd.descartes.identifier.provider.IdentifierItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.containerrepository.provider.ContainerrepositoryItemProviderAdapterFactory;
 
-import edu.kit.ipd.descartes.mm.core.provider.CoreItemProviderAdapterFactory;
-
 import edu.kit.ipd.descartes.mm.resourceconfiguration.provider.ResourceconfigurationItemProviderAdapterFactory;
 
 import edu.kit.ipd.descartes.mm.resourcelandscape.presentation.ResourcelandscapeEditorPlugin;