Reorganizing packages and grouping tasks