ResourceMap: added name, lat and lng to entity properties, and put layers inside a struct