Moved CLI class out of vf tool