Adding some extensions to the classifiers used, also making the code more modular and extensible.