Split out the amazon and virtualbox/vmware templates