cleanup project and add Makefile