API breakage of function MakeWater. TM interface modified, now each TM calculation gets its own directory
Cleanup