Work on ClassifierFactory
Complete work on ClassifierFactory, removing many old classes