Updated javadoc to reflect new package structure