Simplify and rearrange data output for structure.

Changes to course structure display as specified in email.