Re-arrange templates