Add class diagram; make measurement class an independent subseection