Restructure templating.