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 100%
rename from plugins/addons/pluginsManager/class_pluginsManager.inc
rename to plugins/dashboard/pluginmanager/class_pluginsManager.inc
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 100%
rename from plugins/admin/tasks/class_tasksDashboard.inc
rename to plugins/dashboard/tasks/class_tasksDashboard.inc
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