Oops.
Extractor class added.
Clustering added, minor refactoring.