Use tmp branch while re-writing the paths