gradle refactor