reorganize Makefile