Fixed build errors after merge for new project structure. (GeoLocations are not working)