Package renaming, and some comments.