UNITSOFMEASUREMENT-73: Refactor Quantity 

Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-73