Move templates so that we can also refer to default versions directly