cli spec; reorg repl a bit