Restructure "result" tag

Having a single "result" tag, differentiated by a "score" or "error" attribute, cannot be validated by XSD.