Added new tasks and changed file locations