Futher restructuring of the document.