Update build.gradle files for better workspace setup
now to check CI compat