some more reorg and added details for understanding cli