finish Makefile and proj layout