Close #8  Service in place with gradle refactor.