Combine all fountains into fountain.h
Remove unused files
Clean up Makefile