Scraper Cleanup

Didn't really need all of the subfolders and files in the scraper.
Merged a lot of stuff so it's a lot more focused.  Still not done,
so relax for a bit.