diff --git a/plugins/config/class_DebugLevelAttribute.inc b/plugins/configuration/config/class_DebugLevelAttribute.inc
similarity index 100%
rename from plugins/config/class_DebugLevelAttribute.inc
rename to plugins/configuration/config/class_DebugLevelAttribute.inc
diff --git a/plugins/config/class_configInLdap.inc b/plugins/configuration/config/class_configInLdap.inc
similarity index 100%
rename from plugins/config/class_configInLdap.inc
rename to plugins/configuration/config/class_configInLdap.inc
diff --git a/plugins/config/class_configInLdapTabs.inc b/plugins/configuration/config/class_configInLdapTabs.inc
similarity index 100%
rename from plugins/config/class_configInLdapTabs.inc
rename to plugins/configuration/config/class_configInLdapTabs.inc
diff --git a/plugins/config/class_dashBoardConfig.inc b/plugins/configuration/config/class_dashBoardConfig.inc
similarity index 100%
rename from plugins/config/class_dashBoardConfig.inc
rename to plugins/configuration/config/class_dashBoardConfig.inc
diff --git a/plugins/config/class_hooksConfig.inc b/plugins/configuration/config/class_hooksConfig.inc
similarity index 100%
rename from plugins/config/class_hooksConfig.inc
rename to plugins/configuration/config/class_hooksConfig.inc
diff --git a/plugins/config/class_mailTemplateConfig.inc b/plugins/configuration/config/class_mailTemplateConfig.inc
similarity index 100%
rename from plugins/config/class_mailTemplateConfig.inc
rename to plugins/configuration/config/class_mailTemplateConfig.inc
diff --git a/plugins/config/class_mainPluginsConfig.inc b/plugins/configuration/config/class_mainPluginsConfig.inc
similarity index 100%
rename from plugins/config/class_mainPluginsConfig.inc
rename to plugins/configuration/config/class_mainPluginsConfig.inc
diff --git a/plugins/config/class_pluginsConfigInLdap.inc b/plugins/configuration/config/class_pluginsConfigInLdap.inc
similarity index 100%
rename from plugins/config/class_pluginsConfigInLdap.inc
rename to plugins/configuration/config/class_pluginsConfigInLdap.inc
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/configuration/config/class_recoveryConfig.inc
similarity index 100%
rename from plugins/config/class_recoveryConfig.inc
rename to plugins/configuration/config/class_recoveryConfig.inc
diff --git a/plugins/config/class_snapshotConfig.inc b/plugins/configuration/config/class_snapshotConfig.inc
similarity index 100%
rename from plugins/config/class_snapshotConfig.inc
rename to plugins/configuration/config/class_snapshotConfig.inc
diff --git a/plugins/config/class_tasksConfig.inc b/plugins/configuration/config/class_tasksConfig.inc
similarity index 100%
rename from plugins/config/class_tasksConfig.inc
rename to plugins/configuration/config/class_tasksConfig.inc
diff --git a/plugins/addons/mailtemplate/class_mailTemplate.inc b/plugins/configuration/mailtemplate/class_mailTemplate.inc
similarity index 100%
rename from plugins/addons/mailtemplate/class_mailTemplate.inc
rename to plugins/configuration/mailtemplate/class_mailTemplate.inc
diff --git a/plugins/addons/subscription/class_subscriptionInfo.inc b/plugins/configuration/subscription/class_subscriptionInfo.inc
similarity index 100%
rename from plugins/addons/subscription/class_subscriptionInfo.inc
rename to plugins/configuration/subscription/class_subscriptionInfo.inc
diff --git a/plugins/addons/tasks/class_tasks.inc b/plugins/configuration/tasks/class_tasks.inc
similarity index 100%
rename from plugins/addons/tasks/class_tasks.inc
rename to plugins/configuration/tasks/class_tasks.inc
diff --git a/plugins/addons/tasks/class_tasksGranular.inc b/plugins/configuration/tasks/class_tasksGranular.inc
similarity index 100%
rename from plugins/addons/tasks/class_tasksGranular.inc
rename to plugins/configuration/tasks/class_tasksGranular.inc
diff --git a/plugins/addons/tasks/class_tasksMail.inc b/plugins/configuration/tasks/class_tasksMail.inc
similarity index 100%
rename from plugins/addons/tasks/class_tasksMail.inc
rename to plugins/configuration/tasks/class_tasksMail.inc
diff --git a/plugins/addons/pluginsManager/class_pluginsManager.inc b/plugins/dashboard/pluginmanager/class_pluginsManager.inc
similarity index 97%
rename from plugins/addons/pluginsManager/class_pluginsManager.inc
rename to plugins/dashboard/pluginmanager/class_pluginsManager.inc
index 47f529ed07f898f7cda1f706b22649ac6ee0d14a..9274ab9947e70a4ac0d3c1c1c591fe961e4b7b77 100644
--- a/plugins/addons/pluginsManager/class_pluginsManager.inc
+++ b/plugins/dashboard/pluginmanager/class_pluginsManager.inc
@@ -27,7 +27,7 @@ class pluginsManager extends simplePlugin
       'plObjectType'  => ['tasks'],
       'plTitle'       => _('Plugins Manager'),
       'plIcon'        => 'geticon.php?context=applications&icon=tasks-dashboard&size=48',
