Use more versatile extract-files.sh

Conflicts:
	extract-files.sh