diff --git a/plugins/management/mailtemplate/class_mailTemplateManagement.inc b/plugins/management/mailtemplate/class_mailTemplateManagement.inc
index cfbcd572d98b735b3f4b089df4c3d5cf56014a3b..cb509a2ca3f0f2b3f5068fcf95faaf16e06ef844 100644
--- a/plugins/management/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/workflow/tasks/class_tasksManagement.inc b/plugins/workflow/tasks/class_tasksManagement.inc
deleted file mode 100644
index 885a0b3b2d2cd9faf1ccb73418ece7dcbab31f52..0000000000000000000000000000000000000000
--- a/plugins/workflow/tasks/class_tasksManagement.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2011-2022  FusionDirectory
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-class tasksManagement extends management
-{
-
-  protected $skipCpHandler    = TRUE;
-
-  /*
-  *  LinkColumn exists by class column
-  *  TasksColumn is a new class for Tasks based on argonaut column definition
-  */
-  public static $columns = [
-    //below fdTasksMailObject must be changed to have a type defined within task creation (new ldap attributes ?hidden)
-    ['LinkColumn',  ['attributes' => 'cn', 'label' => 'Tasks']],
-    ['TasksColumn', ['attributes' => 'fdTasksMailObject', 'label' => 'Types']],
-    ['Column', ['attributes' => 'fdTasksCreationDate', 'label' => 'Creation Date']],
-    ['TasksColumn', ['attributes' => 'fdTasksScheduleDate', 'label' => 'Scheduled']],
-    ['ActionsColumn', ['label' => 'Actions']],
-  ];
-
-  static function plInfo ()
-  {
-    return [
-      'plShortName'   => _('Tasks'),
-      'plDescription' => _('Provide a mechanism to create and manage tasks'),
-      'plTitle'       => _('Tasks'),
-      'plIcon'        => 'geticon.php?context=applications&icon=tasks&size=48',
-      'plSection'     => 'conf',
-      'plPriority'    => 40,
-      'plManages'     => ['tasks'],
-      'plProvidedAcls' => [],
-    ];
-  }
-
-  protected function setUpListing ()
-  {
-    /* Set baseMode to FALSE */
-    $this->listing  = new managementListing($this, FALSE);
-  }
-
-}