added classifier.java and clean up