Renamed submodules, reformatted gradle files