Updated data structure a little RE: Sections/subsections etc...