Changed bvatools location