Move the cli to ui.cli