Flattening out the generated XML for projects and adjusting the necessary affected programs.
Merge branch 'tightenTops'