Package renames; minor changes; JavaDoc comments