Package renaming, cleanup, additional comments.