Packages from the vendor refactors

refactors/smart-scraper