Refactor mapper, service and controller into common files.
<Greg>