reorganize scrapers