Merge "Account for folders in copy and move."