cleanup tree, add Makefile