Rename cmodes/umodes to cmode/umode.