templates reorginized