Updated bats for restructure.