Updating scraper service and and adding website scraper bean
Removing tests, refactoring some of the code and cleaning up