Fix/refactor mapper to mappers

* Use classify and singularize to get individual mappers.
* update GroupCriteriaMapper to reflect DateRangeCriteriaMapper