reorg, more expressive path detection for components