Reorganizing makefile