Move command-line related stuff to CLI namespace.
Rename DSL namespace to CLI namespace in new CLI classes.