updated and relocated javadoc