moved some file to util package, write unit test for class comparator