Organize Makefile