Refactoring

Replaced Location by Places