renaming, polishing makefile