Removed individual collectors and create a configuration file driven
one.
Forgot some files
Fixed a couple of typos
Fixed some tests