added more cases, also allow user to rename current folder to match video files