RAML refactoring