and added some more javadoc to point at the new main package variant