Renamed command line tools and enhanced cli with getopt()