Cli-controller and Cli-routing refactored