Revert "Revert "File rename and remove old version""

This reverts commit 71989141b5b84b01ae5a8ac67272fef4646469ac.