overhaul and cleanup over the gradle build file