UNITSOFMEASUREMENT-87: Merge the model package into quantity and root 

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