Reorganize files based on newer java-support Gradle build script.