Re-structure of plugins and tasks