Shorten CLI commands, and simplify groupings in larger projects for CLI Commands