Change templates to includes