Enhancement scraper functionality split

Fixes #50