More javadoc! And package renamed.