Refactored scrapers into their own package