add javadocs; rename classes