Moving javadoc from apidocs to doc