update templates with includes and structure again