clean up directories and Makefile