Moving tasks out into a separate package