Add variant folders and bats