reorganize in-radius primitives - close #94