locator lyout and folder structure changed