Further build.gradle refactorings.  Pulled out shadow stuff