Make .cli a subpackage