Change name + upadate Makefile + add template