Draft: re-factorised output for clarity & attempt to fix issue at p5 of files not...
re-factorised output for clarity & attempt to fix issue at p5 of files not being moved out of in_progress
This merge request is being factorized into small merge requests.
Edited by Petr Zejdl