Bug fix in maoving files to final destination