Tools: Use new structure paths. cherry-pick 65c379d2a41a1c08e99e35adab779a3802787479