Added templates in correct location