Renamed maven project/module names, removed submodule