reorganize password change templates