Reorganize Makefile