Reorganize so RPPORT is only non-DOS unit in use