The structure of the cli package was getting to be a bit of a mess, time to clean it up. The structure is much easier to read with each command in a separate package of related functionality.
