Update GOODBYE.rst with moved templates