Renamed packages, moved constants, cleanup.