Changes to profile to bring format of XML definitions in line with the way the new spec is organized, not the way the old spec is organized.