Rearrange subcommands and organize them in groups

Rearrange subcommands and organize them in groups