Moved cli specific code to cli directory