Renamed some of the commands to be uniform
New CLI integrated