Start refactoring Makefile