Reordered the files and renamed the task names