rename measurement to Measurement
Measure becomes a method of Check
more renaming