restructure templates
merge conflicts