Refactor Mapper class into a separate module