Added Makefile, cleaned up folder