Cleanup - remove older Java code.  Modified autogen to support newer only.  Updated build-maven.sh to build for maven