more RANG re-org

finishes(?) #2