Improved Samples Gradle scripts