Fixed some javadoc, renamed some classes.