More reworking of how we handle vendored files