Organized the --sub-directory option and automatically deleted the temp file

Put the temp files back

Organized the --sub-directories for the baselines