Some changes to storing locations of the output files names and folders.