Added remapping framework
Added remapping application