Gradle update + dir fix