Moving mappers.
Renaming in tests.
Merge pull request #26 from dibber-org/feature/moving-mappers

Feature moving mappers