Added output folder to scenario structure (ABM-180)
Merge branch 'build' into develop