This is still happening in 4.18, at very this moment. Though you move the folder, the original folder does not disappear, although it does not have any file in it.
Hopefully, 3 steps of STAFF works. But keep in mind that, do not delete original folder structure which remains after MOVE. If you delete it (though after moving and Click ‘fix up redirectors’), link can be broken. just Migrate to the new project that you prepared.