organize buildfile and Makefile