more submodule/gradle wrestling