New Rwanda plan: Migrants must move voluntarily