Revert "split moving and rename file"

This reverts commit 0cf22449a78dccd057202dfb983ab61f457ad15f.