The attached are complete and ready for review. I did some file structure reformatting at the end and left that as the second patch. The first contains all of the content.
To help manage this fairly large patch I've created a wiki page listing the sect2 titles (might need to add the handful of sect3s too).
My goal is to use it as a WIP tracker for changes as well as a convenient place for getting confirmation that specific sections have been looked at and deemed ready-to-commit. No one person needs to look at everything but so long as each has one or more someones who has reviewed it the whole patch can then be marked ready-to-commit.