Cleanup, add a Makefile