reorg cmd structure
warrend stub