Moved all classifier code to seperate classes.