Redesign makefile