Also reorder the subsections to better reflect the sequence of the steps of the pipeline. Fixes #112.