salvage some mapper functionality and stuff it in there (and cleanup), then the mapper/ directory can go.