remap: move remapping code in separate file