Change structure to with Gradle compatible