package util renamed to locator