Moved scraper to its own module & cleanup