Refactored comparators by moving them into a seperate package and exposing them
via enum in interface

Issue: #134.
Files modified. Issue: #134