Moved all of the CLI classes into the cli package