updated javadoc and package names