added adaptor classes; refactored packages for scrape
Merge branch 'master' of https://github.com/Group3-ELEN7045/APS