Making some structural changes to the main document.