moved locator to a separate source file