Some work on command line interface.
Renamed annotation CLICommand to CLICommandInfo.
Some work on command line interface.