Small changes in YAML structure and began with Mediator class for iOS (WIP!)