added scraping classes, reorganized