Classifiers refactored into classes