Minor overhaul to build.gradle