Re-structuring and related changes in Location State and Location Object. Config file changed