Rename and reorganise the [Template:*] sections