Better management of files

 Handling files in temporary directory or in destination directory if already moved