diff --git a/plugins/configuration/config/class_DebugLevelAttribute.inc b/plugins/configuration/core/class_DebugLevelAttribute.inc
similarity index 100%
rename from plugins/configuration/config/class_DebugLevelAttribute.inc
rename to plugins/configuration/core/class_DebugLevelAttribute.inc
diff --git a/plugins/configuration/config/class_configInLdap.inc b/plugins/configuration/core/class_configInLdap.inc
similarity index 100%
rename from plugins/configuration/config/class_configInLdap.inc
rename to plugins/configuration/core/class_configInLdap.inc
diff --git a/plugins/configuration/config/class_configInLdapTabs.inc b/plugins/configuration/core/class_configInLdapTabs.inc
similarity index 100%
rename from plugins/configuration/config/class_configInLdapTabs.inc
rename to plugins/configuration/core/class_configInLdapTabs.inc
diff --git a/plugins/configuration/config/class_hooksConfig.inc b/plugins/configuration/core/class_hooksConfig.inc
similarity index 100%
rename from plugins/configuration/config/class_hooksConfig.inc
rename to plugins/configuration/core/class_hooksConfig.inc
diff --git a/plugins/configuration/subscription/class_subscriptionInfo.inc b/plugins/configuration/core/class_licenceInfo.inc
similarity index 99%
rename from plugins/configuration/subscription/class_subscriptionInfo.inc
rename to plugins/configuration/core/class_licenceInfo.inc
index f60b3ad85d9f87331bad86010341095a04dbee39..81e4b8ffbe90b635a75dcb00e9807c0fdedea731 100644
--- a/plugins/configuration/subscription/class_subscriptionInfo.inc
+++ b/plugins/configuration/core/class_licenceInfo.inc
@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class subscriptionInfo extends simplePlugin
+class licenceInfo extends simplePlugin
 {
   /* ldap attribute => ini variable */
   public static $subscriptionAttributes = [
diff --git a/plugins/configuration/config/class_mailTemplateConfig.inc b/plugins/configuration/core/class_mailTemplateConfig.inc
similarity index 100%
rename from plugins/configuration/config/class_mailTemplateConfig.inc
rename to plugins/configuration/core/class_mailTemplateConfig.inc
diff --git a/plugins/configuration/config/class_mainPluginsConfig.inc b/plugins/configuration/core/class_mainPluginsConfig.inc
similarity index 100%
rename from plugins/configuration/config/class_mainPluginsConfig.inc
rename to plugins/configuration/core/class_mainPluginsConfig.inc
diff --git a/plugins/configuration/config/class_pluginsConfigInLdap.inc b/plugins/configuration/core/class_pluginsConfigInLdap.inc
similarity index 100%
rename from plugins/configuration/config/class_pluginsConfigInLdap.inc
rename to plugins/configuration/core/class_pluginsConfigInLdap.inc
diff --git a/plugins/configuration/config/class_recoveryConfig.inc b/plugins/configuration/core/class_recoveryConfig.inc
similarity index 100%
rename from plugins/configuration/config/class_recoveryConfig.inc
rename to plugins/configuration/core/class_recoveryConfig.inc
diff --git a/plugins/configuration/config/class_snapshotConfig.inc b/plugins/configuration/core/class_snapshotConfig.inc
similarity index 100%
rename from plugins/configuration/config/class_snapshotConfig.inc
rename to plugins/configuration/core/class_snapshotConfig.inc
diff --git a/plugins/configuration/config/class_tasksConfig.inc b/plugins/configuration/core/class_tasksConfig.inc
similarity index 100%
rename from plugins/configuration/config/class_tasksConfig.inc
rename to plugins/configuration/core/class_tasksConfig.inc
diff --git a/plugins/admin/acl/class_ACLsAssignmentAttribute.inc b/plugins/management/acl/class_ACLsAssignmentAttribute.inc
similarity index 100%
rename from plugins/admin/acl/class_ACLsAssignmentAttribute.inc
rename to plugins/management/acl/class_ACLsAssignmentAttribute.inc
diff --git a/plugins/admin/acl/class_ACLsAssignmentDialog.inc b/plugins/management/acl/class_ACLsAssignmentDialog.inc
similarity index 100%
rename from plugins/admin/acl/class_ACLsAssignmentDialog.inc
rename to plugins/management/acl/class_ACLsAssignmentDialog.inc
diff --git a/plugins/admin/acl/class_aclAssignment.inc b/plugins/management/acl/class_aclAssignment.inc
similarity index 100%
rename from plugins/admin/acl/class_aclAssignment.inc
rename to plugins/management/acl/class_aclAssignment.inc
diff --git a/plugins/admin/acl/class_aclAssignmentDialogWindow.inc b/plugins/management/acl/class_aclAssignmentDialogWindow.inc
similarity index 100%
rename from plugins/admin/acl/class_aclAssignmentDialogWindow.inc
rename to plugins/management/acl/class_aclAssignmentDialogWindow.inc
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/management/acl/class_aclManagement.inc
similarity index 100%
rename from plugins/admin/acl/class_aclManagement.inc
rename to plugins/management/acl/class_aclManagement.inc
diff --git a/plugins/admin/acl/remove.tpl b/plugins/management/acl/remove.tpl
similarity index 100%
rename from plugins/admin/acl/remove.tpl
rename to plugins/management/acl/remove.tpl
diff --git a/plugins/admin/aclrole/acleditiondialog.tpl b/plugins/management/aclrole/acleditiondialog.tpl
similarity index 100%
rename from plugins/admin/aclrole/acleditiondialog.tpl
rename to plugins/management/aclrole/acleditiondialog.tpl
diff --git a/plugins/admin/aclrole/class_aclEditionDialog.inc b/plugins/management/aclrole/class_aclEditionDialog.inc
similarity index 100%
rename from plugins/admin/aclrole/class_aclEditionDialog.inc
rename to plugins/management/aclrole/class_aclEditionDialog.inc
diff --git a/plugins/admin/aclrole/class_aclRole.inc b/plugins/management/aclrole/class_aclRole.inc
similarity index 100%
rename from plugins/admin/aclrole/class_aclRole.inc
rename to plugins/management/aclrole/class_aclRole.inc
diff --git a/plugins/admin/aclrole/class_aclRoleManagement.inc b/plugins/management/aclrole/class_aclRoleManagement.inc
similarity index 100%
rename from plugins/admin/aclrole/class_aclRoleManagement.inc
rename to plugins/management/aclrole/class_aclRoleManagement.inc
diff --git a/plugins/admin/departments/class_country.inc b/plugins/management/departments/class_country.inc
similarity index 100%
rename from plugins/admin/departments/class_country.inc
rename to plugins/management/departments/class_country.inc
diff --git a/plugins/admin/departments/class_dcObject.inc b/plugins/management/departments/class_dcObject.inc
similarity index 100%
rename from plugins/admin/departments/class_dcObject.inc
rename to plugins/management/departments/class_dcObject.inc
diff --git a/plugins/admin/departments/class_department.inc b/plugins/management/departments/class_department.inc
similarity index 100%
rename from plugins/admin/departments/class_department.inc
rename to plugins/management/departments/class_department.inc
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/management/departments/class_departmentManagement.inc
similarity index 100%
rename from plugins/admin/departments/class_departmentManagement.inc
rename to plugins/management/departments/class_departmentManagement.inc
diff --git a/plugins/admin/departments/class_domain.inc b/plugins/management/departments/class_domain.inc
similarity index 100%
rename from plugins/admin/departments/class_domain.inc
rename to plugins/management/departments/class_domain.inc
diff --git a/plugins/admin/departments/class_locality.inc b/plugins/management/departments/class_locality.inc
similarity index 100%
rename from plugins/admin/departments/class_locality.inc
rename to plugins/management/departments/class_locality.inc
diff --git a/plugins/admin/departments/class_organization.inc b/plugins/management/departments/class_organization.inc
similarity index 100%
rename from plugins/admin/departments/class_organization.inc
rename to plugins/management/departments/class_organization.inc
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/management/departments/tabs_department.inc
similarity index 100%
rename from plugins/admin/departments/tabs_department.inc
rename to plugins/management/departments/tabs_department.inc
diff --git a/plugins/admin/groups/class_GroupContentColumn.inc b/plugins/management/groups/class_GroupContentColumn.inc
similarity index 100%
rename from plugins/admin/groups/class_GroupContentColumn.inc
rename to plugins/management/groups/class_GroupContentColumn.inc
diff --git a/plugins/admin/groups/class_GroupContentFilterElement.inc b/plugins/management/groups/class_GroupContentFilterElement.inc
similarity index 100%
rename from plugins/admin/groups/class_GroupContentFilterElement.inc
rename to plugins/management/groups/class_GroupContentFilterElement.inc
diff --git a/plugins/admin/groups/class_GroupMembersAttribute.inc b/plugins/management/groups/class_GroupMembersAttribute.inc
similarity index 100%
rename from plugins/admin/groups/class_GroupMembersAttribute.inc
rename to plugins/management/groups/class_GroupMembersAttribute.inc
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/management/groups/class_groupManagement.inc
similarity index 100%
rename from plugins/admin/groups/class_groupManagement.inc
rename to plugins/management/groups/class_groupManagement.inc
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/management/groups/class_ogroup.inc
similarity index 100%
rename from plugins/admin/groups/class_ogroup.inc
rename to plugins/management/groups/class_ogroup.inc
diff --git a/plugins/admin/groups/class_roleGeneric.inc b/plugins/management/groups/class_roleGeneric.inc
similarity index 100%
rename from plugins/admin/groups/class_roleGeneric.inc
rename to plugins/management/groups/class_roleGeneric.inc
diff --git a/plugins/admin/groups/tabs_ogroups.inc b/plugins/management/groups/tabs_ogroups.inc
similarity index 100%
rename from plugins/admin/groups/tabs_ogroups.inc
rename to plugins/management/groups/tabs_ogroups.inc
diff --git a/plugins/admin/mailtemplate/class_mailTemplateManagement.inc b/plugins/management/mailtemplate/class_mailTemplateManagement.inc
similarity index 97%
rename from plugins/admin/mailtemplate/class_mailTemplateManagement.inc
rename to plugins/management/mailtemplate/class_mailTemplateManagement.inc
index cfbcd572d98b735b3f4b089df4c3d5cf56014a3b..cb509a2ca3f0f2b3f5068fcf95faaf16e06ef844 100644
--- a/plugins/admin/mailtemplate/class_mailTemplateManagement.inc
+++ b/plugins/management/mailtemplate/class_mailTemplateManagement.inc
@@ -36,8 +36,8 @@ class mailTemplateManagement extends management
       'plDescription' => _('Manages mails templates'),
       'plIcon'        => 'geticon.php?context=applications&icon=mail-template&size=48',
       'plManages'     => ['mailTemplate'],
-      'plSection'     => 'conf',
-      'plPriority'    => 30,
+      'plSection'       => ['workflow' => ['name' => _('Workflow'), 'priority' => 29]],
+      'plPriority'    => 1,
       'plProvidedAcls' => [],
     ];
   }
