reorganization in makefile