Rename package, delete some package, grouping