Move tasks into separate files