reorganizing files
Updating scraping code