templates update
Makefiles update