Modified package name and added java doc