Content restructing

Restructuring content to (hopefully) be more logical for readers