Gradle dependencies and structure updated