moved all comparators to one file