Aligned package name with the JDK
Tidied up the javadoc.