Re-arranging templates