Move Cli to submodule