Move task to it's own package