Expanded the gradle-ification