integrated new cli structure here.
update here for merge with matcher