Simplify and rearrange data output for structure.
Merge pull request #95 from unikent/feature/course-structure-changes

Simplify and rearrange data output for structure.