Restructuring templates and components.