reorganized for Gradle and AAR publishing