reorganize cli into method folders