Redid XSD for last problem, finialized version of all other files