Add more flowchart groupings for clarity of stages

Added more groupings to show the stages/parts of the flowchart. Also forced
some 'linebreaks' ("[folded]" in blockdiag speak).

Change-Id: I5dbfdec87459951675265587eeb1d29e7a808939