minor reconfiguration
massive reorg + new mappings