Moved 2 scrapers to /lib/scrapers and other minor changes.