Separated parts of hand comparators to different classes.
Moved classes to other packages.