Continuing the changes needed to flatten the project XML.