At https://cygwin.com/pipermail/cygwin/2020-April/244398.html there was a specific request for contrib/subtree. I'm not keen on doing extensive work to ship contrib directories, but let's see what we can achieve...