Change structure to be Gradle compliant