Fixed the packages in the files and the build.  Javadoc URL is still wrong however.