Reorganized Makefile