Major updates to gradle build file