Tiny refactoring & addition of some missing files to javadoc generation