re-org as RANG is more generic than transfer specific

start of #2