Use more versatile extract-files.sh
Lots of cleanup/organization; remove references to aries/crespo