Sync up with new extract-files format