Moved collector.py out of featuremapper and into dataviews