Did some refactoring, started a classifier interface to unify multiple kinds of output sets.