Fixed a few small warnings and errors due to file move.
Merge branch 'master' of github.com:MatthewPeterKelly/myJavaPkgs