move cli and engine into separate namespaces