move to package, javadoc