Refactored code structure; Many improvements in scraping logic;