moved ui-model classes to own sub package