updated packages and javadoc