package renamed, added javadoc