Moved Mapping classes to separate package (to match architecture
diagram).