16.11 refactor + debug
+ new locators.properties