Cleans up tasks to be more granular and includes sample project