WIP... Refactoring
Move YAML validation to Validator service
Tidy up editor