restructured locator