Convert commands to classes, to make managing them easier