Restructured scraper files