Continuing work on automated results-folder creation and further generalization