Rework hierachy structure

Moved comparator folder to entity