Move task into package