Thank you for your 3 step description of how to do this.
I did steps 1 and 2 and was having problems deleting the original folders
I was missing
3) Right mouse button on the affected folders and press “Fix Up Redirectors”, this should remove the redirects that were created and properly route content.
Once I did that the problem was solved for me