Locations refactoring
Refactoring YAML and Main class