Move things around to match upstream/groovy-devel
Fix use of single architecture.
Use new caching in vcstools.