Finally removed notion of "Terrain"

Everything has become about Measures of different properties