moved temperature classes into Measurements
adjusted namespaces