diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.xml b/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.xml
index 11bd5b5e0d75019d624b320f04b98af202acb6c4..09fc78705a5a014b597986810cf8ed7f2e5f9418 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.xml
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.editor/plugin.xml
@@ -12,24 +12,24 @@
             id="org.eclipse.emf.ecore.Wizard.category.ID"
             name="%_UI_Wizard_category"/>
       <wizard
-            id="edu.kit.ipd.descartes.mm.repository.presentation.RepositoryModelWizardID"
-            name="%_UI_RepositoryModelWizard_label"
-            class="edu.kit.ipd.descartes.mm.repository.presentation.RepositoryModelWizard"
+            id="edu.kit.ipd.descartes.mm.applicationlevel.functions.presentation.FunctionsModelWizardID"
+            name="%_UI_FunctionsModelWizard_label"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.functions.presentation.FunctionsModelWizard"
             category="org.eclipse.emf.ecore.Wizard.category.ID"
-            icon="icons/full/obj16/RepositoryModelFile.gif">
-         <description>%_UI_RepositoryModelWizard_description</description>
+            icon="icons/full/obj16/FunctionsModelFile.gif">
+         <description>%_UI_FunctionsModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
    </extension>
 
    <extension point="org.eclipse.ui.editors">
       <editor
-            id="edu.kit.ipd.descartes.mm.repository.presentation.RepositoryEditorID"
-            name="%_UI_RepositoryEditor_label"
-            icon="icons/full/obj16/RepositoryModelFile.gif"
-            extensions="repository"
-            class="edu.kit.ipd.descartes.mm.repository.presentation.RepositoryEditor"
-            contributorClass="edu.kit.ipd.descartes.mm.repository.presentation.RepositoryActionBarContributor">
+            id="edu.kit.ipd.descartes.mm.applicationlevel.functions.presentation.FunctionsEditorID"
+            name="%_UI_FunctionsEditor_label"
+            icon="icons/full/obj16/FunctionsModelFile.gif"
+            extensions="functions"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.functions.presentation.FunctionsEditor"
+            contributorClass="edu.kit.ipd.descartes.mm.applicationlevel.functions.presentation.FunctionsActionBarContributor">
       </editor>
    </extension>
 
@@ -38,24 +38,24 @@
             id="org.eclipse.emf.ecore.Wizard.category.ID"
             name="%_UI_Wizard_category"/>
       <wizard
-            id="edu.kit.ipd.descartes.mm.servicebehavior.presentation.ServicebehaviorModelWizardID"
-            name="%_UI_ServicebehaviorModelWizard_label"
-            class="edu.kit.ipd.descartes.mm.servicebehavior.presentation.ServicebehaviorModelWizard"
+            id="edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.presentation.ParameterdependenciesModelWizardID"
+            name="%_UI_ParameterdependenciesModelWizard_label"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.presentation.ParameterdependenciesModelWizard"
             category="org.eclipse.emf.ecore.Wizard.category.ID"
-            icon="icons/full/obj16/ServicebehaviorModelFile.gif">
-         <description>%_UI_ServicebehaviorModelWizard_description</description>
+            icon="icons/full/obj16/ParameterdependenciesModelFile.gif">
+         <description>%_UI_ParameterdependenciesModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
    </extension>
 
    <extension point="org.eclipse.ui.editors">
       <editor
-            id="edu.kit.ipd.descartes.mm.servicebehavior.presentation.ServicebehaviorEditorID"
-            name="%_UI_ServicebehaviorEditor_label"
-            icon="icons/full/obj16/ServicebehaviorModelFile.gif"
-            extensions="servicebehavior"
-            class="edu.kit.ipd.descartes.mm.servicebehavior.presentation.ServicebehaviorEditor"
-            contributorClass="edu.kit.ipd.descartes.mm.servicebehavior.presentation.ServicebehaviorActionBarContributor">
+            id="edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.presentation.ParameterdependenciesEditorID"
+            name="%_UI_ParameterdependenciesEditor_label"
+            icon="icons/full/obj16/ParameterdependenciesModelFile.gif"
+            extensions="parameterdependencies"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.presentation.ParameterdependenciesEditor"
+            contributorClass="edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.presentation.ParameterdependenciesActionBarContributor">
       </editor>
    </extension>
 
@@ -64,24 +64,24 @@
             id="org.eclipse.emf.ecore.Wizard.category.ID"
             name="%_UI_Wizard_category"/>
       <wizard
-            id="edu.kit.ipd.descartes.mm.system.presentation.SystemModelWizardID"
-            name="%_UI_SystemModelWizard_label"
-            class="edu.kit.ipd.descartes.mm.system.presentation.SystemModelWizard"
+            id="edu.kit.ipd.descartes.mm.applicationlevel.repository.presentation.RepositoryModelWizardID"
+            name="%_UI_RepositoryModelWizard_label"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.repository.presentation.RepositoryModelWizard"
             category="org.eclipse.emf.ecore.Wizard.category.ID"
