major refactoring done
major refactor
Scraper refactored
scraper refactor commit