Those templates now belong there