re-struct cli