Rename output folders to clean up folder structure.