Reorganization in makefile