javadoc update

JavaDoc files are merged into a single folder