restructure cli