More Javadocs, some reorganization and renaming