Moved some classes around & added installer for scraper.
Merge remote-tracking branch 'origin/master'