Modularize scraper.
Fix small issues.