Minor code reorganisation.
Minor code reorganisation.

Spawning procedures were not ideally grouped after merging.

ruthfranklin/hande,hande-qmc/hande,hande-qmc/hande,hande-qmc/hande,hande-qmc/hande,hande-qmc/hande