Changes per package re-org of ui-commons