reoganized Makefile