Do not clobber data/ in makefile clean target
Move back towards universal algebra metaphor