Duy

Combined 2 scrapers
Organized functions