diff --git a/plugins/dashboard/tasks/class_tasksColumn.inc b/plugins/management/tasks/class_tasksColumn.inc
similarity index 100%
rename from plugins/dashboard/tasks/class_tasksColumn.inc
rename to plugins/management/tasks/class_tasksColumn.inc
diff --git a/plugins/configuration/tasks/class_tasksManagement.inc b/plugins/management/tasks/class_tasksManagement.inc
similarity index 96%
rename from plugins/configuration/tasks/class_tasksManagement.inc
rename to plugins/management/tasks/class_tasksManagement.inc
index 885a0b3b2d2cd9faf1ccb73418ece7dcbab31f52..360bdc03d716ab9a5384c592b81d5a3dcd9f1850 100644
--- a/plugins/configuration/tasks/class_tasksManagement.inc
+++ b/plugins/management/tasks/class_tasksManagement.inc
@@ -43,8 +43,8 @@ class tasksManagement extends management
       'plDescription' => _('Provide a mechanism to create and manage tasks'),
       'plTitle'       => _('Tasks'),
       'plIcon'        => 'geticon.php?context=applications&icon=tasks&size=48',
-      'plSection'     => 'conf',
-      'plPriority'    => 40,
+      'plSection'     => 'workflow',
+      'plPriority'    => 2,
       'plManages'     => ['tasks'],
       'plProvidedAcls' => [],
     ];
