Move xtaf: element to schema-expected location