Adding back in some of the subsections to software

Some reordering of text and discussion, fitting in the main text
with the overall themes of the discussion in order to make it easier
to read through the section.