I've updated the Number Within Sub-Folders rename script to allow you to move files around as part of the same rename.
It should do everything you need now.
@FatherTime: Please link your account if you need further assistance. And please stick to one question per thread unless the questions are closely related.