split Measurement into Energy, Current, VampsMeasurement
removed MeasuredValue