cli: restructured cli. add help