Project restructuring, minor typo fix
Generated javadoc