reorganizing templates