Use recursive copy instead of rename