added weka classifier and refactoring