Remove java build.  Flattened the project structure to ease integration by external projects.  Modernized some of the CMakeLists scripting.