Rearrange order of CLI subcommands to match README