Refactor raml file