Restructuring built in template hierarchy