Cleanup template and add Makefile