Minor refactoring
Simplification of mapping workflow. Added (crude) interactive mapper.