Restructured and renamed cli methods
Restructured and renamed cli methods

nismod/smif,willu47/smif,tomalrussell/smif,tomalrussell/smif,nismod/smif,willu47/smif,nismod/smif,willu47/smif,willu47/smif,nismod/smif,tomalrussell/smif,tomalrussell/smif