update wizard code to use nested template files