tidy of XML files. consistent names and related items grouped