Move Scraper to engine package (and remove useless call to normalize in test and make it private)