Remove Cli and Version and put into separate components