Restruct client cli