nice work, I think this kind of redrafting can be a good foundation for refactoring ... though I would go further and suggest an xml based format ... if u have a .odt you can convert this to docbook ;)
one nit pick; drop 'rigorous' in title Jim Fuller