move command-specific options to the respective command modules