Standardize CLI commands and add better grouping