finished gradle refactoring