Moving functionalitiy out of the /tasks/ directory