Reorganisation of targets/tasks