CFY-430 remove vagrant version and change directory structure