final maven fixup. Fully tested on new system. Should be able to just mvn install from root and build submodules now