Feature/organize cli