reorganize subcommands