Remove all the legacy mess, organize the packages.