Initial adjustments for gradle adoption