Changed package name for helper classes
Reorganized packages
Refactoring
Changed package name
Refactoring
Added comparator tests
Refactoring