Rearranged the Makefile