Moved mappers to a different package.

Issue #135