Cleaning up what classes sit in public api packages and renaming some
packages.