fixed package references.
Merge branch 'master' of github.com:nwcaldwell/Java into CGI