Remove the function conflicting template files
Complete the new Makefile