moving package
fixing javadocs