Reorganizing Windows templates