Added couch support, moved scrape functions intp modules