-            icon="icons/full/obj16/SystemModelFile.gif">
-         <description>%_UI_SystemModelWizard_description</description>
+            icon="icons/full/obj16/RepositoryModelFile.gif">
+         <description>%_UI_RepositoryModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
    </extension>
 
    <extension point="org.eclipse.ui.editors">
       <editor
-            id="edu.kit.ipd.descartes.mm.system.presentation.SystemEditorID"
-            name="%_UI_SystemEditor_label"
-            icon="icons/full/obj16/SystemModelFile.gif"
-            extensions="system"
-            class="edu.kit.ipd.descartes.mm.system.presentation.SystemEditor"
-            contributorClass="edu.kit.ipd.descartes.mm.system.presentation.SystemActionBarContributor">
+            id="edu.kit.ipd.descartes.mm.applicationlevel.repository.presentation.RepositoryEditorID"
+            name="%_UI_RepositoryEditor_label"
+            icon="icons/full/obj16/RepositoryModelFile.gif"
+            extensions="repository"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.repository.presentation.RepositoryEditor"
+            contributorClass="edu.kit.ipd.descartes.mm.applicationlevel.repository.presentation.RepositoryActionBarContributor">
       </editor>
    </extension>
 
@@ -90,24 +90,24 @@
             id="org.eclipse.emf.ecore.Wizard.category.ID"
             name="%_UI_Wizard_category"/>
       <wizard
-            id="edu.kit.ipd.descartes.mm.parameterdependencies.presentation.ParameterdependenciesModelWizardID"
-            name="%_UI_ParameterdependenciesModelWizard_label"
-            class="edu.kit.ipd.descartes.mm.parameterdependencies.presentation.ParameterdependenciesModelWizard"
+            id="edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.presentation.ServicebehaviorModelWizardID"
+            name="%_UI_ServicebehaviorModelWizard_label"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.presentation.ServicebehaviorModelWizard"
             category="org.eclipse.emf.ecore.Wizard.category.ID"
-            icon="icons/full/obj16/ParameterdependenciesModelFile.gif">
-         <description>%_UI_ParameterdependenciesModelWizard_description</description>
+            icon="icons/full/obj16/ServicebehaviorModelFile.gif">
+         <description>%_UI_ServicebehaviorModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
    </extension>
 
    <extension point="org.eclipse.ui.editors">
       <editor
-            id="edu.kit.ipd.descartes.mm.parameterdependencies.presentation.ParameterdependenciesEditorID"
-            name="%_UI_ParameterdependenciesEditor_label"
-            icon="icons/full/obj16/ParameterdependenciesModelFile.gif"
-            extensions="parameterdependencies"
-            class="edu.kit.ipd.descartes.mm.parameterdependencies.presentation.ParameterdependenciesEditor"
-            contributorClass="edu.kit.ipd.descartes.mm.parameterdependencies.presentation.ParameterdependenciesActionBarContributor">
+            id="edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.presentation.ServicebehaviorEditorID"
+            name="%_UI_ServicebehaviorEditor_label"
+            icon="icons/full/obj16/ServicebehaviorModelFile.gif"
+            extensions="servicebehavior"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.presentation.ServicebehaviorEditor"
+            contributorClass="edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.presentation.ServicebehaviorActionBarContributor">
       </editor>
    </extension>
 
@@ -116,24 +116,24 @@
             id="org.eclipse.emf.ecore.Wizard.category.ID"
             name="%_UI_Wizard_category"/>
       <wizard
-            id="edu.kit.ipd.descartes.mm.functions.presentation.FunctionsModelWizardID"
-            name="%_UI_FunctionsModelWizard_label"
-            class="edu.kit.ipd.descartes.mm.functions.presentation.FunctionsModelWizard"
+            id="edu.kit.ipd.descartes.mm.applicationlevel.system.presentation.SystemModelWizardID"
+            name="%_UI_SystemModelWizard_label"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.system.presentation.SystemModelWizard"
             category="org.eclipse.emf.ecore.Wizard.category.ID"
-            icon="icons/full/obj16/FunctionsModelFile.gif">
-         <description>%_UI_FunctionsModelWizard_description</description>
+            icon="icons/full/obj16/SystemModelFile.gif">
+         <description>%_UI_SystemModelWizard_description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
    </extension>
 
    <extension point="org.eclipse.ui.editors">
       <editor
-            id="edu.kit.ipd.descartes.mm.functions.presentation.FunctionsEditorID"
-            name="%_UI_FunctionsEditor_label"
-            icon="icons/full/obj16/FunctionsModelFile.gif"
-            extensions="functions"
-            class="edu.kit.ipd.descartes.mm.functions.presentation.FunctionsEditor"
-            contributorClass="edu.kit.ipd.descartes.mm.functions.presentation.FunctionsActionBarContributor">
+            id="edu.kit.ipd.descartes.mm.applicationlevel.system.presentation.SystemEditorID"
+            name="%_UI_SystemEditor_label"
+            icon="icons/full/obj16/SystemModelFile.gif"
+            extensions="system"
+            class="edu.kit.ipd.descartes.mm.applicationlevel.system.presentation.SystemEditor"
+            contributorClass="edu.kit.ipd.descartes.mm.applicationlevel.system.presentation.SystemActionBarContributor">
       </editor>
    </extension>