Improved moving files