Rename package and add javadoc.
Merge branch 'rename-packages'