Move Tasks to separate files/package