Moving commander, parsing and scm from tea.