Renamed config_locator to locator
Removed config_provider