Renamed plugin, task id
Reorganized code