revamping Makefile, useing dist/ dir