Move CLI related stuff into the cli directory.