Improve file moving