reorganizing cli