Restructure "objective" tag

Having a single "objective" tag, differentiated by a "type" attribute, cannot be validated by XSD.