renamed packages and updated javadoc