reorganize cli