-      'plSection'     => ['reporting' => ['name' => _('Reporting'), 'priority' => 30]],
+      'plSection'       => ['Dashboard' => ['name' => _('Dashboard'), 'priority' => 50]],
       'plPriority'    => 10,
       'plDescription' => _('Provide a reporting mechanism of installed plugins'),
       'plProvidedAcls'  => []
diff --git a/plugins/addons/pluginsManager/plugins_list.tpl b/plugins/dashboard/pluginmanager/plugins_list.tpl
similarity index 100%
rename from plugins/addons/pluginsManager/plugins_list.tpl
rename to plugins/dashboard/pluginmanager/plugins_list.tpl
diff --git a/plugins/admin/tasks/class_tasksColumn.inc b/plugins/dashboard/tasks/class_tasksColumn.inc
similarity index 100%
rename from plugins/admin/tasks/class_tasksColumn.inc
rename to plugins/dashboard/tasks/class_tasksColumn.inc
diff --git a/plugins/admin/tasks/class_tasksDashboard.inc b/plugins/dashboard/tasks/class_tasksDashboard.inc
similarity index 98%
rename from plugins/admin/tasks/class_tasksDashboard.inc
rename to plugins/dashboard/tasks/class_tasksDashboard.inc
index 0b0b0b6dc18cc32e77a463299df2b2243ff5410c..ea490ead7938e7f0f70bba7f48ae7a28de07677f 100644
--- a/plugins/admin/tasks/class_tasksDashboard.inc
+++ b/plugins/dashboard/tasks/class_tasksDashboard.inc
@@ -52,7 +52,7 @@ class tasksDashboard extends management
       'plDescription' => _('Provide a reporting mechanism for tasks'),
       'plTitle'       => _('Tasks Dashboard'),
       'plIcon'        => 'geticon.php?context=applications&icon=tasks-dashboard&size=48',
-      'plSection'     => ['reporting' => ['name' => _('Reporting'), 'priority' => 40]],
+      'plSection'       => ['Dashboard' => ['name' => _('Dashboard'), 'priority' => 50]],
       'plPriority'    => 10,
       'plManages'     => ['tasksGranular'],
       'plProvidedAcls' => [],
diff --git a/plugins/admin/tasks/class_tasksManagement.inc b/plugins/dashboard/tasks/class_tasksManagement.inc
similarity index 100%
rename from plugins/admin/tasks/class_tasksManagement.inc
rename to plugins/dashboard/tasks/class_tasksManagement.inc