diff --git a/plugins/admin/users/class_LockAction.inc b/plugins/management/users/class_LockAction.inc
similarity index 100%
rename from plugins/admin/users/class_LockAction.inc
rename to plugins/management/users/class_LockAction.inc
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/management/users/class_userManagement.inc
similarity index 100%
rename from plugins/admin/users/class_userManagement.inc
rename to plugins/management/users/class_userManagement.inc
diff --git a/plugins/configuration/mailtemplate/class_mailTemplate.inc b/plugins/workflow/mailtemplate/class_mailTemplate.inc
similarity index 100%
rename from plugins/configuration/mailtemplate/class_mailTemplate.inc
rename to plugins/workflow/mailtemplate/class_mailTemplate.inc
diff --git a/plugins/configuration/tasks/class_tasks.inc b/plugins/workflow/tasks/class_tasks.inc
similarity index 100%
rename from plugins/configuration/tasks/class_tasks.inc
rename to plugins/workflow/tasks/class_tasks.inc
diff --git a/plugins/configuration/tasks/class_tasksGranular.inc b/plugins/workflow/tasks/class_tasksGranular.inc
similarity index 100%
rename from plugins/configuration/tasks/class_tasksGranular.inc
rename to plugins/workflow/tasks/class_tasksGranular.inc
diff --git a/plugins/configuration/tasks/class_tasksMail.inc b/plugins/workflow/tasks/class_tasksMail.inc
similarity index 100%
rename from plugins/configuration/tasks/class_tasksMail.inc
rename to plugins/workflow/tasks/class_tasksMail.inc