Move to new gradle