In addition, move the other multichoice help file to the correct location, and update all references.