Rename packages, clean up tests