Moved cli into seperate module.