fix naming of output directory structure
Merge branch 'hotfix/1.4.1'