Updated Javadoc comments to use the new package names.