Corrected the way output folders and output files are named (replaced
spaces with hyphens).
Merged
More merging