Reorganize the collector specific classes in the collectors.py (issue #13).