Restructured command-line interface to sub-commands