#111: Reorganize Subsections 

Resolves #111.