mv cli-specific stuff to cli lib