Adding new submodules
Moving java stuff around, updating from the work-in-progress repo