Moved from cmd -> cmd2 library