stuctural changes to template. Makefile add
more initial setup