Cleanup: gathered templates in a single location