Put Mapping class into it's own module