Reorganize and make all command map buttons subclasses of CommandMapButton.