Fix package groupings and missing package-info.