Rebase and change to new structure.

Add dummy javadoc (fix checkstyle)