Update BF classifier
Classifier works now
Refactoring everything