Javadocs, organization/cleanup.