UNITSOFMEASUREMENT-19: Adjust module structure 

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