Reorganize packages.