Scraper work 1 - Refactoring and Re Structuring